summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-04-25 14:06:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:54:42 +0100
commita29b96e3828ecf8a4915856d1e6733a97cd4b89f (patch)
tree119531cc1adc53b34ea119b1e7a1483d3288dcb9 /meta/recipes-core
parentb9e63d96addd5fa1d69877e9a58e6ea92482e19b (diff)
downloadpoky-a29b96e3828ecf8a4915856d1e6733a97cd4b89f.tar.gz
busybox: upgrade to version 1.18.4
from version 1.17.3 - remove make-382-fix since it's upstreamed (From OE-Core rev: bb92a1852e17232c07658eef013f243ca6780563) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch25
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/B921600.patch (renamed from meta/recipes-core/busybox/busybox-1.17.3/B921600.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/busybox-appletlib-dependency.patch (renamed from meta/recipes-core/busybox/busybox-1.17.3/busybox-appletlib-dependency.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/busybox-udhcpc-no_deconfig.patch (renamed from meta/recipes-core/busybox/busybox-1.17.3/busybox-udhcpc-no_deconfig.patch)19
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/defconfig (renamed from meta/recipes-core/busybox/busybox-1.17.3/defconfig)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/get_header_tar.patch (renamed from meta/recipes-core/busybox/busybox-1.17.3/get_header_tar.patch)4
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch (renamed from meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/udhcpc-fix-nfsroot.patch (renamed from meta/recipes-core/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.18.4/udhcpscript.patch (renamed from meta/recipes-core/busybox/busybox-1.17.3/udhcpscript.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox_1.18.4.bb (renamed from meta/recipes-core/busybox/busybox_1.17.3.bb)7
10 files changed, 18 insertions, 37 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch b/meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch
deleted file mode 100644
index 4ef125d6c0..0000000000
--- a/meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From ef6c6d8cfef071435ccf275ad404a501626b706c Mon Sep 17 00:00:00 2001
2From: Thomas Chou <thomas@wytron.com.tw>
3Date: Tue, 19 Oct 2010 07:17:12 +0000
4Subject: mkmakefile: make 3.82 fix
5
6Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
7Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
8---
9diff --git a/scripts/mkmakefile b/scripts/mkmakefile
10index 7f9d544..9fc51a7 100755
11--- a/scripts/mkmakefile
12+++ b/scripts/mkmakefile
13@@ -31,6 +31,9 @@ all:
14
15 Makefile:;
16
17-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
18+\$(filter-out all Makefile,\$(MAKECMDGOALS)):
19+ \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
20+
21+%/:
22 \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
23 EOF
24--
25cgit v0.8.2.1
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/B921600.patch b/meta/recipes-core/busybox/busybox-1.18.4/B921600.patch
index 803dc411d8..803dc411d8 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/B921600.patch
+++ b/meta/recipes-core/busybox/busybox-1.18.4/B921600.patch
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.18.4/busybox-appletlib-dependency.patch
index 041aa6c54c..041aa6c54c 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/busybox-appletlib-dependency.patch
+++ b/meta/recipes-core/busybox/busybox-1.18.4/busybox-appletlib-dependency.patch
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox-1.18.4/busybox-udhcpc-no_deconfig.patch
index cdf56b826c..405d4823af 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/busybox-udhcpc-no_deconfig.patch
+++ b/meta/recipes-core/busybox/busybox-1.18.4/busybox-udhcpc-no_deconfig.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Add a new option -D to the udhcpc client that allows for 3Add a new option -D to the udhcpc client that allows for
2dhcp renewal to occur without having to down the interface 4dhcp renewal to occur without having to down the interface
3in the process. 5in the process.
@@ -8,6 +10,11 @@ Updated to latest Busybox 1.17.3
8 10
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 11Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10 12
13Updated to Busybox 1.18.4
14option spec is changed
15
16Signed-off-by: Qing He <qing.he@intel.com>
17
11diff -ur busybox-1.17.3.orig/networking/udhcp/dhcpc.c busybox-1.17.3/networking/udhcp/dhcpc.c 18diff -ur busybox-1.17.3.orig/networking/udhcp/dhcpc.c busybox-1.17.3/networking/udhcp/dhcpc.c
12--- busybox-1.17.3.orig/networking/udhcp/dhcpc.c 19--- busybox-1.17.3.orig/networking/udhcp/dhcpc.c
13+++ busybox-1.17.3/networking/udhcp/dhcpc.c 20+++ busybox-1.17.3/networking/udhcp/dhcpc.c
@@ -42,10 +49,10 @@ diff -ur busybox-1.17.3.orig/networking/udhcp/dhcpc.c busybox-1.17.3/networking/
42 bb_info_msg("Entering released state"); 49 bb_info_msg("Entering released state");
43 50
44@@ -836,6 +841,7 @@ 51@@ -836,6 +841,7 @@
45 OPT_o = 1 << 18, 52 OPT_o = 1 << 17,
46 OPT_x = 1 << 19, 53 OPT_x = 1 << 18,
47 OPT_f = 1 << 20, 54 OPT_f = 1 << 19,
48+ OPT_D = 1 << 21, 55+ OPT_D = 1 << 20,
49 /* The rest has variable bit positions, need to be clever */ 56 /* The rest has variable bit positions, need to be clever */
50 OPTBIT_f = 20, 57 OPTBIT_f = 20,
51 USE_FOR_MMU( OPTBIT_b,) 58 USE_FOR_MMU( OPTBIT_b,)
@@ -53,8 +60,8 @@ diff -ur busybox-1.17.3.orig/networking/udhcp/dhcpc.c busybox-1.17.3/networking/
53 #endif 60 #endif
54 ; 61 ;
55 IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) 62 IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
56- opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:f" 63- opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:f"
57+ opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fD" 64+ opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fD"
58 USE_FOR_MMU("b") 65 USE_FOR_MMU("b")
59 IF_FEATURE_UDHCPC_ARPING("a") 66 IF_FEATURE_UDHCPC_ARPING("a")
60 IF_FEATURE_UDHCP_PORT("P:") 67 IF_FEATURE_UDHCP_PORT("P:")
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/defconfig b/meta/recipes-core/busybox/busybox-1.18.4/defconfig
index 5327a64754..5327a64754 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.18.4/defconfig
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.18.4/get_header_tar.patch
index bc9b427ea9..c1f881fbd7 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/get_header_tar.patch
+++ b/meta/recipes-core/busybox/busybox-1.18.4/get_header_tar.patch
@@ -7,8 +7,8 @@
7# 7#
8# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 8# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
9 9
10--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 10--- busybox-1.13.2/archival/libarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100
11+++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 11+++ busybox-1.13.2/archival/libarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100
12@@ -252,6 +252,8 @@ 12@@ -252,6 +252,8 @@
13 file_header->name = concat_path_file(tar.prefix, tar.name); 13 file_header->name = concat_path_file(tar.prefix, tar.name);
14 } else 14 } else
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch
index e01fdc7ad1..e01fdc7ad1 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch
+++ b/meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch b/meta/recipes-core/busybox/busybox-1.18.4/udhcpc-fix-nfsroot.patch
index 89eeb425ad..89eeb425ad 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch
+++ b/meta/recipes-core/busybox/busybox-1.18.4/udhcpc-fix-nfsroot.patch
diff --git a/meta/recipes-core/busybox/busybox-1.17.3/udhcpscript.patch b/meta/recipes-core/busybox/busybox-1.18.4/udhcpscript.patch
index 81bca634af..81bca634af 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/udhcpscript.patch
+++ b/meta/recipes-core/busybox/busybox-1.18.4/udhcpscript.patch
diff --git a/meta/recipes-core/busybox/busybox_1.17.3.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index 28342feaf0..696a4db09b 100644
--- a/meta/recipes-core/busybox/busybox_1.17.3.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r2" 2PR = "r0"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \
@@ -8,7 +8,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
8 file://get_header_tar.patch \ 8 file://get_header_tar.patch \
9 file://busybox-appletlib-dependency.patch \ 9 file://busybox-appletlib-dependency.patch \
10 file://run-parts.in.usr-bin.patch \ 10 file://run-parts.in.usr-bin.patch \
11 file://make-382-fix.patch \
12 file://busybox-udhcpc-no_deconfig.patch \ 11 file://busybox-udhcpc-no_deconfig.patch \
13 file://find-touchscreen.sh \ 12 file://find-touchscreen.sh \
14 file://busybox-cron \ 13 file://busybox-cron \
@@ -24,7 +23,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
24 file://umount.busybox \ 23 file://umount.busybox \
25 file://defconfig" 24 file://defconfig"
26 25
27SRC_URI[tarball.md5sum] = "a2ce1a951571da8c6e0eaf75b1acef60" 26SRC_URI[tarball.md5sum] = "b03c5b46ced732679e525a920a1a62f5"
28SRC_URI[tarball.sha256sum] = "de2f0274f61a068d75ad33861e0982e99c6b625681460ce420222371c3511ff2" 27SRC_URI[tarball.sha256sum] = "4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa"
29 28
30EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" 29EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"