From 30b73ad7a160b2e4bf610c502376c7429803c856 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 27 Dec 2020 14:53:01 +0100 Subject: busybox.inc: install rcS, rcK and rcS.default only with busybox in VIRTUAL-RUNTIME_init_manager * since https://git.openembedded.org/openembedded-core/commit/?id=991394be9e695f9ddb5e2fca167c06f7a56a7449 the rcS.default is in SRC_URI only when VIRTUAL-RUNTIME_init_manager is 'busybox' but this section in do_install was controlled by CONFIG_INIT=y in /.config which for busybox-initrd from meta-virtualization caused: ERROR: busybox-initrd-1.32.0-r0 do_install: Execution of '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/busybox-initrd/1.32.0-r0/temp/run.do_install.1481880' failed with exit code 1: CONFIG_FEATURE_MDEV_CONF=y install: cannot stat '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/busybox-initrd/1.32.0-r0/rcS.default': No such file or directory WARNING: exit code 1 from a shell command. (From OE-Core rev: 00f22daa9774783ba14073fb871bbbc6e7c5354d) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index c3a97261d5..47fcb59302 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -309,7 +309,7 @@ do_install () { install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev fi fi - if grep -q "CONFIG_INIT=y" ${B}/.config; then + if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK install -D -m 0755 ${WORKDIR}/rcS.default ${D}${sysconfdir}/default/rcS -- cgit v1.2.3-54-g00ecf