From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239976793797558272 X-Received: by 2002:a05:6214:20ed:b0:621:6217:f528 with SMTP id 13-20020a05621420ed00b006216217f528mr14292541qvk.30.1685688459971; Thu, 01 Jun 2023 23:47:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:90a:b0:626:a29:5d32 with SMTP id dj10-20020a056214090a00b006260a295d32ls25123qvb.0.-pod-prod-07-us; Thu, 01 Jun 2023 23:47:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4924r6vgvI94gpdKhcizthhaqPuDrI3aWbvPJfkJl7SCLiyaURAFnRg8CysHbWq9KB/uwy X-Received: by 2002:ad4:5ae4:0:b0:625:aa1a:9384 with SMTP id c4-20020ad45ae4000000b00625aa1a9384mr14468206qvh.64.1685688458938; Thu, 01 Jun 2023 23:47:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685688458; cv=none; d=google.com; s=arc-20160816; b=qXKi9u4Q44nseUEMtpY6eFAlpwbECpfBp3rrgg7xbaRbW2IXWq0mWCjb1ZaW2aiya6 TNj4zspgErB1zOIivjTGhHgz19tnz7/2iVyQSYRMrAILmmMJ5OcnfDXNcnIR18RZ1trw pbNPYH6ismRqoVc0JsnYZS60nQ3oN4r9A0NT3qAFHGaHctI1iSQWNZF50y26Pyt3Hm/v 3KbCfAGYMU4BJrTq9fTgc2/eZkVEJ+lHBS2WQNeqsPL/SwSmRvE8saGk1XBtT3yVopMb leEk74/jhpeoBME196fKtC/JZpeM8gLhOuBY0f3Gobgei9xuKowke8eFJ4BqVmyB00du tHqw== 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:to:from; bh=DKo4QlALeHFPZlcGDrNyQLdEq+UDcwYPYi1QL6On/cE=; b=g0tWP1Uym8ewDCLiNEawoROjsLJRXzCDg4iC4Pe3i5Bjw0Wy23iQ/R66VqQWsDHptP S9ce9LyZh4gnadIIRSIlCN6OyovIs8qsrqrOsDDgUIzq11Jxhh/vsHVp0ABE9skjp0+H fwks2JHuXSw2RiqEP9lEAxJgootk4W6n4QlVEJzsk3pwIuBQrvYDBPuh7eA0mjKnylJ3 2VcybOoNFC/Uqss0F1CNea9D36I0It2TJtlaQ7CYeViY6R8Z6g3a6aaK53c18TiGaLKB VEVVJbZa4qpHr3KYmpuxFy+ybJLpV+3csBz8hQ5fA8zYpHZoomFfMX/dCffu9b8DxR86 QK+Q== 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 ct6-20020a056214178600b006262d9cc70esi80213qvb.5.2023.06.01.23.47.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 23:47:38 -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 3526lTd1003460 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Jun 2023 08:47:32 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 10/10] meta-isar: Unify multiconfigs to use weak assignments Date: Fri, 2 Jun 2023 08:47:29 +0200 Message-Id: <20230602064729.10331-11-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230602064729.10331-1-ubely@ilbers.de> References: <20230602064729.10331-1-ubely@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: NsmpYmlAHZG7 From: Anton Mikanovich 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 ++-- .../conf/multiconfig/starfive-visionfive2-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 ++--- 13 files changed, 26 insertions(+), 27 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/starfive-visionfive2-sid-ports.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf index 98c9534a..ee42ab4d 100644 --- a/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf +++ b/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf @@ -3,5 +3,5 @@ # # SPDX-License-Identifier: MIT -MACHINE = "starfive-visionfive2" -DISTRO = "debian-sid-ports" +MACHINE ?= "starfive-visionfive2" +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.20.1