diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-12-27 14:53:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-31 11:53:26 +0000 |
commit | 30b73ad7a160b2e4bf610c502376c7429803c856 (patch) | |
tree | 9188f16e42a1bdbacd04160b065939d12ccca888 | |
parent | 238c1b1389ae59f89dcc6c1b1a98f7c57daf21f5 (diff) | |
download | poky-30b73ad7a160b2e4bf610c502376c7429803c856.tar.gz |
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 <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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 () { | |||
309 | install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev | 309 | install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev |
310 | fi | 310 | fi |
311 | fi | 311 | fi |
312 | if grep -q "CONFIG_INIT=y" ${B}/.config; then | 312 | if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then |
313 | install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS | 313 | install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS |
314 | install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK | 314 | install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK |
315 | install -D -m 0755 ${WORKDIR}/rcS.default ${D}${sysconfdir}/default/rcS | 315 | install -D -m 0755 ${WORKDIR}/rcS.default ${D}${sysconfdir}/default/rcS |