[PATCH] distro: Use ?= while specifying sources list

[PATCH] distro: Use ?= while specifying sources list

[vijaikumar.kanagarajan]

From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>

When testing custom repos, one might want to override
DISTRO_APT_SOURCES specified in the distro configuration file.
Use ?= instead of += to be able to override it in local.conf
file if needed.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 meta-isar/conf/distro/raspbian-stretch.conf | 2 +-
 meta/conf/distro/debian-bullseye.conf       | 2 +-
 meta/conf/distro/debian-buster.conf         | 2 +-
 meta/conf/distro/debian-stretch.conf        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-isar/conf/distro/raspbian-stretch.conf b/meta-isar/conf/distro/raspbian-stretch.conf
index 9c7fa01..25c484d 100644
--- a/meta-isar/conf/distro/raspbian-stretch.conf
+++ b/meta-isar/conf/distro/raspbian-stretch.conf
@@ -8,7 +8,7 @@ BASE_DISTRO_CODENAME = "stretch"
 
 HOST_DISTRO ?= "debian-stretch"
 
-DISTRO_APT_SOURCES += "conf/distro/raspbian-stretch.list"
+DISTRO_APT_SOURCES ?= "conf/distro/raspbian-stretch.list"
 DISTRO_BOOTSTRAP_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
 DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh"
 DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv"
diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
index b38c3c1..a93543c 100644
--- a/meta/conf/distro/debian-bullseye.conf
+++ b/meta/conf/distro/debian-bullseye.conf
@@ -6,7 +6,7 @@ BASE_DISTRO_CODENAME = "bullseye"
 
 HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
 
-DISTRO_APT_SOURCES += "conf/distro/debian-${BASE_DISTRO_CODENAME}.list"
+DISTRO_APT_SOURCES ?= "conf/distro/debian-${BASE_DISTRO_CODENAME}.list"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
     armmp-lpae cloud-amd64 loongson-3 octeon powerpc64le rpi s390x marvell \
diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
index bc3f5cf..c898dba 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -6,7 +6,7 @@ BASE_DISTRO_CODENAME = "buster"
 
 HOST_DISTRO ?= "debian-buster"
 
-DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
+DISTRO_APT_SOURCES ?= "conf/distro/debian-buster.list"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
     armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi s390x \
diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf
index 45940e0..931256b 100644
--- a/meta/conf/distro/debian-stretch.conf
+++ b/meta/conf/distro/debian-stretch.conf
@@ -7,7 +7,7 @@ BASE_DISTRO_CODENAME = "stretch"
 
 HOST_DISTRO ?= "debian-stretch"
 
-DISTRO_APT_SOURCES += "conf/distro/debian-stretch.list"
+DISTRO_APT_SOURCES ?= "conf/distro/debian-stretch.list"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
     armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
-- 
2.17.1

Re: [PATCH] distro: Use ?= while specifying sources list

[Baurzhan Ismagulov]

On Tue, Nov 19, 2019 at 12:56:28PM +0530, vijaikumar.kanagarajan@gmail.com wrote:
> When testing custom repos, one might want to override
> DISTRO_APT_SOURCES specified in the distro configuration file.
> Use ?= instead of += to be able to override it in local.conf
> file if needed.

Applied to next, thanks.

With kind regards,
Baurzhan.