diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/B921600.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/B921600.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/busybox-appletlib-dependency.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch) | 37 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/defconfig (renamed from meta/recipes-core/busybox/busybox-1.19.4/defconfig) | 39 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/fix-for-spurious-testsuite-failure.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/get_header_tar.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/run-parts.in.usr-bin.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch (renamed from meta/recipes-core/busybox/busybox-1.19.4/wget_dl_dir_fix.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.20.2.bb (renamed from meta/recipes-core/busybox/busybox_1.19.4.bb) | 9 |
13 files changed, 72 insertions, 38 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/B921600.patch b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch index c4d98e3a27..c4d98e3a27 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/B921600.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch new file mode 100644 index 0000000000..456fb08e11 --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | --- busybox-1.20.2/libbb/kernel_version.c | ||
2 | +++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c | ||
3 | @@ -20,18 +20,15 @@ | ||
4 | int FAST_FUNC get_linux_version_code(void) | ||
5 | { | ||
6 | struct utsname name; | ||
7 | - char *s; | ||
8 | + char *s, *t; | ||
9 | int i, r; | ||
10 | |||
11 | - if (uname(&name) == -1) { | ||
12 | - bb_perror_msg("can't get system information"); | ||
13 | - return 0; | ||
14 | - } | ||
15 | - | ||
16 | + uname(&name); /* never fails */ | ||
17 | s = name.release; | ||
18 | r = 0; | ||
19 | for (i = 0; i < 3; i++) { | ||
20 | - r = r * 256 + atoi(strtok(s, ".")); | ||
21 | + t = strtok(s, "."); | ||
22 | + r = r * 256 + (t ? atoi(t) : 0); | ||
23 | s = NULL; | ||
24 | } | ||
25 | return r; | ||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch index de2dbcceb1..de2dbcceb1 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/busybox-appletlib-dependency.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch index 089c5e039c..089c5e039c 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch index 13004f7027..4c9ce3b711 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/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 files changed, 21 insertions(+), 8 deletions(-) | 32 | 1 files changed, 21 insertions(+), 8 deletions(-) |
33 | 33 | ||
34 | diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c | 34 | Index: busybox-1.20.2/networking/udhcp/dhcpc.c |
35 | index 4d755e6..a21e2c6 100644 | 35 | =================================================================== |
36 | --- a/networking/udhcp/dhcpc.c | 36 | --- busybox-1.20.2.orig/networking/udhcp/dhcpc.c |
37 | +++ b/networking/udhcp/dhcpc.c | 37 | +++ busybox-1.20.2/networking/udhcp/dhcpc.c |
38 | @@ -29,6 +29,9 @@ | 38 | @@ -29,6 +29,9 @@ |
39 | #include <netpacket/packet.h> | 39 | #include <netpacket/packet.h> |
40 | #include <linux/filter.h> | 40 | #include <linux/filter.h> |
@@ -42,10 +42,10 @@ index 4d755e6..a21e2c6 100644 | |||
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_config_t client_config" is in bb_common_bufsiz1 */ |
46 | 46 | ||
47 | 47 | ||
48 | @@ -82,8 +85,9 @@ enum { | 48 | @@ -81,8 +84,9 @@ enum { |
49 | OPT_x = 1 << 18, | 49 | OPT_x = 1 << 18, |
50 | OPT_f = 1 << 19, | 50 | OPT_f = 1 << 19, |
51 | OPT_B = 1 << 20, | 51 | OPT_B = 1 << 20, |
@@ -56,7 +56,7 @@ index 4d755e6..a21e2c6 100644 | |||
56 | USE_FOR_MMU( OPTBIT_b,) | 56 | USE_FOR_MMU( OPTBIT_b,) |
57 | IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) | 57 | IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) |
58 | IF_FEATURE_UDHCP_PORT( OPTBIT_P,) | 58 | IF_FEATURE_UDHCP_PORT( OPTBIT_P,) |
59 | @@ -899,7 +903,8 @@ static void perform_renew(void) | 59 | @@ -1040,7 +1044,8 @@ static void perform_renew(void) |
60 | state = RENEW_REQUESTED; | 60 | state = RENEW_REQUESTED; |
61 | break; | 61 | break; |
62 | case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ | 62 | case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ |
@@ -66,7 +66,7 @@ index 4d755e6..a21e2c6 100644 | |||
66 | case REQUESTING: | 66 | case REQUESTING: |
67 | case RELEASED: | 67 | case RELEASED: |
68 | change_listen_mode(LISTEN_RAW); | 68 | change_listen_mode(LISTEN_RAW); |
69 | @@ -923,7 +928,8 @@ static void perform_release(uint32_t requested_ip, uint32_t server_addr) | 69 | @@ -1064,7 +1069,8 @@ static void perform_release(uint32_t ser |
70 | bb_info_msg("Unicasting a release of %s to %s", | 70 | bb_info_msg("Unicasting a release of %s to %s", |
71 | inet_ntoa(temp_addr), buffer); | 71 | inet_ntoa(temp_addr), buffer); |
72 | send_release(server_addr, requested_ip); /* unicast */ | 72 | send_release(server_addr, requested_ip); /* unicast */ |
@@ -76,16 +76,16 @@ index 4d755e6..a21e2c6 100644 | |||
76 | } | 76 | } |
77 | bb_info_msg("Entering released state"); | 77 | bb_info_msg("Entering released state"); |
78 | 78 | ||
79 | @@ -1083,7 +1089,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | 79 | @@ -1215,7 +1221,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c |
80 | #endif | 80 | /* O,x: list; -T,-t,-A take numeric param */ |
81 | ; | 81 | opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ; |
82 | IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) | 82 | IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) |
83 | - opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB" | 83 | - opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB" |
84 | + opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fBD" | 84 | + opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fBD" |
85 | USE_FOR_MMU("b") | 85 | USE_FOR_MMU("b") |
86 | IF_FEATURE_UDHCPC_ARPING("a") | 86 | IF_FEATURE_UDHCPC_ARPING("a") |
87 | IF_FEATURE_UDHCP_PORT("P:") | 87 | IF_FEATURE_UDHCP_PORT("P:") |
88 | @@ -1175,6 +1181,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | 88 | @@ -1316,6 +1322,9 @@ int udhcpc_main(int argc UNUSED_PARAM, c |
89 | logmode |= LOGMODE_SYSLOG; | 89 | logmode |= LOGMODE_SYSLOG; |
90 | } | 90 | } |
91 | 91 | ||
@@ -95,7 +95,7 @@ index 4d755e6..a21e2c6 100644 | |||
95 | /* Make sure fd 0,1,2 are open */ | 95 | /* Make sure fd 0,1,2 are open */ |
96 | bb_sanitize_stdio(); | 96 | bb_sanitize_stdio(); |
97 | /* Equivalent of doing a fflush after every \n */ | 97 | /* Equivalent of doing a fflush after every \n */ |
98 | @@ -1189,7 +1198,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | 98 | @@ -1330,7 +1339,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c |
99 | srand(monotonic_us()); | 99 | srand(monotonic_us()); |
100 | 100 | ||
101 | state = INIT_SELECTING; | 101 | state = INIT_SELECTING; |
@@ -105,7 +105,7 @@ index 4d755e6..a21e2c6 100644 | |||
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 | @@ -1341,7 +1351,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | 108 | @@ -1484,7 +1494,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c |
109 | } | 109 | } |
110 | /* Timed out, enter init state */ | 110 | /* Timed out, enter init state */ |
111 | bb_info_msg("Lease lost, entering init state"); | 111 | bb_info_msg("Lease lost, entering init state"); |
@@ -115,8 +115,8 @@ index 4d755e6..a21e2c6 100644 | |||
115 | state = INIT_SELECTING; | 115 | state = INIT_SELECTING; |
116 | client_config.first_secs = 0; /* make secs field count from 0 */ | 116 | client_config.first_secs = 0; /* make secs field count from 0 */ |
117 | /*timeout = 0; - already is */ | 117 | /*timeout = 0; - already is */ |
118 | @@ -1489,7 +1500,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | 118 | @@ -1667,7 +1678,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c |
119 | send_decline(xid, server_addr, packet.yiaddr); | 119 | send_decline(/*xid,*/ server_addr, packet.yiaddr); |
120 | 120 | ||
121 | if (state != REQUESTING) | 121 | if (state != REQUESTING) |
122 | - udhcp_run_script(NULL, "deconfig"); | 122 | - udhcp_run_script(NULL, "deconfig"); |
@@ -125,7 +125,7 @@ index 4d755e6..a21e2c6 100644 | |||
125 | change_listen_mode(LISTEN_RAW); | 125 | change_listen_mode(LISTEN_RAW); |
126 | state = INIT_SELECTING; | 126 | state = INIT_SELECTING; |
127 | client_config.first_secs = 0; /* make secs field count from 0 */ | 127 | client_config.first_secs = 0; /* make secs field count from 0 */ |
128 | @@ -1536,7 +1548,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | 128 | @@ -1711,7 +1723,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c |
129 | bb_info_msg("Received DHCP NAK"); | 129 | bb_info_msg("Received DHCP NAK"); |
130 | udhcp_run_script(&packet, "nak"); | 130 | udhcp_run_script(&packet, "nak"); |
131 | if (state != REQUESTING) | 131 | if (state != REQUESTING) |
@@ -135,6 +135,3 @@ index 4d755e6..a21e2c6 100644 | |||
135 | change_listen_mode(LISTEN_RAW); | 135 | change_listen_mode(LISTEN_RAW); |
136 | sleep(3); /* avoid excessive network traffic */ | 136 | sleep(3); /* avoid excessive network traffic */ |
137 | state = INIT_SELECTING; | 137 | state = INIT_SELECTING; |
138 | -- | ||
139 | 1.7.7.1 | ||
140 | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/defconfig b/meta/recipes-core/busybox/busybox-1.20.2/defconfig index 372d7b5a3a..dff07f179a 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/defconfig +++ b/meta/recipes-core/busybox/busybox-1.20.2/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.19.3 | 3 | # Busybox version: 1.20.2 |
4 | # Wed Nov 30 09:33:16 2011 | 4 | # Mon Aug 20 17:01:45 2012 |
5 | # | 5 | # |
6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
7 | 7 | ||
@@ -25,7 +25,7 @@ CONFIG_SHOW_USAGE=y | |||
25 | CONFIG_FEATURE_COMPRESS_USAGE=y | 25 | CONFIG_FEATURE_COMPRESS_USAGE=y |
26 | # CONFIG_FEATURE_INSTALLER is not set | 26 | # CONFIG_FEATURE_INSTALLER is not set |
27 | # CONFIG_INSTALL_NO_USR is not set | 27 | # CONFIG_INSTALL_NO_USR is not set |
28 | CONFIG_LOCALE_SUPPORT=y | 28 | # CONFIG_LOCALE_SUPPORT is not set |
29 | # CONFIG_UNICODE_SUPPORT is not set | 29 | # CONFIG_UNICODE_SUPPORT is not set |
30 | # CONFIG_UNICODE_USING_LOCALE is not set | 30 | # CONFIG_UNICODE_USING_LOCALE is not set |
31 | # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set | 31 | # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set |
@@ -61,8 +61,11 @@ CONFIG_FEATURE_HAVE_RPC=y | |||
61 | # CONFIG_FEATURE_INDIVIDUAL is not set | 61 | # CONFIG_FEATURE_INDIVIDUAL is not set |
62 | # CONFIG_FEATURE_SHARED_BUSYBOX is not set | 62 | # CONFIG_FEATURE_SHARED_BUSYBOX is not set |
63 | CONFIG_LFS=y | 63 | CONFIG_LFS=y |
64 | CONFIG_CROSS_COMPILER_PREFIX="" | 64 | # CONFIG_CROSS_COMPILER_PREFIX is not set |
65 | CONFIG_EXTRA_CFLAGS="" | 65 | CONFIG_SYSROOT="" |
66 | # CONFIG_EXTRA_CFLAGS is not set | ||
67 | CONFIG_EXTRA_LDFLAGS="" | ||
68 | CONFIG_EXTRA_LDLIBS="" | ||
66 | 69 | ||
67 | # | 70 | # |
68 | # Debugging Options | 71 | # Debugging Options |
@@ -92,7 +95,7 @@ CONFIG_PREFIX="./_install" | |||
92 | CONFIG_FEATURE_SYSTEMD=y | 95 | CONFIG_FEATURE_SYSTEMD=y |
93 | CONFIG_FEATURE_RTMINMAX=y | 96 | CONFIG_FEATURE_RTMINMAX=y |
94 | CONFIG_PASSWORD_MINLEN=6 | 97 | CONFIG_PASSWORD_MINLEN=6 |
95 | CONFIG_MD5_SIZE_VS_SPEED=2 | 98 | CONFIG_MD5_SMALL=1 |
96 | CONFIG_FEATURE_FAST_TOP=y | 99 | CONFIG_FEATURE_FAST_TOP=y |
97 | # CONFIG_FEATURE_ETC_NETWORKS is not set | 100 | # CONFIG_FEATURE_ETC_NETWORKS is not set |
98 | CONFIG_FEATURE_USE_TERMIOS=y | 101 | CONFIG_FEATURE_USE_TERMIOS=y |
@@ -101,6 +104,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 | |||
101 | # CONFIG_FEATURE_EDITING_VI is not set | 104 | # CONFIG_FEATURE_EDITING_VI is not set |
102 | CONFIG_FEATURE_EDITING_HISTORY=15 | 105 | CONFIG_FEATURE_EDITING_HISTORY=15 |
103 | CONFIG_FEATURE_EDITING_SAVEHISTORY=y | 106 | CONFIG_FEATURE_EDITING_SAVEHISTORY=y |
107 | # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set | ||
104 | # CONFIG_FEATURE_REVERSE_SEARCH is not set | 108 | # CONFIG_FEATURE_REVERSE_SEARCH is not set |
105 | CONFIG_FEATURE_TAB_COMPLETION=y | 109 | CONFIG_FEATURE_TAB_COMPLETION=y |
106 | CONFIG_FEATURE_USERNAME_COMPLETION=y | 110 | CONFIG_FEATURE_USERNAME_COMPLETION=y |
@@ -140,6 +144,7 @@ CONFIG_CPIO=y | |||
140 | CONFIG_GUNZIP=y | 144 | CONFIG_GUNZIP=y |
141 | CONFIG_GZIP=y | 145 | CONFIG_GZIP=y |
142 | # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set | 146 | # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set |
147 | CONFIG_GZIP_FAST=0 | ||
143 | # CONFIG_LZOP is not set | 148 | # CONFIG_LZOP is not set |
144 | # CONFIG_LZOP_COMPR_HIGH is not set | 149 | # CONFIG_LZOP_COMPR_HIGH is not set |
145 | # CONFIG_RPM2CPIO is not set | 150 | # CONFIG_RPM2CPIO is not set |
@@ -173,11 +178,13 @@ CONFIG_DATE=y | |||
173 | # CONFIG_FEATURE_DATE_ISOFMT is not set | 178 | # CONFIG_FEATURE_DATE_ISOFMT is not set |
174 | # CONFIG_FEATURE_DATE_NANO is not set | 179 | # CONFIG_FEATURE_DATE_NANO is not set |
175 | CONFIG_FEATURE_DATE_COMPAT=y | 180 | CONFIG_FEATURE_DATE_COMPAT=y |
181 | # CONFIG_HOSTID is not set | ||
176 | CONFIG_ID=y | 182 | CONFIG_ID=y |
177 | CONFIG_GROUPS=y | 183 | CONFIG_GROUPS=y |
178 | CONFIG_TEST=y | 184 | CONFIG_TEST=y |
179 | CONFIG_FEATURE_TEST_64=y | 185 | CONFIG_FEATURE_TEST_64=y |
180 | CONFIG_TOUCH=y | 186 | CONFIG_TOUCH=y |
187 | CONFIG_FEATURE_TOUCH_SUSV3=y | ||
181 | CONFIG_TR=y | 188 | CONFIG_TR=y |
182 | CONFIG_FEATURE_TR_CLASSES=y | 189 | CONFIG_FEATURE_TR_CLASSES=y |
183 | # CONFIG_FEATURE_TR_EQUIV is not set | 190 | # CONFIG_FEATURE_TR_EQUIV is not set |
@@ -220,7 +227,6 @@ CONFIG_FALSE=y | |||
220 | # CONFIG_FSYNC is not set | 227 | # CONFIG_FSYNC is not set |
221 | CONFIG_HEAD=y | 228 | CONFIG_HEAD=y |
222 | # CONFIG_FEATURE_FANCY_HEAD is not set | 229 | # CONFIG_FEATURE_FANCY_HEAD is not set |
223 | # CONFIG_HOSTID is not set | ||
224 | # CONFIG_INSTALL is not set | 230 | # CONFIG_INSTALL is not set |
225 | # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set | 231 | # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set |
226 | CONFIG_LN=y | 232 | CONFIG_LN=y |
@@ -461,6 +467,7 @@ CONFIG_LAST_SYSTEM_ID=0 | |||
461 | # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set | 467 | # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set |
462 | # CONFIG_GETTY is not set | 468 | # CONFIG_GETTY is not set |
463 | # CONFIG_LOGIN is not set | 469 | # CONFIG_LOGIN is not set |
470 | # CONFIG_LOGIN_SESSION_AS_CHILD is not set | ||
464 | # CONFIG_PAM is not set | 471 | # CONFIG_PAM is not set |
465 | # CONFIG_LOGIN_SCRIPTS is not set | 472 | # CONFIG_LOGIN_SCRIPTS is not set |
466 | # CONFIG_FEATURE_NOLOGIN is not set | 473 | # CONFIG_FEATURE_NOLOGIN is not set |
@@ -469,6 +476,7 @@ CONFIG_LAST_SYSTEM_ID=0 | |||
469 | # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set | 476 | # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set |
470 | # CONFIG_CRYPTPW is not set | 477 | # CONFIG_CRYPTPW is not set |
471 | # CONFIG_CHPASSWD is not set | 478 | # CONFIG_CHPASSWD is not set |
479 | CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" | ||
472 | # CONFIG_SU is not set | 480 | # CONFIG_SU is not set |
473 | # CONFIG_FEATURE_SU_SYSLOG is not set | 481 | # CONFIG_FEATURE_SU_SYSLOG is not set |
474 | # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set | 482 | # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set |
@@ -518,6 +526,12 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" | |||
518 | # Linux System Utilities | 526 | # Linux System Utilities |
519 | # | 527 | # |
520 | # CONFIG_BLOCKDEV is not set | 528 | # CONFIG_BLOCKDEV is not set |
529 | # CONFIG_MDEV is not set | ||
530 | # CONFIG_FEATURE_MDEV_CONF is not set | ||
531 | # CONFIG_FEATURE_MDEV_RENAME is not set | ||
532 | # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set | ||
533 | # CONFIG_FEATURE_MDEV_EXEC is not set | ||
534 | # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set | ||
521 | # CONFIG_REV is not set | 535 | # CONFIG_REV is not set |
522 | # CONFIG_ACPID is not set | 536 | # CONFIG_ACPID is not set |
523 | # CONFIG_FEATURE_ACPID_COMPAT is not set | 537 | # CONFIG_FEATURE_ACPID_COMPAT is not set |
@@ -561,12 +575,6 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y | |||
561 | CONFIG_LOSETUP=y | 575 | CONFIG_LOSETUP=y |
562 | # CONFIG_LSPCI is not set | 576 | # CONFIG_LSPCI is not set |
563 | # CONFIG_LSUSB is not set | 577 | # CONFIG_LSUSB is not set |
564 | # CONFIG_MDEV is not set | ||
565 | # CONFIG_FEATURE_MDEV_CONF is not set | ||
566 | # CONFIG_FEATURE_MDEV_RENAME is not set | ||
567 | # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set | ||
568 | # CONFIG_FEATURE_MDEV_EXEC is not set | ||
569 | # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set | ||
570 | CONFIG_MKSWAP=y | 578 | CONFIG_MKSWAP=y |
571 | # CONFIG_FEATURE_MKSWAP_UUID is not set | 579 | # CONFIG_FEATURE_MKSWAP_UUID is not set |
572 | CONFIG_MORE=y | 580 | CONFIG_MORE=y |
@@ -697,7 +705,7 @@ CONFIG_MICROCOM=y | |||
697 | # CONFIG_MT is not set | 705 | # CONFIG_MT is not set |
698 | # CONFIG_RAIDAUTORUN is not set | 706 | # CONFIG_RAIDAUTORUN is not set |
699 | # CONFIG_READAHEAD is not set | 707 | # CONFIG_READAHEAD is not set |
700 | # CONFIG_RFKILL is not set | 708 | CONFIG_RFKILL=y |
701 | # CONFIG_RUNLEVEL is not set | 709 | # CONFIG_RUNLEVEL is not set |
702 | # CONFIG_RX is not set | 710 | # CONFIG_RX is not set |
703 | # CONFIG_SETSID is not set | 711 | # CONFIG_SETSID is not set |
@@ -831,6 +839,7 @@ CONFIG_TRACEROUTE=y | |||
831 | # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set | 839 | # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set |
832 | # CONFIG_TUNCTL is not set | 840 | # CONFIG_TUNCTL is not set |
833 | # CONFIG_FEATURE_TUNCTL_UG is not set | 841 | # CONFIG_FEATURE_TUNCTL_UG is not set |
842 | # CONFIG_UDHCPC6 is not set | ||
834 | CONFIG_UDHCPD=y | 843 | CONFIG_UDHCPD=y |
835 | # CONFIG_DHCPRELAY is not set | 844 | # CONFIG_DHCPRELAY is not set |
836 | CONFIG_DUMPLEASES=y | 845 | CONFIG_DUMPLEASES=y |
@@ -877,6 +886,7 @@ CONFIG_FEATURE_MIME_CHARSET="" | |||
877 | # Process Utilities | 886 | # Process Utilities |
878 | # | 887 | # |
879 | # CONFIG_IOSTAT is not set | 888 | # CONFIG_IOSTAT is not set |
889 | # CONFIG_LSOF is not set | ||
880 | # CONFIG_MPSTAT is not set | 890 | # CONFIG_MPSTAT is not set |
881 | # CONFIG_NMETER is not set | 891 | # CONFIG_NMETER is not set |
882 | # CONFIG_PMAP is not set | 892 | # CONFIG_PMAP is not set |
@@ -898,6 +908,7 @@ CONFIG_PIDOF=y | |||
898 | # CONFIG_PKILL is not set | 908 | # CONFIG_PKILL is not set |
899 | CONFIG_PS=y | 909 | CONFIG_PS=y |
900 | CONFIG_FEATURE_PS_WIDE=y | 910 | CONFIG_FEATURE_PS_WIDE=y |
911 | CONFIG_FEATURE_PS_LONG=y | ||
901 | # CONFIG_FEATURE_PS_TIME is not set | 912 | # CONFIG_FEATURE_PS_TIME is not set |
902 | # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set | 913 | # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set |
903 | # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set | 914 | # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set |
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/fix-for-spurious-testsuite-failure.patch b/meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch index b75eaacd29..b75eaacd29 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/fix-for-spurious-testsuite-failure.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch index 0e528ff91f..0e528ff91f 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/get_header_tar.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch index 1fe20d4b0f..1fe20d4b0f 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/run-parts.in.usr-bin.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch b/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch index bd55961c1b..bd55961c1b 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch index e8e1edfb7e..e8e1edfb7e 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch | |||
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/wget_dl_dir_fix.patch b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch index 3003965d8c..3003965d8c 100644 --- a/meta/recipes-core/busybox/busybox-1.19.4/wget_dl_dir_fix.patch +++ b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch | |||
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.20.2.bb index 2e262ca481..ced04d201d 100644 --- a/meta/recipes-core/busybox/busybox_1.19.4.bb +++ b/meta/recipes-core/busybox/busybox_1.20.2.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r13" | 2 | PR = "r0" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://B921600.patch \ | 5 | file://B921600.patch \ |
@@ -25,9 +25,10 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
25 | file://umount.busybox \ | 25 | file://umount.busybox \ |
26 | file://defconfig \ | 26 | file://defconfig \ |
27 | file://busybox-mkfs-minix-tests_bigendian.patch \ | 27 | file://busybox-mkfs-minix-tests_bigendian.patch \ |
28 | file://fix-for-spurious-testsuite-failure.patch" | 28 | file://fix-for-spurious-testsuite-failure.patch \ |
29 | file://busybox-1.20.2-kernel_ver.patch" | ||
29 | 30 | ||
30 | SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e" | 31 | SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c" |
31 | SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee" | 32 | SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882" |
32 | 33 | ||
33 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" | 34 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" |