From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH] Allow to manage HOST_DISTRO_APT_SOURCES via distro config
Date: Sun, 22 Mar 2020 09:13:13 +0100 [thread overview]
Message-ID: <276fd433-688c-4131-d3d6-74fbb08bc865@siemens.com> (raw)
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>
---
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 16b4395b..6f496d9e 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -28,7 +28,6 @@ DEPLOY_ISAR_BOOTSTRAP ?= ""
DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales"
DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg"
DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates"
-HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list"
python () {
distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split()
--
2.16.4
reply other threads:[~2020-03-22 8:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=276fd433-688c-4131-d3d6-74fbb08bc865@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox