[2/3] bootstrap: make DISTRO_BOOTSTRAP_BASE_PACKAGES changeable

Message ID 20241219110010.389690-2-felix.moessbauer@siemens.com
State Accepted, archived
Headers show
Series [1/3] bootstrap: space-separate base packages | expand

Commit Message

Felix Moessbauer Dec. 19, 2024, 11 a.m. UTC
To deal with the complex situation of usrmerge during bootstrapping,
we need to make DISTRO_BOOTSTRAP_BASE_PACKAGES modifyable in the distro
conf. For that, we just append to that variable in the bootstrap recipe
so we can define additional packages in the distro conf.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc   | 2 +-
 meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 6a612852..08d61a84 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -13,7 +13,7 @@  PV = "1.0"
 
 DEBOOTSTRAP ?= "qemu-debootstrap"
 ROOTFSDIR = "${WORKDIR}/rootfs"
-DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales"
+DISTRO_BOOTSTRAP_BASE_PACKAGES += "locales"
 DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = " gnupg"
 DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates"
 
diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
index 0f2e6dc9..01ed1e59 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -11,7 +11,7 @@  inherit deb-dl-dir
 
 FILESEXTRAPATHS:append = ":${LAYERDIR_core}/recipes-core/isar-bootstrap/files"
 
-DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales apt usrmerge"
+DISTRO_BOOTSTRAP_BASE_PACKAGES += "locales apt usrmerge"
 DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates"
 
 BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir"