[PATCH 1/3] busybox: drop unused mount.busybox and umount.busybox wrappers

[PATCH 1/3] busybox: drop unused mount.busybox and umount.busybox wrappers

[Andre McCurdy]

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-core/busybox/busybox_1.31.0.bb    | 2 --
 meta/recipes-core/busybox/files/mount.busybox  | 3 ---
 meta/recipes-core/busybox/files/umount.busybox | 3 ---
 3 files changed, 8 deletions(-)
 delete mode 100755 meta/recipes-core/busybox/files/mount.busybox
 delete mode 100755 meta/recipes-core/busybox/files/umount.busybox

diff --git a/meta/recipes-core/busybox/busybox_1.31.0.bb b/meta/recipes-core/busybox/busybox_1.31.0.bb
index c1da372629..fa63965674 100644
--- a/meta/recipes-core/busybox/busybox_1.31.0.bb
+++ b/meta/recipes-core/busybox/busybox_1.31.0.bb
@@ -9,7 +9,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://default.script \
            file://simple.script \
            file://hwclock.sh \
-           file://mount.busybox \
            file://syslog \
            file://syslog-startup.conf \
            file://syslog.conf \
@@ -17,7 +16,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://mdev \
            file://mdev.conf \
            file://mdev-mount.sh \
-           file://umount.busybox \
            file://defconfig \
            file://busybox-syslog.service.in \
            file://busybox-klogd.service.in \
diff --git a/meta/recipes-core/busybox/files/mount.busybox b/meta/recipes-core/busybox/files/mount.busybox
deleted file mode 100755
index fef945b7b2..0000000000
--- a/meta/recipes-core/busybox/files/mount.busybox
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /bin/busybox mount $@
diff --git a/meta/recipes-core/busybox/files/umount.busybox b/meta/recipes-core/busybox/files/umount.busybox
deleted file mode 100755
index f3731626e6..0000000000
--- a/meta/recipes-core/busybox/files/umount.busybox
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /bin/busybox umount $@
-- 
2.23.0

[PATCH 2/3] busybox: drop inittab from SRC_URI ( now moved to busybox-inittab )

[Andre McCurdy]

The reference to inittab should have been removed from busybox
SRC_URI when the file was moved into the busybox-inittab recipe:

  http://git.openembedded.org/openembedded-core/commit/?id=afb09abd2f0f7555ba156260a87fd3867f591310

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-core/busybox/busybox_1.31.0.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox_1.31.0.bb b/meta/recipes-core/busybox/busybox_1.31.0.bb
index fa63965674..34b1f2cc91 100644
--- a/meta/recipes-core/busybox/busybox_1.31.0.bb
+++ b/meta/recipes-core/busybox/busybox_1.31.0.bb
@@ -36,7 +36,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \
            file://syslog.cfg \
            file://unicode.cfg \
-           file://inittab \
            file://rcS \
            file://rcK \
            file://makefile-libbb-race.patch \
-- 
2.23.0

[PATCH 3/3] busybox-inittab: minor formatting tweaks

[Andre McCurdy]

Add an empty line to inittab before the line(s) which start getty.

Also cleanup indent in recipe do_install().

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 .../busybox/busybox-inittab_1.31.0.bb         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
index c347daf501..61fb8cbad1 100644
--- a/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
+++ b/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
@@ -13,15 +13,16 @@ do_compile() {
 }
 
 do_install() {
-    install -d ${D}${sysconfdir}
-    install -D -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
-    tmp="${SERIAL_CONSOLES}"
-    for i in $tmp
-    do
-            j=`echo ${i} | sed s/\;/\ /g`
-            id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'`
-            echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
-    done
+	install -d ${D}${sysconfdir}
+	install -D -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
+	tmp="${SERIAL_CONSOLES}"
+	[ -n "$tmp" ] && echo >> ${D}${sysconfdir}/inittab
+	for i in $tmp
+	do
+		j=`echo ${i} | sed s/\;/\ /g`
+		id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'`
+		echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
+	done
 }
 
 # SERIAL_CONSOLES is generally defined by the MACHINE .conf.
-- 
2.23.0

Re: [PATCH 3/3] busybox-inittab: minor formatting tweaks

[Denys Dmytriyenko]

On Thu, Sep 12, 2019 at 03:56:24PM -0700, Andre McCurdy wrote:
> Add an empty line to inittab before the line(s) which start getty.
> 
> Also cleanup indent in recipe do_install().
> 
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>

Reviewed-by: Denys Dmytriyenko <denys@ti.com>


> ---
>  .../busybox/busybox-inittab_1.31.0.bb         | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
> index c347daf501..61fb8cbad1 100644
> --- a/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
> +++ b/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
> @@ -13,15 +13,16 @@ do_compile() {
>  }
>  
>  do_install() {
> -    install -d ${D}${sysconfdir}
> -    install -D -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
> -    tmp="${SERIAL_CONSOLES}"
> -    for i in $tmp
> -    do
> -            j=`echo ${i} | sed s/\;/\ /g`
> -            id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'`
> -            echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
> -    done
> +	install -d ${D}${sysconfdir}
> +	install -D -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
> +	tmp="${SERIAL_CONSOLES}"
> +	[ -n "$tmp" ] && echo >> ${D}${sysconfdir}/inittab
> +	for i in $tmp
> +	do
> +		j=`echo ${i} | sed s/\;/\ /g`
> +		id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'`
> +		echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
> +	done
>  }
>  
>  # SERIAL_CONSOLES is generally defined by the MACHINE .conf.
> -- 
> 2.23.0
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core