diff options
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox/init.cfg | 1 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.29.2.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/files/runlevel | 11 |
4 files changed, 2 insertions, 15 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index e1fba4243a..7b427ab0f7 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -254,8 +254,7 @@ do_install () { ln -sf busybox ${D}${base_bindir}/busybox.nosuid fi else - install -d ${D}${base_bindir} ${D}${base_sbindir} - install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir} + install -d ${D}${base_bindir} ${D}${bindir} ${D}${libdir} cat busybox.links | while read FILE; do NAME=`basename "$FILE"` install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}" @@ -316,7 +315,6 @@ do_install () { if grep "CONFIG_INIT=y" ${B}/.config; then install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK - install -D -m 0755 ${WORKDIR}/runlevel ${D}${base_sbindir}/runlevel fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then diff --git a/meta/recipes-core/busybox/busybox/init.cfg b/meta/recipes-core/busybox/busybox/init.cfg index 3c1fdd42b6..b69fe0ea9c 100644 --- a/meta/recipes-core/busybox/busybox/init.cfg +++ b/meta/recipes-core/busybox/busybox/init.cfg @@ -1,4 +1,5 @@ CONFIG_INIT=y +CONFIG_RUNLEVEL=y CONFIG_FEATURE_USE_INITTAB=y CONFIG_HALT=y CONFIG_POWEROFF=y diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb b/meta/recipes-core/busybox/busybox_1.29.2.bb index 3496a857c4..df3ea5906b 100644 --- a/meta/recipes-core/busybox/busybox_1.29.2.bb +++ b/meta/recipes-core/busybox/busybox_1.29.2.bb @@ -40,7 +40,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://inittab \ file://rcS \ file://rcK \ - file://runlevel \ file://makefile-libbb-race.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " diff --git a/meta/recipes-core/busybox/files/runlevel b/meta/recipes-core/busybox/files/runlevel deleted file mode 100644 index 866f3b5945..0000000000 --- a/meta/recipes-core/busybox/files/runlevel +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# busybox init does not have LSB ( sysvinit ) like initlevels -# so lets fake it to 5 which is what we default anyway -# this helps with opkg post installs where it tries to invoke -# update-rc.d ad post install step. -# for package upgrades -# See code in update-rc.d around line 190 where it calls runlevel -# program -# -echo "5" - |