summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-10-13 11:55:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:12 +0000
commit73cc83974608ac4fa71e1aaf13b3f88980b365d1 (patch)
tree6fd0539d0aa58079976fa3cf18b69c451e030e8f
parentf8ac40878cb1f698a7083c9dafe46f1f12b78862 (diff)
downloadpoky-73cc83974608ac4fa71e1aaf13b3f88980b365d1.tar.gz
busybox: update 1.23.2 -> 1.24.1
The busybox defconfig has also been refreshed, with all new apps and features disabled by default. Update _git recipe version too. (From OE-Core rev: 4d5f51dd3b2733f15cb2eee40e622ec43f46d91c) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch388
-rw-r--r--meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch34
-rw-r--r--meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch67
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig23
-rw-r--r--meta/recipes-core/busybox/busybox_1.24.1.bb (renamed from meta/recipes-core/busybox/busybox_1.23.2.bb)7
-rw-r--r--meta/recipes-core/busybox/busybox_git.bb8
6 files changed, 25 insertions, 502 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch b/meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch
deleted file mode 100644
index 1d299eec9b..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch
+++ /dev/null
@@ -1,388 +0,0 @@
1From 86a7f18f211af1abda5c855d2674b0fcb53de524 Mon Sep 17 00:00:00 2001
2From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
3Date: Thu, 2 Apr 2015 23:03:46 +0200
4Subject: [PATCH] *: Switch to POSIX utmpx API
5
6UTMP is SVID legacy, UTMPX is mandated by POSIX.
7
8Glibc and uClibc have identical layout of UTMP and UTMPX, both of these
9libc treat _PATH_UTMPX as _PATH_UTMP so from a user-perspective nothing
10changes except the names of the API entrypoints.
11
12Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
13---
14Upstream-Status: Backport
15
16 coreutils/who.c | 8 ++++----
17 include/libbb.h | 2 +-
18 init/halt.c | 4 ++--
19 libbb/utmp.c | 44 ++++++++++++++++++++++----------------------
20 miscutils/last.c | 8 ++++----
21 miscutils/last_fancy.c | 16 ++++++++++------
22 miscutils/runlevel.c | 12 ++++++------
23 miscutils/wall.c | 8 ++++----
24 procps/uptime.c | 6 +++---
25 9 files changed, 56 insertions(+), 52 deletions(-)
26
27diff --git a/coreutils/who.c b/coreutils/who.c
28index f955ce6..8337212 100644
29--- a/coreutils/who.c
30+++ b/coreutils/who.c
31@@ -73,7 +73,7 @@ static void idle_string(char *str6, time_t t)
32 int who_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
33 int who_main(int argc UNUSED_PARAM, char **argv)
34 {
35- struct utmp *ut;
36+ struct utmpx *ut;
37 unsigned opt;
38 int do_users = (ENABLE_USERS && (!ENABLE_WHO || applet_name[0] == 'u'));
39 const char *fmt = "%s";
40@@ -83,8 +83,8 @@ int who_main(int argc UNUSED_PARAM, char **argv)
41 if (opt & 2) // -H
42 printf("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST\n");
43
44- setutent();
45- while ((ut = getutent()) != NULL) {
46+ setutxent();
47+ while ((ut = getutxent()) != NULL) {
48 if (ut->ut_user[0]
49 && ((opt & 1) || ut->ut_type == USER_PROCESS)
50 ) {
51@@ -126,6 +126,6 @@ int who_main(int argc UNUSED_PARAM, char **argv)
52 if (do_users)
53 bb_putchar('\n');
54 if (ENABLE_FEATURE_CLEAN_UP)
55- endutent();
56+ endutxent();
57 return EXIT_SUCCESS;
58 }
59diff --git a/include/libbb.h b/include/libbb.h
60index 26b6868..0f8363b 100644
61--- a/include/libbb.h
62+++ b/include/libbb.h
63@@ -84,7 +84,7 @@
64 # include <selinux/av_permissions.h>
65 #endif
66 #if ENABLE_FEATURE_UTMP
67-# include <utmp.h>
68+# include <utmpx.h>
69 #endif
70 #if ENABLE_LOCALE_SUPPORT
71 # include <locale.h>
72diff --git a/init/halt.c b/init/halt.c
73index 7974adb..ad12d91 100644
74--- a/init/halt.c
75+++ b/init/halt.c
76@@ -74,7 +74,7 @@
77
78 static void write_wtmp(void)
79 {
80- struct utmp utmp;
81+ struct utmpx utmp;
82 struct utsname uts;
83 /* "man utmp" says wtmp file should *not* be created automagically */
84 /*if (access(bb_path_wtmp_file, R_OK|W_OK) == -1) {
85@@ -88,7 +88,7 @@ static void write_wtmp(void)
86 utmp.ut_line[0] = '~'; utmp.ut_line[1] = '~'; /* = strcpy(utmp.ut_line, "~~"); */
87 uname(&uts);
88 safe_strncpy(utmp.ut_host, uts.release, sizeof(utmp.ut_host));
89- updwtmp(bb_path_wtmp_file, &utmp);
90+ updwtmpx(bb_path_wtmp_file, &utmp);
91 }
92 #else
93 #define write_wtmp() ((void)0)
94diff --git a/libbb/utmp.c b/libbb/utmp.c
95index 8ad9ba2..bd07670 100644
96--- a/libbb/utmp.c
97+++ b/libbb/utmp.c
98@@ -16,7 +16,7 @@ static void touch(const char *filename)
99
100 void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname)
101 {
102- struct utmp utent;
103+ struct utmpx utent;
104 char *id;
105 unsigned width;
106
107@@ -45,17 +45,17 @@ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, con
108 tty_name += 3;
109 strncpy(id, tty_name, width);
110
111- touch(_PATH_UTMP);
112- //utmpname(_PATH_UTMP);
113- setutent();
114+ touch(_PATH_UTMPX);
115+ //utmpxname(_PATH_UTMPX);
116+ setutxent();
117 /* Append new one (hopefully, unless we collide on ut_id) */
118- pututline(&utent);
119- endutent();
120+ pututxline(&utent);
121+ endutxent();
122
123 #if ENABLE_FEATURE_WTMP
124 /* "man utmp" says wtmp file should *not* be created automagically */
125 /*touch(bb_path_wtmp_file);*/
126- updwtmp(bb_path_wtmp_file, &utent);
127+ updwtmpx(bb_path_wtmp_file, &utent);
128 #endif
129 }
130
131@@ -64,17 +64,17 @@ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, con
132 */
133 void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname)
134 {
135- struct utmp utent;
136- struct utmp *utp;
137+ struct utmpx utent;
138+ struct utmpx *utp;
139
140- touch(_PATH_UTMP);
141- //utmpname(_PATH_UTMP);
142- setutent();
143+ touch(_PATH_UTMPX);
144+ //utmpxname(_PATH_UTMPX);
145+ setutxent();
146
147 /* Did init/getty/telnetd/sshd/... create an entry for us?
148 * It should be (new_type-1), but we'd also reuse
149 * any other potentially stale xxx_PROCESS entry */
150- while ((utp = getutent()) != NULL) {
151+ while ((utp = getutxent()) != NULL) {
152 if (utp->ut_pid == pid
153 // && ut->ut_line[0]
154 && utp->ut_id[0] /* must have nonzero id */
155@@ -88,25 +88,25 @@ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const
156 /* Stale record. Nuke hostname */
157 memset(utp->ut_host, 0, sizeof(utp->ut_host));
158 }
159- /* NB: pututline (see later) searches for matching utent
160- * using getutid(utent) - we must not change ut_id
161+ /* NB: pututxline (see later) searches for matching utxent
162+ * using getutxid(utent) - we must not change ut_id
163 * if we want *exactly this* record to be overwritten!
164 */
165 break;
166 }
167 }
168- //endutent(); - no need, pututline can deal with (and actually likes)
169+ //endutxent(); - no need, pututxline can deal with (and actually likes)
170 //the situation when utmp file is positioned on found record
171
172 if (!utp) {
173 if (new_type != DEAD_PROCESS)
174 write_new_utmp(pid, new_type, tty_name, username, hostname);
175 else
176- endutent();
177+ endutxent();
178 return;
179 }
180
181- /* Make a copy. We can't use *utp, pututline's internal getutid
182+ /* Make a copy. We can't use *utp, pututxline's internal getutxid
183 * will overwrite it before it is used! */
184 utent = *utp;
185
186@@ -120,14 +120,14 @@ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const
187 utent.ut_tv.tv_sec = time(NULL);
188
189 /* Update, or append new one */
190- //setutent();
191- pututline(&utent);
192- endutent();
193+ //setutxent();
194+ pututxline(&utent);
195+ endutxent();
196
197 #if ENABLE_FEATURE_WTMP
198 /* "man utmp" says wtmp file should *not* be created automagically */
199 /*touch(bb_path_wtmp_file);*/
200- updwtmp(bb_path_wtmp_file, &utent);
201+ updwtmpx(bb_path_wtmp_file, &utent);
202 #endif
203 }
204
205diff --git a/miscutils/last.c b/miscutils/last.c
206index a144c7e..6d8b584 100644
207--- a/miscutils/last.c
208+++ b/miscutils/last.c
209@@ -32,21 +32,21 @@
210
211 #if defined UT_LINESIZE \
212 && ((UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256))
213-#error struct utmp member char[] size(s) have changed!
214+#error struct utmpx member char[] size(s) have changed!
215 #elif defined __UT_LINESIZE \
216 && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 64) || (__UT_HOSTSIZE != 256))
217-#error struct utmp member char[] size(s) have changed!
218+#error struct utmpx member char[] size(s) have changed!
219 #endif
220
221 #if EMPTY != 0 || RUN_LVL != 1 || BOOT_TIME != 2 || NEW_TIME != 3 || \
222 OLD_TIME != 4
223-#error Values for the ut_type field of struct utmp changed
224+#error Values for the ut_type field of struct utmpx changed
225 #endif
226
227 int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
228 int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
229 {
230- struct utmp ut;
231+ struct utmpx ut;
232 int n, file = STDIN_FILENO;
233 time_t t_tmp;
234 off_t pos;
235diff --git a/miscutils/last_fancy.c b/miscutils/last_fancy.c
236index 16ed9e9..8194e31 100644
237--- a/miscutils/last_fancy.c
238+++ b/miscutils/last_fancy.c
239@@ -22,6 +22,10 @@
240 #define HEADER_LINE_WIDE "USER", "TTY", \
241 INET6_ADDRSTRLEN, INET6_ADDRSTRLEN, "HOST", "LOGIN", " TIME", ""
242
243+#if !defined __UT_LINESIZE && defined UT_LINESIZE
244+# define __UT_LINESIZE UT_LINESIZE
245+#endif
246+
247 enum {
248 NORMAL,
249 LOGGED,
250@@ -39,7 +43,7 @@ enum {
251
252 #define show_wide (option_mask32 & LAST_OPT_W)
253
254-static void show_entry(struct utmp *ut, int state, time_t dur_secs)
255+static void show_entry(struct utmpx *ut, int state, time_t dur_secs)
256 {
257 unsigned days, hours, mins;
258 char duration[sizeof("(%u+02:02)") + sizeof(int)*3];
259@@ -104,7 +108,7 @@ static void show_entry(struct utmp *ut, int state, time_t dur_secs)
260 duration_str);
261 }
262
263-static int get_ut_type(struct utmp *ut)
264+static int get_ut_type(struct utmpx *ut)
265 {
266 if (ut->ut_line[0] == '~') {
267 if (strcmp(ut->ut_user, "shutdown") == 0) {
268@@ -142,7 +146,7 @@ static int get_ut_type(struct utmp *ut)
269 return ut->ut_type;
270 }
271
272-static int is_runlevel_shutdown(struct utmp *ut)
273+static int is_runlevel_shutdown(struct utmpx *ut)
274 {
275 if (((ut->ut_pid & 255) == '0') || ((ut->ut_pid & 255) == '6')) {
276 return 1;
277@@ -154,7 +158,7 @@ static int is_runlevel_shutdown(struct utmp *ut)
278 int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
279 int last_main(int argc UNUSED_PARAM, char **argv)
280 {
281- struct utmp ut;
282+ struct utmpx ut;
283 const char *filename = _PATH_WTMP;
284 llist_t *zlist;
285 off_t pos;
286@@ -242,9 +246,9 @@ int last_main(int argc UNUSED_PARAM, char **argv)
287 {
288 llist_t *el, *next;
289 for (el = zlist; el; el = next) {
290- struct utmp *up = (struct utmp *)el->data;
291+ struct utmpx *up = (struct utmpx *)el->data;
292 next = el->link;
293- if (strncmp(up->ut_line, ut.ut_line, UT_LINESIZE) == 0) {
294+ if (strncmp(up->ut_line, ut.ut_line, __UT_LINESIZE) == 0) {
295 if (show) {
296 show_entry(&ut, NORMAL, up->ut_tv.tv_sec);
297 show = 0;
298diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c
299index 76231df..8558db8 100644
300--- a/miscutils/runlevel.c
301+++ b/miscutils/runlevel.c
302@@ -29,19 +29,19 @@
303 int runlevel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
304 int runlevel_main(int argc UNUSED_PARAM, char **argv)
305 {
306- struct utmp *ut;
307+ struct utmpx *ut;
308 char prev;
309
310- if (argv[1]) utmpname(argv[1]);
311+ if (argv[1]) utmpxname(argv[1]);
312
313- setutent();
314- while ((ut = getutent()) != NULL) {
315+ setutxent();
316+ while ((ut = getutxent()) != NULL) {
317 if (ut->ut_type == RUN_LVL) {
318 prev = ut->ut_pid / 256;
319 if (prev == 0) prev = 'N';
320 printf("%c %c\n", prev, ut->ut_pid % 256);
321 if (ENABLE_FEATURE_CLEAN_UP)
322- endutent();
323+ endutxent();
324 return 0;
325 }
326 }
327@@ -49,6 +49,6 @@ int runlevel_main(int argc UNUSED_PARAM, char **argv)
328 puts("unknown");
329
330 if (ENABLE_FEATURE_CLEAN_UP)
331- endutent();
332+ endutxent();
333 return 1;
334 }
335diff --git a/miscutils/wall.c b/miscutils/wall.c
336index bb709ee..50658f4 100644
337--- a/miscutils/wall.c
338+++ b/miscutils/wall.c
339@@ -32,7 +32,7 @@
340 int wall_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
341 int wall_main(int argc UNUSED_PARAM, char **argv)
342 {
343- struct utmp *ut;
344+ struct utmpx *ut;
345 char *msg;
346 int fd;
347
348@@ -46,8 +46,8 @@ int wall_main(int argc UNUSED_PARAM, char **argv)
349 msg = xmalloc_read(fd, NULL);
350 if (ENABLE_FEATURE_CLEAN_UP && argv[1])
351 close(fd);
352- setutent();
353- while ((ut = getutent()) != NULL) {
354+ setutxent();
355+ while ((ut = getutxent()) != NULL) {
356 char *line;
357 if (ut->ut_type != USER_PROCESS)
358 continue;
359@@ -56,7 +56,7 @@ int wall_main(int argc UNUSED_PARAM, char **argv)
360 free(line);
361 }
362 if (ENABLE_FEATURE_CLEAN_UP) {
363- endutent();
364+ endutxent();
365 free(msg);
366 }
367 return EXIT_SUCCESS;
368diff --git a/procps/uptime.c b/procps/uptime.c
369index 778812a..149bae6 100644
370--- a/procps/uptime.c
371+++ b/procps/uptime.c
372@@ -81,10 +81,10 @@ int uptime_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
373
374 #if ENABLE_FEATURE_UPTIME_UTMP_SUPPORT
375 {
376- struct utmp *ut;
377+ struct utmpx *ut;
378 unsigned users = 0;
379- while ((ut = getutent()) != NULL) {
380- if ((ut->ut_type == USER_PROCESS) && (ut->ut_name[0] != '\0'))
381+ while ((ut = getutxent()) != NULL) {
382+ if ((ut->ut_type == USER_PROCESS) && (ut->ut_user[0] != '\0'))
383 users++;
384 }
385 printf(", %u users", users);
386--
3872.5.1
388
diff --git a/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch b/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch
deleted file mode 100644
index 4299799664..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From d291c2fdd5cb8616605c67ecbfb04274fa094242 Mon Sep 17 00:00:00 2001
2From: Junling Zheng <zhengjunling@huawei.com>
3Date: Sun, 7 Jun 2015 02:32:23 +0200
4Subject: [PATCH] chown: fix help text
5
6Derived from:
7http://git.busybox.net/busybox/commit/?id=d291c2fdd5cb8616605c67ecbfb04274fa094242.
8
9Only when DESKTOP is enabled, chown has -L, -H and -P options.
10
11Upstream-Status: Backport
12
13Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
14Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
15---
16 coreutils/chown.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/coreutils/chown.c b/coreutils/chown.c
20index cb07bbc..679c0d8 100644
21--- a/coreutils/chown.c
22+++ b/coreutils/chown.c
23@@ -11,7 +11,7 @@
24 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */
25
26 //usage:#define chown_trivial_usage
27-//usage: "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
28+//usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... OWNER[<.|:>[GROUP]] FILE..."
29 //usage:#define chown_full_usage "\n\n"
30 //usage: "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
31 //usage: "\n -R Recurse"
32--
331.8.3.4
34
diff --git a/meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch b/meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch
deleted file mode 100644
index 2d729b1b05..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From a97777889328157bb7d06ec618bad16712a9c345 Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Tue, 3 Feb 2015 12:11:30 +0100
4Subject: [PATCH] ifconfig: fix double free fatal error in INET_sprint
5
6Derived from:
7http://git.busybox.net/busybox/commit/?id=a97777889328157bb7d06ec618bad16712a9c345.
8
9While INET_sprint or INET6_sprint is called circularly by keeping
10ifconfiging, sap->sa_family would be cleaned by other parallel processes
11such as dhclient sometimes, and then there would be a double free error
12like the following:
13
14 *** glibc detected *** ifconfig: double free or corruption (fasttop): 0x000a6008 ***
15 ======= Backtrace: =========
16 /lib/libc.so.6(+0x6bc84)[0x40133c84]
17 /lib/libc.so.6(cfree+0x94)[0x40138684]
18 ifconfig[0x1c460]
19 ifconfig[0x1c6a0]
20 ifconfig[0x1ccf4]
21 ifconfig[0x187c8]
22 ifconfig[0xd544]
23 ifconfig[0xd5dc]
24 ifconfig[0xdca8]
25 /lib/libc.so.6(__libc_start_main+0x110)[0x400df258]
26 ======= Memory map: ========
27 00008000-0009c000 r-xp 00000000 1f:05 444328 /bin/busybox
28 000a3000-000a4000 rw-p 00093000 1f:05 444328 /bin/busybox
29
30This patch moved free() two lines down to address this problem.
31
32Upstream-Status: Backport
33
34Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
35---
36 networking/interface.c | 4 ++--
37 1 file changed, 2 insertions(+), 2 deletions(-)
38
39diff --git a/networking/interface.c b/networking/interface.c
40index bf7d2b1..b0572d0 100644
41--- a/networking/interface.c
42+++ b/networking/interface.c
43@@ -91,9 +91,9 @@ static const char* FAST_FUNC INET_sprint(struct sockaddr *sap, int numeric)
44 {
45 static char *buff; /* defaults to NULL */
46
47- free(buff);
48 if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
49 return "[NONE SET]";
50+ free(buff);
51 buff = INET_rresolve((struct sockaddr_in *) sap, numeric, 0xffffff00);
52 return buff;
53 }
54@@ -173,9 +173,9 @@ static const char* FAST_FUNC INET6_sprint(struct sockaddr *sap, int numeric)
55 {
56 static char *buff;
57
58- free(buff);
59 if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
60 return "[NONE SET]";
61+ free(buff);
62 buff = INET6_rresolve((struct sockaddr_in6 *) sap, numeric);
63 return buff;
64 }
65--
661.8.3.4
67
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index a5adea2fb6..77274d0dfa 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.23.2 3# Busybox version: 1.24.1
4# Thu Jul 30 11:00:00 2015 4# Tue Oct 31 11:00:00 2015
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -64,9 +64,9 @@ CONFIG_FEATURE_HAVE_RPC=y
64# CONFIG_FEATURE_INDIVIDUAL is not set 64# CONFIG_FEATURE_INDIVIDUAL is not set
65# CONFIG_FEATURE_SHARED_BUSYBOX is not set 65# CONFIG_FEATURE_SHARED_BUSYBOX is not set
66CONFIG_LFS=y 66CONFIG_LFS=y
67# CONFIG_CROSS_COMPILER_PREFIX is not set 67CONFIG_CROSS_COMPILER_PREFIX=""
68CONFIG_SYSROOT="" 68CONFIG_SYSROOT=""
69# CONFIG_EXTRA_CFLAGS is not set 69CONFIG_EXTRA_CFLAGS=""
70CONFIG_EXTRA_LDFLAGS="" 70CONFIG_EXTRA_LDFLAGS=""
71CONFIG_EXTRA_LDLIBS="" 71CONFIG_EXTRA_LDLIBS=""
72 72
@@ -156,6 +156,7 @@ CONFIG_CPIO=y
156CONFIG_GZIP=y 156CONFIG_GZIP=y
157# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set 157# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
158CONFIG_GZIP_FAST=0 158CONFIG_GZIP_FAST=0
159# CONFIG_FEATURE_GZIP_LEVELS is not set
159# CONFIG_LZOP is not set 160# CONFIG_LZOP is not set
160# CONFIG_LZOP_COMPR_HIGH is not set 161# CONFIG_LZOP_COMPR_HIGH is not set
161# CONFIG_RPM is not set 162# CONFIG_RPM is not set
@@ -187,11 +188,13 @@ CONFIG_DD=y
187CONFIG_FEATURE_DD_SIGNAL_HANDLING=y 188CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
188# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set 189# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
189# CONFIG_FEATURE_DD_IBS_OBS is not set 190# CONFIG_FEATURE_DD_IBS_OBS is not set
191# CONFIG_FEATURE_DD_STATUS is not set
190# CONFIG_HOSTID is not set 192# CONFIG_HOSTID is not set
191CONFIG_ID=y 193CONFIG_ID=y
192CONFIG_GROUPS=y 194CONFIG_GROUPS=y
193CONFIG_SHUF=y 195CONFIG_SHUF=y
194CONFIG_SYNC=y 196CONFIG_SYNC=y
197# CONFIG_FEATURE_SYNC_FANCY is not set
195CONFIG_TEST=y 198CONFIG_TEST=y
196CONFIG_FEATURE_TEST_64=y 199CONFIG_FEATURE_TEST_64=y
197CONFIG_TOUCH=y 200CONFIG_TOUCH=y
@@ -200,6 +203,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y
200CONFIG_TR=y 203CONFIG_TR=y
201CONFIG_FEATURE_TR_CLASSES=y 204CONFIG_FEATURE_TR_CLASSES=y
202# CONFIG_FEATURE_TR_EQUIV is not set 205# CONFIG_FEATURE_TR_EQUIV is not set
206# CONFIG_TRUNCATE is not set
203CONFIG_UNLINK=y 207CONFIG_UNLINK=y
204# CONFIG_BASE64 is not set 208# CONFIG_BASE64 is not set
205CONFIG_WHO=y 209CONFIG_WHO=y
@@ -292,6 +296,7 @@ CONFIG_TEE=y
292CONFIG_TRUE=y 296CONFIG_TRUE=y
293CONFIG_TTY=y 297CONFIG_TTY=y
294CONFIG_UNAME=y 298CONFIG_UNAME=y
299CONFIG_UNAME_OSNAME="GNU/Linux"
295# CONFIG_UNEXPAND is not set 300# CONFIG_UNEXPAND is not set
296# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set 301# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
297CONFIG_UNIQ=y 302CONFIG_UNIQ=y
@@ -562,7 +567,9 @@ CONFIG_FEATURE_MOUNT_NFS=y
562# CONFIG_FEATURE_MOUNT_CIFS is not set 567# CONFIG_FEATURE_MOUNT_CIFS is not set
563CONFIG_FEATURE_MOUNT_FLAGS=y 568CONFIG_FEATURE_MOUNT_FLAGS=y
564CONFIG_FEATURE_MOUNT_FSTAB=y 569CONFIG_FEATURE_MOUNT_FSTAB=y
570# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
565# CONFIG_REV is not set 571# CONFIG_REV is not set
572# CONFIG_UEVENT is not set
566# CONFIG_ACPID is not set 573# CONFIG_ACPID is not set
567# CONFIG_FEATURE_ACPID_COMPAT is not set 574# CONFIG_FEATURE_ACPID_COMPAT is not set
568# CONFIG_BLKID is not set 575# CONFIG_BLKID is not set
@@ -660,10 +667,15 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
660# CONFIG_FEATURE_CROND_D is not set 667# CONFIG_FEATURE_CROND_D is not set
661# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set 668# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
662CONFIG_FEATURE_CROND_DIR="" 669CONFIG_FEATURE_CROND_DIR=""
670# CONFIG_I2CGET is not set
671# CONFIG_I2CSET is not set
672# CONFIG_I2CDUMP is not set
673# CONFIG_I2CDETECT is not set
663CONFIG_LESS=y 674CONFIG_LESS=y
664CONFIG_FEATURE_LESS_MAXLINES=9999999 675CONFIG_FEATURE_LESS_MAXLINES=9999999
665CONFIG_FEATURE_LESS_BRACKETS=y 676CONFIG_FEATURE_LESS_BRACKETS=y
666CONFIG_FEATURE_LESS_FLAGS=y 677CONFIG_FEATURE_LESS_FLAGS=y
678# CONFIG_FEATURE_LESS_TRUNCATE is not set
667# CONFIG_FEATURE_LESS_MARKS is not set 679# CONFIG_FEATURE_LESS_MARKS is not set
668# CONFIG_FEATURE_LESS_REGEXP is not set 680# CONFIG_FEATURE_LESS_REGEXP is not set
669# CONFIG_FEATURE_LESS_WINCH is not set 681# CONFIG_FEATURE_LESS_WINCH is not set
@@ -763,6 +775,8 @@ CONFIG_FEATURE_WGET_STATUSBAR=y
763CONFIG_FEATURE_WGET_AUTHENTICATION=y 775CONFIG_FEATURE_WGET_AUTHENTICATION=y
764CONFIG_FEATURE_WGET_LONG_OPTIONS=y 776CONFIG_FEATURE_WGET_LONG_OPTIONS=y
765CONFIG_FEATURE_WGET_TIMEOUT=y 777CONFIG_FEATURE_WGET_TIMEOUT=y
778# CONFIG_FEATURE_WGET_OPENSSL is not set
779# CONFIG_FEATURE_WGET_SSL_HELPER is not set
766# CONFIG_WHOIS is not set 780# CONFIG_WHOIS is not set
767CONFIG_FEATURE_IPV6=y 781CONFIG_FEATURE_IPV6=y
768# CONFIG_FEATURE_UNIX_LOCAL is not set 782# CONFIG_FEATURE_UNIX_LOCAL is not set
@@ -824,6 +838,7 @@ CONFIG_IP=y
824CONFIG_FEATURE_IP_ADDRESS=y 838CONFIG_FEATURE_IP_ADDRESS=y
825CONFIG_FEATURE_IP_LINK=y 839CONFIG_FEATURE_IP_LINK=y
826CONFIG_FEATURE_IP_ROUTE=y 840CONFIG_FEATURE_IP_ROUTE=y
841CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
827CONFIG_FEATURE_IP_TUNNEL=y 842CONFIG_FEATURE_IP_TUNNEL=y
828# CONFIG_FEATURE_IP_RULE is not set 843# CONFIG_FEATURE_IP_RULE is not set
829# CONFIG_FEATURE_IP_SHORT_FORMS is not set 844# CONFIG_FEATURE_IP_SHORT_FORMS is not set
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb
index e9f7eb60b5..92bbee13a8 100644
--- a/meta/recipes-core/busybox/busybox_1.23.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -30,9 +30,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
30 file://login-utilities.cfg \ 30 file://login-utilities.cfg \
31 file://recognize_connmand.patch \ 31 file://recognize_connmand.patch \
32 file://busybox-cross-menuconfig.patch \ 32 file://busybox-cross-menuconfig.patch \
33 file://0001-Switch-to-POSIX-utmpx-API.patch \
34 file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \
35 file://0001-chown-fix-help-text.patch \
36 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ 33 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
37 file://0002-Passthrough-r-to-linker.patch \ 34 file://0002-Passthrough-r-to-linker.patch \
38 file://mount-via-label.cfg \ 35 file://mount-via-label.cfg \
@@ -41,5 +38,5 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
41 file://getopts.cfg \ 38 file://getopts.cfg \
42" 39"
43 40
44SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73" 41SRC_URI[tarball.md5sum] = "be98a40cadf84ce2d6b05fa41a275c6a"
45SRC_URI[tarball.sha256sum] = "05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a" 42SRC_URI[tarball.sha256sum] = "37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d"
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index e9ff0bc41e..d968fad4f9 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -1,8 +1,8 @@
1require busybox.inc 1require busybox.inc
2 2
3SRCREV = "be947c4d97c0dacb703a6f24dd813ff6dd3a33b6" 3SRCREV = "966423d4034067f52b419570a1016d1dfc4aeacd"
4# Lookout for PV bump too when SRCREV is changed 4# Lookout for PV bump too when SRCREV is changed
5PV = "1.23.2+git${SRCPV}" 5PV = "1.25.0+git${SRCPV}"
6 6
7S = "${WORKDIR}/git" 7S = "${WORKDIR}/git"
8 8
@@ -36,8 +36,8 @@ SRC_URI = "git://busybox.net/busybox.git \
36 file://login-utilities.cfg \ 36 file://login-utilities.cfg \
37 file://recognize_connmand.patch \ 37 file://recognize_connmand.patch \
38 file://busybox-cross-menuconfig.patch \ 38 file://busybox-cross-menuconfig.patch \
39 file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ 39 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
40 file://0001-chown-fix-help-text.patch \ 40 file://0002-Passthrough-r-to-linker.patch \
41 file://mount-via-label.cfg \ 41 file://mount-via-label.cfg \
42 file://sha1sum.cfg \ 42 file://sha1sum.cfg \
43 file://sha256sum.cfg \ 43 file://sha256sum.cfg \