All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] busybox: fix conflict with runlevel applet
@ 2018-10-04 10:41 Andrej Valek
  2018-10-04 10:48 ` Martin Jansa
                   ` (6 more replies)
  0 siblings, 7 replies; 19+ messages in thread
From: Andrej Valek @ 2018-10-04 10:41 UTC (permalink / raw)
  To: openembedded-core

When CONFIG_RUNLEVEL is enabled, it conflicts with installed OE's script.
Make grep quite for prevent to write information into logs.

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
 meta/recipes-core/busybox/busybox.inc | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index e1fba4243a..9c546927ab 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -279,32 +279,32 @@ do_install () {
 		install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf
 		install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf
 	fi
-	if grep "CONFIG_CROND=y" ${B}/.config; then
+	if grep -q "CONFIG_CROND=y" ${B}/.config; then
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HTTPD=y" ${B}/.config; then
+	if grep -q "CONFIG_HTTPD=y" ${B}/.config; then
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
-	if grep "CONFIG_UDHCPD=y" ${B}/.config; then
+	if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HWCLOCK=y" ${B}/.config; then
+	if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_UDHCPC=y" ${B}/.config; then
+	if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then
 		install -d ${D}${sysconfdir}/udhcpc.d
 		install -d ${D}${datadir}/udhcpc
 		install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default
 		sed -i "s:/SBIN_DIR/:${base_sbindir}/:" ${D}${sysconfdir}/udhcpc.d/50default
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 	fi
-	if grep "CONFIG_INETD=y" ${B}/.config; then
+	if grep -q "CONFIG_INETD=y" ${B}/.config; then
 		install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN}
 		sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN}
 		install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
 	fi
-        if grep "CONFIG_MDEV=y" ${B}/.config; then
+        if grep -q "CONFIG_MDEV=y" ${B}/.config; then
                install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
                if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
                        install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf
@@ -313,10 +313,12 @@ do_install () {
                        install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev
                fi
 	fi
-        if grep "CONFIG_INIT=y" ${B}/.config; then
+        if grep -q "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
+                if ! grep -q "CONFIG_RUNLEVEL=y" ${B}/.config; then
+                        install -D -m 0755 ${WORKDIR}/runlevel ${D}${base_sbindir}/runlevel
+                fi
         fi
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2018-10-09 12:57 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v4 1/3] busybox: fix conflict with runlevel applet Andrej Valek
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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.