From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7281156128394706944 X-Received: by 2002:a1c:4c09:0:b0:401:bf87:989c with SMTP id z9-20020a1c4c09000000b00401bf87989cmr7384287wmf.34.1695362625873; Thu, 21 Sep 2023 23:03:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:510f:b0:405:32c1:16f9 with SMTP id o15-20020a05600c510f00b0040532c116f9ls393665wms.1.-pod-prod-02-eu; Thu, 21 Sep 2023 23:03:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAKVzt0/aKCP0DfAbc2KQjQ25F2yHLChencW7vi6w2HNT33SYM8M0Q1oCmuDILFn0T2Cr+ X-Received: by 2002:a05:600c:4755:b0:405:3cc5:1105 with SMTP id w21-20020a05600c475500b004053cc51105mr1145201wmo.8.1695362623486; Thu, 21 Sep 2023 23:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695362623; cv=none; d=google.com; s=arc-20160816; b=oxeuaDbrtONUuvQRId5hFaeuqxivUCfJvE9Ypdh0aMIF6OtVnkPYBDt0gYsEU6fZ6V Ji2EJmnJKB9kntSoPA0dtKo2w/L5AtyKEgEkK/qYbzp5dztuDY0E5kiRNCy7SspqCll3 mpY0dXMboH5vsovs5M17OjXrjWEK0i+YRuGW5Gd4z8DEVvbqmUdXg3dTtVNe/cKC399j dwCRT9qoJld+wCp56gmrWNQ0Xm/8l+vcIVzxOEZzzvLSrwkZhzXguT2rLjHENEt2PKa3 oNltFDZAXbXmhOjJEahiAps9+sI/Cwc6F9HkkwMFNGizBvjhj4I9mRxrzP0dSJucXhHm Wa4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=/4jcHN+1HRUhfceDmI4rH6xTq89gEH5i6ivtfGcGuJc=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=h2yvio1xG+DbZgnn2lsqTHJl+eFsgoS2AbqQCUw5WHPiruLb1PgsnZq4YEGG7jtBSx PclGikdkBl/qx4iFC1LUyPG8S6O+XzWnWHMQjGRIDMEcEygxZu9rj0+h6namY3Mq+kLu Li5O2wpJxDyxrcW8lm5yfGxypJOaxmtNnBColPMs9iAJlbqYlHsysMGFrEmw0JKTRmZT X/n8YMFWleYUuF6y5cTXFbcG07qcFCkfvvmSlEdHLYSHJj+dCii0srrAbj5G1HpDogib X4/MsA/YjfbE4foBu0mMcoMH/9XLVxZVhzVqG42+mvaWX48+Ud/eLvP15iIBRL44qQpt Gm5w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o27-20020a05600c511b00b003fc39e1582fsi449813wms.1.2023.09.21.23.03.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Sep 2023 23:03:43 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 38M63gX6031362 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 22 Sep 2023 08:03:42 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2] Use the same BBMULTICONFIG for meta-isar and meta-test layers Date: Fri, 22 Sep 2023 08:03:42 +0200 Message-Id: <20230922060342.6634-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: IddyFZxtsQUD This separates BBMULTICONFIG variable definition to the same `mc.conf` file in meta-isar layer so that it could be reused by both `meta-isar` and `meta-test` layers. This should simplify adding new multiconfigs to Isar. Signed-off-by: Uladzimir Bely --- meta-isar/conf/local.conf.sample | 55 +++----------------------------- meta-isar/conf/mc.conf | 54 +++++++++++++++++++++++++++++++ meta-test/conf/local.conf.sample | 46 +------------------------- 3 files changed, 59 insertions(+), 96 deletions(-) create mode 100644 meta-isar/conf/mc.conf Changes since v1: - Considered new multiconfigs added with [PATCH v2 0/2] add bookworm versions of nanopi-neo diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 9ed5e21c..17455015 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -1,3 +1,6 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 ilbers GmbH + # # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user @@ -33,57 +36,7 @@ DISTRO_ARCH ??= "armhf" # # Multiple Configuration Selection # -# If you want to use multiple configuration files for the build, list them in the -# following option. -# -# This sets the default multiple configurations used: -BBMULTICONFIG = " \ - qemuarm-buster \ - qemuarm-bullseye \ - qemuarm-bookworm \ - qemuarm64-buster \ - qemuarm64-bullseye \ - qemuarm64-bookworm \ - qemui386-buster \ - qemui386-bullseye \ - qemui386-bookworm \ - qemuamd64-buster \ - qemuamd64-bullseye \ - qemuamd64-sb-bullseye \ - qemuamd64-bookworm \ - container-amd64-buster \ - container-amd64-bullseye \ - container-amd64-bookworm \ - qemumipsel-buster \ - qemumipsel-bullseye \ - qemumipsel-bookworm \ - qemuriscv64-sid-ports \ - bananapi-buster \ - bananapi-bullseye \ - de0-nano-soc-buster \ - de0-nano-soc-bullseye \ - hikey-bullseye \ - hikey-bookworm \ - imx6-sabrelite-buster \ - imx6-sabrelite-bullseye \ - phyboard-mira-bullseye \ - nanopi-neo-buster \ - nanopi-neo-bullseye \ - nanopi-neo-bookworm \ - nanopi-neo-efi-bookworm \ - stm32mp15x-bullseye \ - virtualbox-bullseye \ - rpi-arm-bullseye \ - rpi-arm-v7-bullseye \ - rpi-arm-v7l-bullseye \ - rpi-arm64-v8-bullseye \ - sifive-fu540-sid-ports \ - starfive-visionfive2-sid-ports \ - qemuarm64-focal \ - qemuarm64-jammy \ - qemuamd64-focal \ - qemuamd64-jammy \ -" +include ${LAYERDIR_isar}/conf/mc.conf # # Where to place downloads diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf new file mode 100644 index 00000000..9637bcb1 --- /dev/null +++ b/meta-isar/conf/mc.conf @@ -0,0 +1,54 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 ilbers GmbH + +# If you want to use multiple configuration files for the build, list them in the +# following option. +# +# This sets the default multiple configurations used: +BBMULTICONFIG = " \ + qemuarm-buster \ + qemuarm-bullseye \ + qemuarm-bookworm \ + qemuarm64-buster \ + qemuarm64-bullseye \ + qemuarm64-bookworm \ + qemui386-buster \ + qemui386-bullseye \ + qemui386-bookworm \ + qemuamd64-buster \ + qemuamd64-bullseye \ + qemuamd64-sb-bullseye \ + qemuamd64-bookworm \ + container-amd64-buster \ + container-amd64-bullseye \ + container-amd64-bookworm \ + qemumipsel-buster \ + qemumipsel-bullseye \ + qemumipsel-bookworm \ + qemuriscv64-sid-ports \ + bananapi-buster \ + bananapi-bullseye \ + de0-nano-soc-buster \ + de0-nano-soc-bullseye \ + hikey-bullseye \ + hikey-bookworm \ + imx6-sabrelite-buster \ + imx6-sabrelite-bullseye \ + phyboard-mira-bullseye \ + nanopi-neo-buster \ + nanopi-neo-bullseye \ + nanopi-neo-bookworm \ + nanopi-neo-efi-bookworm \ + stm32mp15x-bullseye \ + virtualbox-bullseye \ + rpi-arm-bullseye \ + rpi-arm-v7-bullseye \ + rpi-arm-v7l-bullseye \ + rpi-arm64-v8-bullseye \ + sifive-fu540-sid-ports \ + starfive-visionfive2-sid-ports \ + qemuarm64-focal \ + qemuarm64-jammy \ + qemuamd64-focal \ + qemuamd64-jammy \ +" diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample index b705d3a8..f692f533 100644 --- a/meta-test/conf/local.conf.sample +++ b/meta-test/conf/local.conf.sample @@ -7,51 +7,7 @@ DISTRO ??= "debian-bullseye" DISTRO_ARCH ??= "armhf" # The list of known multiple configurations -BBMULTICONFIG = " \ - qemuarm-buster \ - qemuarm-bullseye \ - qemuarm-bookworm \ - qemuarm64-buster \ - qemuarm64-bullseye \ - qemuarm64-bookworm \ - qemui386-buster \ - qemui386-bullseye \ - qemui386-bookworm \ - qemuamd64-buster \ - qemuamd64-bullseye \ - qemuamd64-sb-bullseye \ - qemuamd64-bookworm \ - container-amd64-buster \ - container-amd64-bullseye \ - container-amd64-bookworm \ - qemumipsel-buster \ - qemumipsel-bullseye \ - qemumipsel-bookworm \ - qemuriscv64-sid-ports \ - bananapi-buster \ - bananapi-bullseye \ - de0-nano-soc-buster \ - de0-nano-soc-bullseye \ - hikey-bullseye \ - hikey-bookworm \ - imx6-sabrelite-buster \ - imx6-sabrelite-bullseye \ - phyboard-mira-bullseye \ - nanopi-neo-buster \ - nanopi-neo-bullseye \ - stm32mp15x-bullseye \ - virtualbox-bullseye \ - rpi-arm-bullseye \ - rpi-arm-v7-bullseye \ - rpi-arm-v7l-bullseye \ - rpi-arm64-v8-bullseye \ - sifive-fu540-sid-ports \ - starfive-visionfive2-sid-ports \ - qemuarm64-focal \ - qemuarm64-jammy \ - qemuamd64-focal \ - qemuamd64-jammy \ -" +include ${LAYERDIR_isar}/conf/mc.conf # Disable interactive patch resolution PATCHRESOLVE = "noop" -- 2.20.1