From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a05:6214:27c6:b0:631:f384:2859 with SMTP id ge6-20020a05621427c600b00631f3842859mr2209422qvb.38.1687241151989; Mon, 19 Jun 2023 23:05:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:4e0f:0:b0:62d:e49c:234d with SMTP id dl15-20020ad44e0f000000b0062de49c234dls149619qvb.0.-pod-prod-00-us; Mon, 19 Jun 2023 23:05:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6o0xZIyd94LG343+BdoqWm1WAw1MuB/JRDHu85AGsn92dAUKM9ReUGT8sGVG54eJRPEcTq X-Received: by 2002:a05:620a:2449:b0:75b:23a1:d85f with SMTP id h9-20020a05620a244900b0075b23a1d85fmr20633481qkn.33.1687241151349; Mon, 19 Jun 2023 23:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241151; cv=none; d=google.com; s=arc-20160816; b=Lj0yhrNw5Nhx4Q7mcgA/L8AmC+K9xXZNkk+2Tuw8Krwaz1C+eawirzLJcZ38QuXXUz viBlCuiR66so+m4o64MurK4y4wKxEypU3BqMEodK3Ha2gwmzfra+r8AXF1CaLDrFiYCy 89aDbJuSkOtr1na+d8zNmV98yviLju3MjIWrsmSNMAY6Ymt+EW1f9nZXHKRsAUZjSMYh ikXtm7DsAEpBMcC98oA0fRPoTL8ke5yg7o05GLqJhUzCo7vH2U4B+/RhK7R/PPAB65FQ 2imqL43rjLOsTfuGcYcbrsaDuSt8i8F5RgwuYbu5o/Q1I59sp7Xy6YSLNNsDyQQ6g5ZT KNgg== 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=I0p0on9dX+CnIoosl+SSVO35g3dN2HFo8smt4kTC6OBrsNk8L+1QUYl8fRglScB17Q QAjSeP+p1ADwZcq+eWiAg4JVlF/fvyFLJOckESWM3nyOhL6UwP1QQEB7IE4Bz0dnVOex 0vdy3bYwiKew7GNx9V0a5vdr3ICJ0GFnTsUKqrVOuXVyKddC9vZPZhIjbG5S0mX0R5+u 8Y5eXwKN8S0hJ9WAMGUb38RW92Waf1YCDfwgdKb61IxA47bnrrmWypLr59OxD9TRzX/V drzBmasfGB3D3/ioDqUKYsGoE7vYCK//SCGAc5eSmPNQ8iME47C2McyVPMb7NQOYWRMw PS4A== 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 ef6-20020a05620a808600b007624950f479si133055qkb.1.2023.06.19.23.05.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:51 -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 35K65iY7027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:49 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 12/12] meta-isar: Unify multiconfigs to use weak assignments Date: Tue, 20 Jun 2023 08:05:44 +0200 Message-Id: <20230620060544.19745-13-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de> References: <20230620060544.19745-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: qoyPjmzjq1Ud 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