[OE-core] [PATCH v2 1/3] busybox: fix conflict with runlevel applet

[Burton, Ross]

Don't you want to delete runlevel here too?

Ross

On Tue, 9 Oct 2018 at 08:45, Andrej Valek <andrej.valek at siemens.com> wrote:

> - remove OE runlevel script which conflicts with busybox's applet
> - don't install empty directories
>
> Signed-off-by: Andrej Valek <andrej.valek at siemens.com>
> ---
>  meta/recipes-core/busybox/busybox.inc      | 4 +---
>  meta/recipes-core/busybox/busybox/init.cfg | 1 +
>  2 files changed, 2 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 () {
>                         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
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20181009/aa20fde4/attachment-0002.html>