busybox: fix conflict with runlevel applet

- remove OE runlevel script which conflicts with busybox's applet
- don't install empty directories

(From OE-Core rev: dca804a9595002ddc3893720a96b7f1a67b6e6c4)

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andrej Valek
2018-10-09 14:56:38 +02:00
committed by Richard Purdie
parent 10583273f5
commit e57eaaad60
4 changed files with 2 additions and 15 deletions

View File

@@ -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

View File

@@ -1,4 +1,5 @@
CONFIG_INIT=y
CONFIG_RUNLEVEL=y
CONFIG_FEATURE_USE_INITTAB=y
CONFIG_HALT=y
CONFIG_POWEROFF=y

View File

@@ -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 "

View File

@@ -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"