diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2018-10-09 14:56:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-10 12:47:34 +0100 |
commit | e57eaaad60e6feafdd502aa54d3037dd3178cf99 (patch) | |
tree | 70bb8593ea6fc81a9df3f2a313e882f7b737c028 /meta/recipes-core/busybox/busybox.inc | |
parent | 10583273f53b0f62d6d49628f43ea974d95c160f (diff) | |
download | poky-e57eaaad60e6feafdd502aa54d3037dd3178cf99.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 4 |
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 () { | |||
254 | ln -sf busybox ${D}${base_bindir}/busybox.nosuid | 254 | ln -sf busybox ${D}${base_bindir}/busybox.nosuid |
255 | fi | 255 | fi |
256 | else | 256 | else |
257 | install -d ${D}${base_bindir} ${D}${base_sbindir} | 257 | install -d ${D}${base_bindir} ${D}${bindir} ${D}${libdir} |
258 | install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir} | ||
259 | cat busybox.links | while read FILE; do | 258 | cat busybox.links | while read FILE; do |
260 | NAME=`basename "$FILE"` | 259 | NAME=`basename "$FILE"` |
261 | install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}" | 260 | install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}" |
@@ -316,7 +315,6 @@ do_install () { | |||
316 | if grep "CONFIG_INIT=y" ${B}/.config; then | 315 | if grep "CONFIG_INIT=y" ${B}/.config; then |
317 | install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS | 316 | install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS |
318 | install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK | 317 | install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK |
319 | install -D -m 0755 ${WORKDIR}/runlevel ${D}${base_sbindir}/runlevel | ||
320 | fi | 318 | fi |
321 | 319 | ||
322 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 320 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |