summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2018-10-09 14:56:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 12:47:34 +0100
commite57eaaad60e6feafdd502aa54d3037dd3178cf99 (patch)
tree70bb8593ea6fc81a9df3f2a313e882f7b737c028 /meta/recipes-core/busybox
parent10583273f53b0f62d6d49628f43ea974d95c160f (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/busybox/busybox.inc4
-rw-r--r--meta/recipes-core/busybox/busybox/init.cfg1
-rw-r--r--meta/recipes-core/busybox/busybox_1.29.2.bb1
-rw-r--r--meta/recipes-core/busybox/files/runlevel11
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 () {
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
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 @@
1CONFIG_INIT=y 1CONFIG_INIT=y
2CONFIG_RUNLEVEL=y
2CONFIG_FEATURE_USE_INITTAB=y 3CONFIG_FEATURE_USE_INITTAB=y
3CONFIG_HALT=y 4CONFIG_HALT=y
4CONFIG_POWEROFF=y 5CONFIG_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 \
40 file://inittab \ 40 file://inittab \
41 file://rcS \ 41 file://rcS \
42 file://rcK \ 42 file://rcK \
43 file://runlevel \
44 file://makefile-libbb-race.patch \ 43 file://makefile-libbb-race.patch \
45" 44"
46SRC_URI_append_libc-musl = " file://musl.cfg " 45SRC_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 @@
1#!/bin/sh
2# busybox init does not have LSB ( sysvinit ) like initlevels
3# so lets fake it to 5 which is what we default anyway
4# this helps with opkg post installs where it tries to invoke
5# update-rc.d ad post install step.
6# for package upgrades
7# See code in update-rc.d around line 190 where it calls runlevel
8# program
9#
10echo "5"
11