From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:ad4:59ce:0:b0:5ef:181e:2e53 with SMTP id el14-20020ad459ce000000b005ef181e2e53mr985820qvb.10.1682709026271; Fri, 28 Apr 2023 12:10:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:58c4:0:b0:3ef:1ea9:acd9 with SMTP id u4-20020ac858c4000000b003ef1ea9acd9ls5270023qta.0.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7EQ/vknerk6zfCuyd5vR5q+s6dN73CCMLYmbeKarf2mLxKszGS4OxtzGGRUX0DDyuc5wMO X-Received: by 2002:a05:622a:1649:b0:3f0:a3ae:7e69 with SMTP id y9-20020a05622a164900b003f0a3ae7e69mr10563455qtj.18.1682709025635; Fri, 28 Apr 2023 12:10:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682709025; cv=none; d=google.com; s=arc-20160816; b=fDvpLXNieS+0tpVCAxmzQujISQsKAnLfQkyVHDtvoiRfE4KXJdRByJb1ZSunYZ++WQ 86XMy3My5elpa/YH/S0soeIqLE08IXBAiGfyX4S3tnJfPf7LMldbnGnDp7a6rtuZj7Uy hgN5YPL3j5RdNWPqrHix7AIxoaIiaVLJ6SoIeYEh4iw8rnXdLUcUkp3vwb9VZcVqWeWb mBaN8QZ1/EXEpuHedifm1E6St/1f1w5K60IRPMBpv/i+2jAgz4Dxc/+JcUPUKebkHCIs XJTxQ7P8S0FmHUjG25GlY3T1nKXe1QqYanAitNbPgGUC00K1NuNSqbcuEWSOvRQxgh9d M+nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Zn8kJNYfUwR/B7RBwpqK5vP0ii3z+6MWJ87O5BeBUvw=; b=D7bnBb47wQjycDtfCodojCo7L0SrzjbdEhVnj8w6Wdd6YJSf3OsfzdKjdd4ZlP2rzG MXjW/+KkpyfWPjkyrFxphs1EjafAX4hkWZ/CtQ5z5RmaL2P0iKfHVKDYisZ4HeONKiiL C270pudjs3hQqNe0UzkC+ilg7WgvwpTtAN1TAd+q6qUAgdbjPYezox6fVetuymTWv55O LJua/1b9N6E2KZAENsDy3O0AprIS95m3uh/TJeaC2u3cHFkMEBjDGFkxSrcgVbJp/Bx4 sRrxj3kj5oY4qy/uAWYKT5gFq/TitsCJT1kIBZVMsdXyodU2U7UC7E6gX/w4XERUJCDX RC9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id qd16-20020a05620a659000b0074e023f65fbsi1185047qkn.7.2023.04.28.12.10.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Apr 2023 12:10:25 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.com (IN-213-226-141-183.bitemobile.lv [213.226.141.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 33SJA7FH011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:19 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 10/10] meta-isar: Unify multiconfigs to use weak assignments Date: Fri, 28 Apr 2023 22:10:04 +0300 Message-Id: <20230428191004.243993-11-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230428191004.243993-1-amikan@ilbers.de> References: <20230428191004.243993-1-amikan@ilbers.de> 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: GON3LBlScPGW Make all the multiconfigs be configured in the same way. Signed-off-by: Anton Mikanovich --- meta-isar/conf/multiconfig/bananapi-bullseye.conf | 4 ++-- meta-isar/conf/multiconfig/bananapi-buster.conf | 4 ++-- meta-isar/conf/multiconfig/de0-nano-soc-bullseye.conf | 4 ++-- meta-isar/conf/multiconfig/de0-nano-soc-buster.conf | 4 ++-- meta-isar/conf/multiconfig/hikey-bookworm.conf | 4 ++-- meta-isar/conf/multiconfig/hikey-bullseye.conf | 4 ++-- meta-isar/conf/multiconfig/nanopi-neo-bullseye.conf | 4 ++-- meta-isar/conf/multiconfig/nanopi-neo-buster.conf | 4 ++-- meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf | 4 ++-- meta-isar/conf/multiconfig/stm32mp15x-bullseye.conf | 4 ++-- meta-isar/conf/multiconfig/stm32mp15x-buster.conf | 4 ++-- meta-isar/conf/multiconfig/virtualbox-bullseye.conf | 5 ++--- 12 files changed, 24 insertions(+), 25 deletions(-) diff --git a/meta-isar/conf/multiconfig/bananapi-bullseye.conf b/meta-isar/conf/multiconfig/bananapi-bullseye.conf index 35c5a246..9bbc1982 100644 --- a/meta-isar/conf/multiconfig/bananapi-bullseye.conf +++ b/meta-isar/conf/multiconfig/bananapi-bullseye.conf @@ -1,5 +1,5 @@ # This software is a part of ISAR. # Copyright (C) 2022 ilbers GmbH -MACHINE = "bananapi" -DISTRO = "debian-bullseye" +MACHINE ?= "bananapi" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/bananapi-buster.conf b/meta-isar/conf/multiconfig/bananapi-buster.conf index 6262a077..8130e72c 100644 --- a/meta-isar/conf/multiconfig/bananapi-buster.conf +++ b/meta-isar/conf/multiconfig/bananapi-buster.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "bananapi" -DISTRO = "debian-buster" +MACHINE ?= "bananapi" +DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/de0-nano-soc-bullseye.conf b/meta-isar/conf/multiconfig/de0-nano-soc-bullseye.conf index 9473d395..e1ba4d85 100644 --- a/meta-isar/conf/multiconfig/de0-nano-soc-bullseye.conf +++ b/meta-isar/conf/multiconfig/de0-nano-soc-bullseye.conf @@ -1,5 +1,5 @@ # This software is a part of ISAR. # Copyright (C) 2022 ilbers GmbH -MACHINE = "de0-nano-soc" -DISTRO = "debian-bullseye" +MACHINE ?= "de0-nano-soc" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/de0-nano-soc-buster.conf b/meta-isar/conf/multiconfig/de0-nano-soc-buster.conf index 0584d193..dd16568c 100644 --- a/meta-isar/conf/multiconfig/de0-nano-soc-buster.conf +++ b/meta-isar/conf/multiconfig/de0-nano-soc-buster.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "de0-nano-soc" -DISTRO = "debian-buster" +MACHINE ?= "de0-nano-soc" +DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/hikey-bookworm.conf b/meta-isar/conf/multiconfig/hikey-bookworm.conf index 671b1f77..71268a58 100644 --- a/meta-isar/conf/multiconfig/hikey-bookworm.conf +++ b/meta-isar/conf/multiconfig/hikey-bookworm.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "hikey" -DISTRO = "debian-bookworm" +MACHINE ?= "hikey" +DISTRO ?= "debian-bookworm" diff --git a/meta-isar/conf/multiconfig/hikey-bullseye.conf b/meta-isar/conf/multiconfig/hikey-bullseye.conf index 33ed3a3c..c7465a2b 100644 --- a/meta-isar/conf/multiconfig/hikey-bullseye.conf +++ b/meta-isar/conf/multiconfig/hikey-bullseye.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "hikey" -DISTRO = "debian-bullseye" +MACHINE ?= "hikey" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/nanopi-neo-bullseye.conf b/meta-isar/conf/multiconfig/nanopi-neo-bullseye.conf index 54a582c1..0ce915b0 100644 --- a/meta-isar/conf/multiconfig/nanopi-neo-bullseye.conf +++ b/meta-isar/conf/multiconfig/nanopi-neo-bullseye.conf @@ -1,5 +1,5 @@ # This software is a part of ISAR. # Copyright (C) 2022 ilbers GmbH -MACHINE = "nanopi-neo" -DISTRO = "debian-bullseye" +MACHINE ?= "nanopi-neo" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/nanopi-neo-buster.conf b/meta-isar/conf/multiconfig/nanopi-neo-buster.conf index 3f54c0c1..34a440d4 100644 --- a/meta-isar/conf/multiconfig/nanopi-neo-buster.conf +++ b/meta-isar/conf/multiconfig/nanopi-neo-buster.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "nanopi-neo" -DISTRO = "debian-buster" +MACHINE ?= "nanopi-neo" +DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf b/meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf index e4e0248c..313032ef 100644 --- a/meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf +++ b/meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "sifive-fu540" -DISTRO = "debian-sid-ports" +MACHINE ?= "sifive-fu540" +DISTRO ?= "debian-sid-ports" diff --git a/meta-isar/conf/multiconfig/stm32mp15x-bullseye.conf b/meta-isar/conf/multiconfig/stm32mp15x-bullseye.conf index 7cbff12a..9932210c 100644 --- a/meta-isar/conf/multiconfig/stm32mp15x-bullseye.conf +++ b/meta-isar/conf/multiconfig/stm32mp15x-bullseye.conf @@ -1,5 +1,5 @@ # This software is a part of ISAR. # Copyright (C) 2022 ilbers GmbH -MACHINE = "stm32mp15x" -DISTRO = "debian-bullseye" +MACHINE ?= "stm32mp15x" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/stm32mp15x-buster.conf b/meta-isar/conf/multiconfig/stm32mp15x-buster.conf index d1b76d0f..01caf876 100644 --- a/meta-isar/conf/multiconfig/stm32mp15x-buster.conf +++ b/meta-isar/conf/multiconfig/stm32mp15x-buster.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "stm32mp15x" -DISTRO = "debian-buster" +MACHINE ?= "stm32mp15x" +DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/virtualbox-bullseye.conf b/meta-isar/conf/multiconfig/virtualbox-bullseye.conf index 90bb17e5..e7e2d50a 100644 --- a/meta-isar/conf/multiconfig/virtualbox-bullseye.conf +++ b/meta-isar/conf/multiconfig/virtualbox-bullseye.conf @@ -3,6 +3,5 @@ # # SPDX-License-Identifier: MIT - -MACHINE = "virtualbox" -DISTRO = "debian-bullseye" +MACHINE ?= "virtualbox" +DISTRO ?= "debian-bullseye" -- 2.34.1