aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-03-14 17:01:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 12:40:08 +0000
commitf03f8eac4c72be0f16468ebd0ee4dd1f07b0563b (patch)
treeee406230d93f40e7480239c7e1aba7ef3767596f /meta/recipes-core
parent98b9c17f2c236e1a23d9c74d93cb693b4d7b4d61 (diff)
downloadopenembedded-core-contrib-f03f8eac4c72be0f16468ebd0ee4dd1f07b0563b.tar.gz
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch17
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/B921600.patch (renamed from meta/recipes-core/busybox/busybox-1.19.3/B921600.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/busybox-appletlib-dependency.patch (renamed from meta/recipes-core/busybox/busybox-1.19.3/busybox-appletlib-dependency.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch (renamed from meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/defconfig (renamed from meta/recipes-core/busybox/busybox-1.19.3/defconfig)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/get_header_tar.patch (renamed from meta/recipes-core/busybox/busybox-1.19.3/get_header_tar.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/run-parts.in.usr-bin.patch (renamed from meta/recipes-core/busybox/busybox-1.19.3/run-parts.in.usr-bin.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/udhcpc-fix-nfsroot.patch (renamed from meta/recipes-core/busybox/busybox-1.19.3/udhcpc-fix-nfsroot.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch (renamed from meta/recipes-core/busybox/busybox-1.19.3/udhcpscript.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb (renamed from meta/recipes-core/busybox/busybox_1.19.3.bb)7
10 files changed, 3 insertions, 21 deletions
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
index 0578d78e9d..0000000000
--- 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
index c4d98e3a27..c4d98e3a27 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/B921600.patch
+++ b/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
index de2dbcceb1..de2dbcceb1 100644
--- 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
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
index 481d8b363a..481d8b363a 100644
--- 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
diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.4/defconfig
index 372d7b5a3a..372d7b5a3a 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig
+++ b/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
index 0e528ff91f..0e528ff91f 100644
--- 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
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
index 1fe20d4b0f..1fe20d4b0f 100644
--- 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
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
index d2eab8bd1b..d2eab8bd1b 100644
--- 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
diff --git a/meta/recipes-core/busybox/busybox-1.19.3/udhcpscript.patch b/meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch
index b82ea335ac..b82ea335ac 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/udhcpscript.patch
+++ b/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
index 49ac859143..dff616de27 100644
--- 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"