From: Andrej Valek <andrej.valek@siemens.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v4 1/3] busybox: fix conflict with runlevel applet
Date: Tue, 9 Oct 2018 14:56:38 +0200 [thread overview]
Message-ID: <20181009125640.11465-1-andrej.valek@siemens.com> (raw)
In-Reply-To: <20181004104147.14644-1-andrej.valek@siemens.com>
- remove OE runlevel script which conflicts with busybox's applet
- don't install empty directories
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
meta/recipes-core/busybox/busybox.inc | 4 +---
meta/recipes-core/busybox/busybox/init.cfg | 1 +
meta/recipes-core/busybox/busybox_1.29.2.bb | 1 -
meta/recipes-core/busybox/files/runlevel | 11 -----------
4 files changed, 2 insertions(+), 15 deletions(-)
delete mode 100644 meta/recipes-core/busybox/files/runlevel
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"
-
--
2.11.0
next prev parent reply other threads:[~2018-10-09 12:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 10:41 [PATCH] busybox: fix conflict with runlevel applet Andrej Valek
2018-10-04 10:48 ` Martin Jansa
2018-10-04 10:59 ` Andrej Valek
2018-10-04 11:27 ` Martin Jansa
2018-10-08 15:39 ` Burton, Ross
2018-10-08 15:44 ` Khem Raj
2018-10-09 7:38 ` [PATCH v2 1/3] " Andrej Valek
2018-10-09 10:51 ` Burton, Ross
2018-10-09 10:59 ` [PATCH v3 " Andrej Valek
2018-10-09 10:59 ` [PATCH v3 2/3] busybox: do not write grep outputs into log Andrej Valek
2018-10-09 10:59 ` [PATCH v3 3/3] busybox: unify recipe style Andrej Valek
2018-10-09 7:38 ` [PATCH v2 2/3] busybox: do not write grep outputs into log Andrej Valek
2018-10-09 7:38 ` [PATCH v2 3/3] busybox: unify recipe style Andrej Valek
2018-10-09 11:07 ` ✗ patchtest: failure for busybox: fix conflict with runlevel applet (rev4) Patchwork
2018-10-09 11:07 ` ✗ patchtest: failure for busybox: fix conflict with runlevel applet (rev5) Patchwork
2018-10-09 12:55 ` [PATCH v4 0/3] busybox: refactor Andrej Valek
2018-10-09 12:56 ` Andrej Valek [this message]
2018-10-09 12:56 ` [PATCH v4 2/3] busybox: do not write grep outputs into log Andrej Valek
2018-10-09 12:56 ` [PATCH v4 3/3] busybox: unify recipe style Andrej Valek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181009125640.11465-1-andrej.valek@siemens.com \
--to=andrej.valek@siemens.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox