summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-04-10 20:25:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-11 11:08:14 (GMT)
commitacdcb3c7e0c6de26612f3364123bbeb779be243e (patch)
treec21614c74a4485164d2f3ff8bbf9f8ffd8016f37 /meta/recipes-core
parent91a77020eb175000847e493ec30196aba9fb11f2 (diff)
downloadpoky-acdcb3c7e0c6de26612f3364123bbeb779be243e.tar.gz
busybox: fix options -b, -a and -P
* busybox-udhcpc-no_deconfig.patch broke the options, preventing udhcpc from forking into the background if no lease can be obtained. (From OE-Core rev: 24ad7ca9bd99cd6cd11f7d2d49a79fe3521cbcec) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch19
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb2
2 files changed, 14 insertions, 7 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch
index 481d8b3..13004f7 100644
--- a/meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch
+++ b/meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch
@@ -1,4 +1,4 @@
1From 16c5fa61059f9862b2534c75dad75f7ece338208 Mon Sep 17 00:00:00 2001 1From 53626cd06a3ef05ed847daea802ef0aa9661caa7 Mon Sep 17 00:00:00 2001
2From: Anders Darander <anders@chargestorm.se> 2From: Anders Darander <anders@chargestorm.se>
3Date: Thu, 3 Nov 2011 08:51:31 +0100 3Date: Thu, 3 Nov 2011 08:51:31 +0100
4Subject: [PATCH] busybox-udhcpc-no_deconfig.patch 4Subject: [PATCH] busybox-udhcpc-no_deconfig.patch
@@ -23,12 +23,16 @@ Signed-off-by: Qing He <qing.he@intel.com>
23Updated to Busybox 1.19.3 23Updated to Busybox 1.19.3
24 24
25Signed-off-by: Anders Darander <anders@chargestorm.se> 25Signed-off-by: Anders Darander <anders@chargestorm.se>
26
27Fixed options -b, -a and -P.
28
29Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
26--- 30---
27 networking/udhcp/dhcpc.c | 27 ++++++++++++++++++++------- 31 networking/udhcp/dhcpc.c | 29 +++++++++++++++++++++--------
28 1 files changed, 20 insertions(+), 7 deletions(-) 32 1 files changed, 21 insertions(+), 8 deletions(-)
29 33
30diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c 34diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
31index 4d755e6..eb80484 100644 35index 4d755e6..a21e2c6 100644
32--- a/networking/udhcp/dhcpc.c 36--- a/networking/udhcp/dhcpc.c
33+++ b/networking/udhcp/dhcpc.c 37+++ b/networking/udhcp/dhcpc.c
34@@ -29,6 +29,9 @@ 38@@ -29,6 +29,9 @@
@@ -41,14 +45,17 @@ index 4d755e6..eb80484 100644
41 /* struct client_config_t client_config is in bb_common_bufsiz1 */ 45 /* struct client_config_t client_config is in bb_common_bufsiz1 */
42 46
43 47
44@@ -82,6 +85,7 @@ enum { 48@@ -82,8 +85,9 @@ enum {
45 OPT_x = 1 << 18, 49 OPT_x = 1 << 18,
46 OPT_f = 1 << 19, 50 OPT_f = 1 << 19,
47 OPT_B = 1 << 20, 51 OPT_B = 1 << 20,
48+ OPT_D = 1 << 21, 52+ OPT_D = 1 << 21,
49 /* The rest has variable bit positions, need to be clever */ 53 /* The rest has variable bit positions, need to be clever */
50 OPTBIT_B = 20, 54- OPTBIT_B = 20,
55+ OPTBIT_D = 21,
51 USE_FOR_MMU( OPTBIT_b,) 56 USE_FOR_MMU( OPTBIT_b,)
57 IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
58 IF_FEATURE_UDHCP_PORT( OPTBIT_P,)
52@@ -899,7 +903,8 @@ static void perform_renew(void) 59@@ -899,7 +903,8 @@ static void perform_renew(void)
53 state = RENEW_REQUESTED; 60 state = RENEW_REQUESTED;
54 break; 61 break;
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index 3f22669..ad8297e 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r1" 2PR = "r2"
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 \