From b17bd2c4b0c2e7e440cedc29f32469622c31fca3 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 28 Sep 2020 18:27:51 -0400 Subject: busybox-initrd: move static configuration to 'vmsep' distro feature We already have a distro feature that controls the static/non-static configuration of libgcrypt: 'vmsep' To avoid build errors on distros that don't have static libgcrypt available, we move the CONFIG_STATIC config to a fragment and only enable it whent he distro feature is set. Signed-off-by: Bruce Ashfield --- recipes-core/busybox/busybox-initrd/initrd.cfg | 2 -- recipes-core/busybox/busybox-initrd/static.cfg | 1 + recipes-core/busybox/busybox-initrd_1.32.0.bb | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 recipes-core/busybox/busybox-initrd/static.cfg (limited to 'recipes-core') diff --git a/recipes-core/busybox/busybox-initrd/initrd.cfg b/recipes-core/busybox/busybox-initrd/initrd.cfg index 9f64c4c6..04896713 100644 --- a/recipes-core/busybox/busybox-initrd/initrd.cfg +++ b/recipes-core/busybox/busybox-initrd/initrd.cfg @@ -10,5 +10,3 @@ CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_FEATURE_SHADOWPASSWDS is not set CONFIG_USE_BB_PWD_GRP=y - -CONFIG_STATIC=y diff --git a/recipes-core/busybox/busybox-initrd/static.cfg b/recipes-core/busybox/busybox-initrd/static.cfg new file mode 100644 index 00000000..25902bb7 --- /dev/null +++ b/recipes-core/busybox/busybox-initrd/static.cfg @@ -0,0 +1 @@ +CONFIG_STATIC=y diff --git a/recipes-core/busybox/busybox-initrd_1.32.0.bb b/recipes-core/busybox/busybox-initrd_1.32.0.bb index 82edb570..5ce5fa52 100644 --- a/recipes-core/busybox/busybox-initrd_1.32.0.bb +++ b/recipes-core/busybox/busybox-initrd_1.32.0.bb @@ -5,6 +5,7 @@ require recipes-core/busybox/busybox_${PV}.bb SRC_URI += "file://init.cfg \ file://mdev.cfg \ file://runx.cfg \ + ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'file://static.cfg', '', d)} \ file://initrd.cfg" S = "${WORKDIR}/busybox-${PV}" -- cgit v1.2.3-54-g00ecf