From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6729358150130991104 X-Received: by 2002:a1c:cb83:: with SMTP id b125mr3057999wmg.43.1567579998332; Tue, 03 Sep 2019 23:53:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:550b:: with SMTP id b11ls1976147wrv.1.gmail; Tue, 03 Sep 2019 23:53:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqz2yBaacKZ75UeyxbDIcXJV/vVNZBHU9PdMXxAuuMx+1BpkTG79/6bjiAilvNsQXdU/SwYW X-Received: by 2002:a5d:4e90:: with SMTP id e16mr46223715wru.339.1567579997852; Tue, 03 Sep 2019 23:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567579997; cv=none; d=google.com; s=arc-20160816; b=M2zLg++eOHkf64tFowW4poa74ThOcViUV43XJNF/ET2Pm/FkvzcETlivv0l96G0lAs Os875ucdGVqCCj4qq/45MmoafvXFxatD2diWAjQJrR3PFxKMBGt5MyprBqNkExQLGRAO fiQY9jvSsm6N+jxDaQu2nG1FvpsWl9mbiD11mE0gTlTKOvd5YStGwrHShA2GGsVA96AC p0O77clBKh36tJxMsQYDrf+AoKzvvvHlj6rw5pCTO0TV/Gby1ja/PhVPpjiDx4lFoIHF O7PyWVOsnBaq87j2uTdSnUOM6UuwTq7AeG+ENegDjH3trAKwslVQarExlvQzETYtzmw1 9niw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:to:from:subject; bh=0V6xiTPQ5x/T6nxB9IomWw1RSwVjYUVI9YXDLhgH/JA=; b=VtAWP1zhmvG2nkRCaN0n+bwOJ76C82JIk8UItRXFnTWjtEp3aABeouW8OFssxl5G2J Dvc+XXYv3Pu2LSrrYbFrKe19DALmlFKZ7DjmGS5k6dK78xj5JtR76SoYCoJgtjQwbVMY FclPiCQXj8afz7bCoNaht3Km9W5X37CDgovcR9g2J5AZNhKUVd3CQeATHYS+UUD+lbDP UlRo0pTn5ZpeAo3PTs2wGE0Xe2+kSZ4OChmXEaRSiFJo5mn6SdkRAtHQAbXdbKiM8dsW 7Ri6XeW0/xlzFXIbHxuxhSWNsqrS6uHrGqQqCDgo+ezt7ob7LAr6ryIYcgsA21YtJKGc 1nSQ== 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 p3si1192293wrn.4.2019.09.03.23.53.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Sep 2019 23:53:17 -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 x846rH2I011600 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 4 Sep 2019 08:53:17 +0200 Received: from [167.87.42.80] ([167.87.42.80]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x846rGXC022535 for ; Wed, 4 Sep 2019 08:53:17 +0200 Subject: [PATCH v2 09/26] meta-isar: Move bananapi to buster, remove bogus example From: Jan Kiszka To: isar-users References: Message-ID: Date: Wed, 4 Sep 2019 08:53:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: T+oUEZElF3Bz 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 --- Changes in v2: - rebased over next The complete series of my pending patches is still at https://github.com/siemens/isar/commits/jan/queue 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 60805eb..d73da1d 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -54,7 +54,7 @@ BBMULTICONFIG = " \ qemumipsel-stretch \ qemumipsel-buster \ qemumipsel-bullseye \ - bananapi-stretch \ + bananapi-buster \ de0-nano-soc-stretch \ hikey-stretch \ 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