[PATCH v2] Allow to manage HOST_DISTRO_APT_SOURCES via distro config

[PATCH v2] Allow to manage HOST_DISTRO_APT_SOURCES via distro config

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Avoid any hard-coded assumption about how HOST_DISTRO_APT_SOURCES is
defined and move this into the distro configuration. This does not
change anything for in-tree distro configs but makes life easier for
layers that define their own distro.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Changes in v2:
 - rebased over next

 meta-isar/conf/distro/raspbian-stretch.conf         | 1 +
 meta/conf/distro/debian-common.conf                 | 2 ++
 meta/conf/distro/debian-sid-ports.conf              | 2 +-
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-isar/conf/distro/raspbian-stretch.conf b/meta-isar/conf/distro/raspbian-stretch.conf
index 25c484d6..c8f523b3 100644
--- a/meta-isar/conf/distro/raspbian-stretch.conf
+++ b/meta-isar/conf/distro/raspbian-stretch.conf
@@ -7,6 +7,7 @@ BASE_DISTRO = "raspbian"
 BASE_DISTRO_CODENAME = "stretch"
 
 HOST_DISTRO ?= "debian-stretch"
+HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
 
 DISTRO_APT_SOURCES ?= "conf/distro/raspbian-stretch.list"
 DISTRO_BOOTSTRAP_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf
index b845c738..7d681c49 100644
--- a/meta/conf/distro/debian-common.conf
+++ b/meta/conf/distro/debian-common.conf
@@ -5,6 +5,8 @@
 
 BASE_DISTRO = "debian"
 
+HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
+
 WIC_IMAGER_INSTALL = "parted \
                       gdisk \
                       util-linux \
diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf
index 4997584e..8a8beb5a 100644
--- a/meta/conf/distro/debian-sid-ports.conf
+++ b/meta/conf/distro/debian-sid-ports.conf
@@ -17,7 +17,7 @@ DISTRO_BOOTSTRAP_KEYS += "${DEBIAN_PORTS_KEY}"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "riscv64"
 
-HOST_DISTRO_APT_SOURCES_append = " ${DISTRO_APT_SOURCES}"
+HOST_DISTRO_APT_SOURCES += "${DISTRO_APT_SOURCES}"
 THIRD_PARTY_APT_KEYS += "${DEBIAN_PORTS_KEY}"
 
 IMAGE_PREINSTALL += "init"
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 9ab80acc..da0d436b 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -26,7 +26,6 @@ DEPLOY_ISAR_BOOTSTRAP ?= ""
 DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales"
 DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg"
 DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = "${@https_support(d)}"
-HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list"
 
 inherit deb-dl-dir
 
-- 
2.16.4


-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH v2] Allow to manage HOST_DISTRO_APT_SOURCES via distro config

[Baurzhan Ismagulov]

On Mon, Apr 06, 2020 at 12:45:22PM +0200, Jan Kiszka wrote:
> Avoid any hard-coded assumption about how HOST_DISTRO_APT_SOURCES is
> defined and move this into the distro configuration. This does not
> change anything for in-tree distro configs but makes life easier for
> layers that define their own distro.

Applied to next, thanks.

With kind regards,
Baurzhan.