From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6729358150130991104 X-Received: by 2002:a17:906:578a:: with SMTP id k10mr15013483ejq.235.1566800791531; Sun, 25 Aug 2019 23:26:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:19d2:: with SMTP id h18ls5101693ejd.8.gmail; Sun, 25 Aug 2019 23:26:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+wX5PhcaJY+vt08Aqepf+pe6rajheSUVhGNEqhRBfp/dNzI3VwEU8UzlCtjQdt64yMUq8 X-Received: by 2002:a17:906:2899:: with SMTP id o25mr15416404ejd.192.1566800791041; Sun, 25 Aug 2019 23:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566800791; cv=none; d=google.com; s=arc-20160816; b=DnhjMUvtlEM3L/+Ys5BigxAA1N2BGUUUWXG76JydN3pxMlyATlr3K4hliG7q4TYffh UH6S0ZxHU6SV18sqCtHQqFqXpzbp99JV4zXx5LQRqecrtreHIf4/EHulk5ey3dZOxXYX ehp50Jp7JadZ+kuARJc3GjVlb2fpmwFlv6G3WkvZR8wn1B1YtqazUW/T+A1BGkWCr9fu N7omQEY+zbDHe4tF7WPY3qqDsbLnMupzsTqQG9LR5VN4RqMT7f/BO/0DRFgdimSHcpi+ vHXnPdHfkMtyx5l9G+Tq3ebSCq/njQ+MlIycYoCsJFebnftLH4m0hn/I6FHd3c8aYLw3 I+Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=DVcAvqsWaSD+G2BUU2Oej03AMO+hsnJGrfV1Fn8dBfQ=; b=0aY/ABxlfIyMQL0uVQOHSTEVDrhIqEfgHjPvVLKa4iVn9Ui8j3WCMkWJBMDyngYHki /a/DLxmKg/iO1+tyfdkpCeBRhtimbpK2wXoj0Vnl7N5hMIBGWv9OTHCJRmmODh11T5/2 1pZO/JM/H5UH+pFhC68y3gqyxSlJhLW9qAEObSEM2eINbJCocDCzywQVboM9lKDbSvMW HRuNl+CZ97DbLF6p5EgrC4pUH1SIYlxweDPW+wbV24H17++blJ8N0o7kvQkWHEGkdEKp MbzGphKLDMk/n53eK9DBEQRIN8x0Q3uf0lZcDNTftosID4ESnDsz74v87/kT/6fqGLb/ NUkQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id m3si471465edq.0.2019.08.25.23.26.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 23:26:31 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x7Q6QUH8013694 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Aug 2019 08:26:30 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.99]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x7Q6QRH3015165 for ; Mon, 26 Aug 2019 08:26:29 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 09/26] meta-isar: Move bananapi to buster, remove bogus example Date: Mon, 26 Aug 2019 08:26:10 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: oiyg45R2i1ik From: Jan Kiszka The bananapi machine config contained a "nice" anti-pattern that made multiconfig explode: By tuning DISTRO_APT_PREFERENCES, it modified the dependencies of isar-bootstrap-target for all other stretch-armhf targets. And that nicely exploded when those were built in parallel. Rather than trying to fix this pattern towards multiconfig compatibility, which would have been rather complex, simply remove it. We have buster now, and the buster kernel is what this target want. So give it to him. Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/debian-stretch-backports.list | 2 -- meta-isar/conf/local.conf.sample | 2 +- meta-isar/conf/machine/bananapi.conf | 3 --- .../multiconfig/{bananapi-stretch.conf => bananapi-buster.conf} | 2 +- meta-isar/conf/multiconfig/preferences.bananapi.conf | 7 ------- 5 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 meta-isar/conf/distro/debian-stretch-backports.list rename meta-isar/conf/multiconfig/{bananapi-stretch.conf => bananapi-buster.conf} (82%) delete mode 100644 meta-isar/conf/multiconfig/preferences.bananapi.conf diff --git a/meta-isar/conf/distro/debian-stretch-backports.list b/meta-isar/conf/distro/debian-stretch-backports.list deleted file mode 100644 index 6b744f3..0000000 --- a/meta-isar/conf/distro/debian-stretch-backports.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ftp.debian.org/debian stretch-backports main -deb-src http://ftp.debian.org/debian stretch-backports main diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 5b3a0a1..d9379b1 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -47,9 +47,9 @@ BBMULTICONFIG = " \ qemuamd64-stretch \ qemumipsel-stretch \ qemumipsel-buster \ - bananapi-stretch \ de0-nano-soc-stretch \ hikey-stretch \ + bananapi-buster \ qemuamd64-buster \ qemuamd64-buster-tgz \ nand-ubi-demo-buster \ diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf index 7b380c1..cec8057 100644 --- a/meta-isar/conf/machine/bananapi.conf +++ b/meta-isar/conf/machine/bananapi.conf @@ -7,9 +7,6 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -DISTRO_APT_SOURCES_append = " conf/distro/debian-stretch-backports.list" -DISTRO_APT_PREFERENCES += "conf/multiconfig/preferences.bananapi.conf" - IMAGE_INSTALL += "u-boot-script" IMAGE_TYPE ?= "wic-img" diff --git a/meta-isar/conf/multiconfig/bananapi-stretch.conf b/meta-isar/conf/multiconfig/bananapi-buster.conf similarity index 82% rename from meta-isar/conf/multiconfig/bananapi-stretch.conf rename to meta-isar/conf/multiconfig/bananapi-buster.conf index 6c80020..6262a07 100644 --- a/meta-isar/conf/multiconfig/bananapi-stretch.conf +++ b/meta-isar/conf/multiconfig/bananapi-buster.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: MIT MACHINE = "bananapi" -DISTRO = "debian-stretch" +DISTRO = "debian-buster" diff --git a/meta-isar/conf/multiconfig/preferences.bananapi.conf b/meta-isar/conf/multiconfig/preferences.bananapi.conf deleted file mode 100644 index 9f5c196..0000000 --- a/meta-isar/conf/multiconfig/preferences.bananapi.conf +++ /dev/null @@ -1,7 +0,0 @@ -Package: linux-image* linux-headers* linux-kbuild* -Pin: release n=stretch-backports -Pin-Priority: 501 - -Package: * -Pin: release n=stretch-backports -Pin-Priority: -1 -- 2.16.4