summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2019-07-02 10:06:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-03 17:00:57 +0100
commit70146ea8a1c45b04f77dbf871e5a18a4e0364ee4 (patch)
treefc202628d28c742607e7a8550e75e9b67df3c60c /meta/recipes-core
parentb52d58b8bb81f5053b9fa8b79a137c37d6ef6fb3 (diff)
downloadpoky-70146ea8a1c45b04f77dbf871e5a18a4e0364ee4.tar.gz
busybox: 1.30.1 -> 1.31.0
- update to last stable version 1.31.0 - remove and refresh already merged patches (From OE-Core rev: 1654e8a6ec53799ce55302dfc075d4b1bd5a6cc0) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox-inittab_1.31.0.bb (renamed from meta/recipes-core/busybox/busybox-inittab_1.30.1.bb)0
-rw-r--r--meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch39
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch60
-rw-r--r--meta/recipes-core/busybox/busybox_1.31.0.bb (renamed from meta/recipes-core/busybox/busybox_1.30.1.bb)5
4 files changed, 32 insertions, 72 deletions
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.30.1.bb b/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
index c347daf501..c347daf501 100644
--- a/meta/recipes-core/busybox/busybox-inittab_1.30.1.bb
+++ b/meta/recipes-core/busybox/busybox-inittab_1.31.0.bb
diff --git a/meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch b/meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch
deleted file mode 100644
index d22db4a663..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From a4e03fbb4d82f91069d96005405f89c45b8fd157 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 17 Apr 2019 09:24:37 +0800
4Subject: [PATCH] dc.tests: fix two test case to also depend on DC_BIG
5
6Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2019-April/087205.html]
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 testsuite/dc.tests | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/testsuite/dc.tests b/testsuite/dc.tests
14index 1708a48..8c3af41 100755
15--- a/testsuite/dc.tests
16+++ b/testsuite/dc.tests
17@@ -41,6 +41,9 @@ testing "dc complex without spaces (multiple args)" \
18 "16\n" \
19 "" ""
20
21+optional FEATURE_DC_BIG
22+# All tests below depend on FEATURE_DC_BIG
23+
24 testing "dc read" \
25 "dc -finput" \
26 "2\n9\n1\n" \
27@@ -51,9 +54,6 @@ testing "dc read string" \
28 "2\nstr\n1\n" \
29 "1?2\nf" "[str]\n"
30
31-optional FEATURE_DC_BIG
32-# All tests below depend on FEATURE_DC_BIG
33-
34 testing "dc '>a' (conditional execute string) 1" \
35 "dc" \
36 "1\n9\n" \
37--
382.7.4
39
diff --git a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
index 76daaf1f02..2a0a40c512 100644
--- a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
+++ b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
@@ -31,10 +31,10 @@ Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
31 networking/udhcp/dhcpc.c | 29 ++++++++++++++++------ 31 networking/udhcp/dhcpc.c | 29 ++++++++++++++++------
32 1 file changed, 21 insertions(+), 8 deletions(-) 32 1 file changed, 21 insertions(+), 8 deletions(-)
33 33
34Index: busybox-1.29.1/networking/udhcp/dhcpc.c 34Index: busybox-1.31.0/networking/udhcp/dhcpc.c
35=================================================================== 35===================================================================
36--- busybox-1.29.1.orig/networking/udhcp/dhcpc.c 36--- busybox-1.31.0.orig/networking/udhcp/dhcpc.c
37+++ busybox-1.29.1/networking/udhcp/dhcpc.c 37+++ busybox-1.31.0/networking/udhcp/dhcpc.c
38@@ -48,6 +48,8 @@ 38@@ -48,6 +48,8 @@
39 }; 39 };
40 #endif 40 #endif
@@ -42,21 +42,21 @@ Index: busybox-1.29.1/networking/udhcp/dhcpc.c
42+/* option whether to down the interface when reconfiguring */ 42+/* option whether to down the interface when reconfiguring */
43+static int allow_deconfig = 1; 43+static int allow_deconfig = 1;
44 44
45 /* "struct client_config_t client_config" is in bb_common_bufsiz1 */ 45 /* "struct client_data_t client_data" is in bb_common_bufsiz1 */
46 46
47@@ -103,8 +105,9 @@ 47@@ -103,8 +105,10 @@
48 OPT_x = 1 << 18, 48 OPT_x = 1 << 18,
49 OPT_f = 1 << 19, 49 OPT_f = 1 << 19,
50 OPT_B = 1 << 20, 50 OPT_B = 1 << 20,
51+ OPT_D = 1 << 21, 51+ OPT_D = 1 << 21,
52 /* The rest has variable bit positions, need to be clever */ 52 /* The rest has variable bit positions, need to be clever */
53- OPTBIT_B = 20, 53 OPTBIT_B = 20,
54+ OPTBIT_D = 21, 54+ OPTBIT_D = 21,
55 USE_FOR_MMU( OPTBIT_b,) 55 USE_FOR_MMU( OPTBIT_b,)
56 IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) 56 IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
57 IF_FEATURE_UDHCP_PORT( OPTBIT_P,) 57 IF_FEATURE_UDHCP_PORT( OPTBIT_P,)
58@@ -1116,7 +1119,8 @@ 58@@ -1124,7 +1128,8 @@
59 state = RENEW_REQUESTED; 59 client_data.state = RENEW_REQUESTED;
60 break; 60 break;
61 case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ 61 case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
62- udhcp_run_script(NULL, "deconfig"); 62- udhcp_run_script(NULL, "deconfig");
@@ -65,7 +65,7 @@ Index: busybox-1.29.1/networking/udhcp/dhcpc.c
65 case REQUESTING: 65 case REQUESTING:
66 case RELEASED: 66 case RELEASED:
67 change_listen_mode(LISTEN_RAW); 67 change_listen_mode(LISTEN_RAW);
68@@ -1152,7 +1156,8 @@ 68@@ -1160,7 +1165,8 @@
69 * Users requested to be notified in all cases, even if not in one 69 * Users requested to be notified in all cases, even if not in one
70 * of the states above. 70 * of the states above.
71 */ 71 */
@@ -74,8 +74,8 @@ Index: busybox-1.29.1/networking/udhcp/dhcpc.c
74+ udhcp_run_script(NULL, "deconfig"); 74+ udhcp_run_script(NULL, "deconfig");
75 75
76 change_listen_mode(LISTEN_NONE); 76 change_listen_mode(LISTEN_NONE);
77 state = RELEASED; 77 client_data.state = RELEASED;
78@@ -1265,7 +1270,7 @@ 78@@ -1278,7 +1284,7 @@
79 /* Parse command line */ 79 /* Parse command line */
80 opt = getopt32long(argv, "^" 80 opt = getopt32long(argv, "^"
81 /* O,x: list; -T,-t,-A take numeric param */ 81 /* O,x: list; -T,-t,-A take numeric param */
@@ -84,7 +84,7 @@ Index: busybox-1.29.1/networking/udhcp/dhcpc.c
84 USE_FOR_MMU("b") 84 USE_FOR_MMU("b")
85 IF_FEATURE_UDHCPC_ARPING("a::") 85 IF_FEATURE_UDHCPC_ARPING("a::")
86 IF_FEATURE_UDHCP_PORT("P:") 86 IF_FEATURE_UDHCP_PORT("P:")
87@@ -1376,6 +1381,10 @@ 87@@ -1389,6 +1395,10 @@
88 logmode |= LOGMODE_SYSLOG; 88 logmode |= LOGMODE_SYSLOG;
89 } 89 }
90 90
@@ -92,52 +92,52 @@ Index: busybox-1.29.1/networking/udhcp/dhcpc.c
92+ allow_deconfig = 0; 92+ allow_deconfig = 0;
93+ } 93+ }
94+ 94+
95 /* Make sure fd 0,1,2 are open */
96 bb_sanitize_stdio();
97 /* Create pidfile */ 95 /* Create pidfile */
98@@ -1388,7 +1397,8 @@ 96 write_pidfile(client_data.pidfile);
97 /* Goes to stdout (unless NOMMU) and possibly syslog */
98@@ -1397,7 +1407,8 @@
99 srand(monotonic_us()); 99 srand(monotonic_us());
100 100
101 state = INIT_SELECTING; 101 client_data.state = INIT_SELECTING;
102- udhcp_run_script(NULL, "deconfig"); 102- udhcp_run_script(NULL, "deconfig");
103+ if (allow_deconfig) 103+ if (allow_deconfig)
104+ udhcp_run_script(NULL, "deconfig"); 104+ udhcp_run_script(NULL, "deconfig");
105 change_listen_mode(LISTEN_RAW); 105 change_listen_mode(LISTEN_RAW);
106 packet_num = 0; 106 packet_num = 0;
107 timeout = 0; 107 timeout = 0;
108@@ -1555,7 +1565,8 @@ 108@@ -1570,7 +1581,8 @@
109 } 109 }
110 /* Timed out, enter init state */ 110 /* Timed out, enter init state */
111 bb_error_msg("lease lost, entering init state"); 111 bb_info_msg("lease lost, entering init state");
112- udhcp_run_script(NULL, "deconfig"); 112- udhcp_run_script(NULL, "deconfig");
113+ if (allow_deconfig) 113+ if (allow_deconfig)
114+ udhcp_run_script(NULL, "deconfig"); 114+ udhcp_run_script(NULL, "deconfig");
115 state = INIT_SELECTING; 115 client_data.state = INIT_SELECTING;
116 client_config.first_secs = 0; /* make secs field count from 0 */ 116 client_data.first_secs = 0; /* make secs field count from 0 */
117 /*timeout = 0; - already is */ 117 /*timeout = 0; - already is */
118@@ -1748,8 +1759,10 @@ 118@@ -1762,8 +1774,10 @@
119 "(got ARP reply), declining"); 119 "(got ARP reply), declining");
120 send_decline(/*xid,*/ server_addr, packet.yiaddr); 120 send_decline(/*xid,*/ server_addr, packet.yiaddr);
121 121
122- if (state != REQUESTING) 122- if (client_data.state != REQUESTING)
123- udhcp_run_script(NULL, "deconfig"); 123- udhcp_run_script(NULL, "deconfig");
124+ if (state != REQUESTING) { 124+ if (client_data.state != REQUESTING) {
125+ if (allow_deconfig) 125+ if (allow_deconfig)
126+ udhcp_run_script(NULL, "deconfig"); 126+ udhcp_run_script(NULL, "deconfig");
127+ } 127+ }
128 change_listen_mode(LISTEN_RAW); 128 change_listen_mode(LISTEN_RAW);
129 state = INIT_SELECTING; 129 client_data.state = INIT_SELECTING;
130 client_config.first_secs = 0; /* make secs field count from 0 */ 130 client_data.first_secs = 0; /* make secs field count from 0 */
131@@ -1818,8 +1831,10 @@ 131@@ -1832,8 +1846,10 @@
132 /* return to init state */ 132 /* return to init state */
133 bb_error_msg("received %s", "DHCP NAK"); 133 bb_info_msg("received %s", "DHCP NAK");
134 udhcp_run_script(&packet, "nak"); 134 udhcp_run_script(&packet, "nak");
135- if (state != REQUESTING) 135- if (client_data.state != REQUESTING)
136- udhcp_run_script(NULL, "deconfig"); 136- udhcp_run_script(NULL, "deconfig");
137+ if (state != REQUESTING) { 137+ if (client_data.state != REQUESTING) {
138+ if (allow_deconfig) 138+ if (allow_deconfig)
139+ udhcp_run_script(NULL, "deconfig"); 139+ udhcp_run_script(NULL, "deconfig");
140+ } 140+ }
141 change_listen_mode(LISTEN_RAW); 141 change_listen_mode(LISTEN_RAW);
142 sleep(3); /* avoid excessive network traffic */ 142 sleep(3); /* avoid excessive network traffic */
143 state = INIT_SELECTING; 143 client_data.state = INIT_SELECTING;
diff --git a/meta/recipes-core/busybox/busybox_1.30.1.bb b/meta/recipes-core/busybox/busybox_1.31.0.bb
index ba76755d74..f0185434aa 100644
--- a/meta/recipes-core/busybox/busybox_1.30.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.31.0.bb
@@ -44,9 +44,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
44 file://0001-testsuite-check-uudecode-before-using-it.patch \ 44 file://0001-testsuite-check-uudecode-before-using-it.patch \
45 file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ 45 file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \
46 file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ 46 file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \
47 file://0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch \
48" 47"
49SRC_URI_append_libc-musl = " file://musl.cfg " 48SRC_URI_append_libc-musl = " file://musl.cfg "
50 49
51SRC_URI[tarball.md5sum] = "4f72fc6abd736d5f4741fc4a2485547a" 50SRC_URI[tarball.md5sum] = "cdba5d4458f944ceec5cdcf7c4914b69"
52SRC_URI[tarball.sha256sum] = "3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc" 51SRC_URI[tarball.sha256sum] = "0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99"