[OE-core] [PATCH] busybox: fix conflict with runlevel applet

[Martin Jansa]

On Thu, Oct 04, 2018 at 12:59:37PM +0200, Andrej Valek wrote:
> This init feature was introduced via
> http://lists.openembedded.org/pipermail/openembedded-core/2016-January/116109.html
> which is from 2016. Busybox has this runlevel applet available from 2005.
> 
> I think, Raj was trying to make this system really tiny. So, I am not
> sure, what would be the impact, if we dropped this runlevel script.

OK, fair enough. I don't use busybox init anyway.

I was just curious, because there is also runlevel from upstart which we were
using (and I have u-a for runlevel in busybox.bbappend because of that).
So I was surprised that there is actually 3rd implementation as OE
specific shell script.

> On 10/4/18 12:48 PM, Martin Jansa wrote:
> > I'm not against this change, but would it make sense to enable runlevel applet in:
> > meta/recipes-core/busybox/busybox/init.cfg
> > and drop the runlevel shell script completely?
> > 
> > On Thu, Oct 4, 2018 at 12:42 PM Andrej Valek <andrej.valek at siemens.com 
> > <mailto:andrej.valek at siemens.com>> wrote:
> > 
> >     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 at siemens.com
> >     <mailto:andrej.valek at 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
> > 
> >     -- 
> >     _______________________________________________
> >     Openembedded-core mailing list
> >     Openembedded-core at lists.openembedded.org
> >     <mailto:Openembedded-core at lists.openembedded.org>
> >     http://lists.openembedded.org/mailman/listinfo/openembedded-core
> > 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20181004/7c1609b8/attachment-0002.sig>