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>

1 files changed, 1 insertions, 3 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