busybox: upgrade to 1.19.4

Removing the patch busybox-1.19.3-getty.patch is because it is already in the upstream.

Signed-off-by: Shane Wang <shane.wang@intel.com>

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch b/meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
deleted file mode 100644 (file)
index 0578d78..0000000
--- a/meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Backport
-
-Patch is taken from upstream 
-http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch
-
---- busybox-1.19.3/loginutils/getty.c
-+++ busybox-1.19.3-getty/loginutils/getty.c
-@@ -271,7 +271,9 @@ static void termios_init(int speed)
- #ifdef CMSPAR
-               | CMSPAR  /* mark or space parity */
- #endif
-+#ifdef CBAUD
-               | CBAUD   /* (output) baud rate */
-+#endif
- #ifdef CBAUDEX
-               | CBAUDEX /* (output) baud rate */
- #endif

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/B921600.patch b/meta/recipes-core/busybox/busybox-1.19.4/B921600.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/B921600.patch
rename to meta/recipes-core/busybox/busybox-1.19.4/B921600.patch

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.19.4/busybox-appletlib-dependency.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/busybox-appletlib-dependency.patch
rename to meta/recipes-core/busybox/busybox-1.19.4/busybox-appletlib-dependency.patch

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch
rename to meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.4/defconfig
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/defconfig
rename to meta/recipes-core/busybox/busybox-1.19.4/defconfig

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.19.4/get_header_tar.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/get_header_tar.patch
rename to meta/recipes-core/busybox/busybox-1.19.4/get_header_tar.patch

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.19.4/run-parts.in.usr-bin.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/run-parts.in.usr-bin.patch
rename to meta/recipes-core/busybox/busybox-1.19.4/run-parts.in.usr-bin.patch

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/udhcpc-fix-nfsroot.patch b/meta/recipes-core/busybox/busybox-1.19.4/udhcpc-fix-nfsroot.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/udhcpc-fix-nfsroot.patch
rename to meta/recipes-core/busybox/busybox-1.19.4/udhcpc-fix-nfsroot.patch

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/udhcpscript.patch b/meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.19.3/udhcpscript.patch
rename to meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch

diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
similarity index 82%
rename from meta/recipes-core/busybox/busybox_1.19.3.bb
rename to meta/recipes-core/busybox/busybox_1.19.4.bb
index 49ac85914357578e507e1739bce298abf7139842..dff616de2702211c73099efb4c298f1f97e6bf14 100644 (file)
--- a/meta/recipes-core/busybox/busybox_1.19.3.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r5"
+PR = "r0"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
@@ -7,7 +7,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://B921600.patch \
            file://get_header_tar.patch \
            file://busybox-appletlib-dependency.patch \
-           file://busybox-1.19.3-getty.patch \
            file://run-parts.in.usr-bin.patch \
            file://busybox-udhcpc-no_deconfig.patch \
            file://find-touchscreen.sh \
@@ -26,7 +25,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://umount.busybox \
            file://defconfig"
 
-SRC_URI[tarball.md5sum] = "c3938e1ac59602387009bbf1dd1af7f6"
-SRC_URI[tarball.sha256sum] = "a1a9a35732c719ef384f02b6e357c324d8be25bc154af91a48c4264b1e6038f0"
+SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e"
+SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee"
 
 EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"