]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox.inc: install rcS, rcK and rcS.default only with busybox in VIRTUAL-RUNTIME_in...
authorMartin Jansa <Martin.Jansa@gmail.com>
Sun, 27 Dec 2020 13:53:01 +0000 (14:53 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 31 Dec 2020 11:53:21 +0000 (11:53 +0000)
* 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.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/busybox/busybox.inc

index c3a97261d5ece94b8184ef9a1003403e934c310f..47fcb59302560345e64a181da899cccd28731314 100644 (file)
@@ -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