From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a92:d94c:0:b0:33b:c0d8:26af with SMTP id l12-20020a92d94c000000b0033bc0d826afmr7877675ilq.7.1686553986700; Mon, 12 Jun 2023 00:13:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:2169:b0:331:2c30:78bc with SMTP id s9-20020a056e02216900b003312c3078bcls1598537ilv.1.-pod-prod-01-us; Mon, 12 Jun 2023 00:13:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5DDqV+yYncsWjblriZhAH8d/u3rwgXJLrXeWdA5gIV+H5RL6/tA5dlmqUUPxr1FmK2UFJK X-Received: by 2002:a92:d28a:0:b0:33d:4b18:97ff with SMTP id p10-20020a92d28a000000b0033d4b1897ffmr7203328ilp.23.1686553986232; Mon, 12 Jun 2023 00:13:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686553986; cv=none; d=google.com; s=arc-20160816; b=znHUUwu40BSBKZBZ+/4dZvrIn8+g83orBAIobs3DTk0U+BzQnZpnM5tnAAWTlu0cur ioykdp1VYyVf2OdtsJ8ZVIBfUYOoLHNFveDTKhXUqrhBUEKGmyE6MuyN6W/bkOFE3xZH +a5+O2Knkw30DF8LWI+oOOkDbywLDYinCBHX75gG+EOvxu0l65Ryndqr+Q6m/mxx2nAI 93u0J/3nyQtVJoLE/cU93gK6VUghmGnBfKEfHYIupz5tPFKowo0tNwdouZAbl40jLcrE 2iCU3qsZgMuUX5kVOSDxozLDbilUHyM54fcW/EO7Oi/9i1oLhylEIIfSZGwZPPg/Ccib t/hg== 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=ERwukN4WO0cLERdY7y/kOnA7j9wx9lEdNhdeQ2m4kZtUFOqW+VcNjyTe8JeyYDKzEi XlN8C0UrI8vFILOc0GpdbBE1HIjPMfeEzhSK0+ZlPVRs4ojO5lrsDWuvzwwdNDvbr+aY 6kTWFqsxO/k3woIb146woXYTir/hvhV3WYT5+RAa7bq0TpXRRfJ8tclZrlBwai0PFCEz VESJYobP+bi/0gxOXMRjKxnSCs/PFZRPhypLiHeOYlEdPYbfkiP3KZqVmAcd2A3ZJ20q UHEuzKEjU7XKB+/9LFt65CuLAaYgnb/JgfIHroE+QPqJ6NALT1OFpFgIzpOTQL2cNkWN a27A== 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 j7-20020a056e02220700b0033b5e2a518bsi836252ilf.0.2023.06.12.00.13.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2023 00:13:06 -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 35C7Cucq007465 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 Jun 2023 09:13:00 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 10/10] meta-isar: Unify multiconfigs to use weak assignments Date: Mon, 12 Jun 2023 09:12:56 +0200 Message-Id: <20230612071256.8688-11-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230612071256.8688-1-ubely@ilbers.de> References: <20230612071256.8688-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: kPntQyM4arq/ 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