summaryrefslogtreecommitdiffstats
path: root/meta/packages/busybox
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-05-25 15:36:14 +0100
committerJoshua Lock <josh@linux.intel.com>2010-05-25 15:36:14 +0100
commit615a98ed9a021da245513790c064761a0a5a67e9 (patch)
treecba72ce890e46d97e86edc2845dd379f98712907 /meta/packages/busybox
parentcd62d697e1c746bad6dd29030f03a36750a1957e (diff)
downloadpoky-615a98ed9a021da245513790c064761a0a5a67e9.tar.gz
busybox: bump to 1.15.3 from OE
Import the 1.15.3 recipe from OpenEmbedded and tweak to match Poky style Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/busybox')
-rw-r--r--meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch12
-rw-r--r--meta/packages/busybox/busybox-1.15.3/B921600.patch13
-rw-r--r--meta/packages/busybox/busybox-1.15.3/defconfig (renamed from meta/packages/busybox/busybox-1.9.1/defconfig)420
-rw-r--r--meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch12
-rw-r--r--meta/packages/busybox/busybox-1.15.3/fix31
-rw-r--r--meta/packages/busybox/busybox-1.15.3/get_header_tar.patch11
-rw-r--r--meta/packages/busybox/busybox-1.15.3/r24785.patch14
-rw-r--r--meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch12
-rw-r--r--meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch47
-rw-r--r--meta/packages/busybox/busybox-1.15.3/udhcpscript.patch13
-rw-r--r--meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch13
-rw-r--r--meta/packages/busybox/busybox-1.9.1/adduser-longops.patch55
-rwxr-xr-xmeta/packages/busybox/busybox-1.9.1/busybox-mdev.sh69
-rw-r--r--meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch50
-rw-r--r--meta/packages/busybox/busybox-1.9.1/udhcpscript.patch26
-rw-r--r--meta/packages/busybox/busybox.inc5
-rw-r--r--meta/packages/busybox/busybox_1.15.3.bb37
-rw-r--r--meta/packages/busybox/busybox_1.9.1.bb30
-rw-r--r--meta/packages/busybox/files/busybox-appletlib-dependency.patch15
-rw-r--r--meta/packages/busybox/files/find-touchscreen.sh9
-rwxr-xr-xmeta/packages/busybox/files/mdev11
-rw-r--r--meta/packages/busybox/files/mdev.conf33
-rw-r--r--meta/packages/busybox/files/mountall1
-rw-r--r--meta/packages/busybox/files/simple.script72
24 files changed, 619 insertions, 392 deletions
diff --git a/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch b/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch
new file mode 100644
index 0000000000..c737f172b1
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch
@@ -0,0 +1,12 @@
1diff --git a/networking/wget.c b/networking/wget.c
2index 9d813dc..09edd67 100644
3--- a/networking/wget.c
4+++ b/networking/wget.c
5@@ -546,6 +546,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
6 "passive-ftp\0" No_argument "\xff"
7 "header\0" Required_argument "\xfe"
8 "post-data\0" Required_argument "\xfd"
9+ "no-check-certificate\0" No_argument "\xfc"
10 ;
11 #endif
12
diff --git a/meta/packages/busybox/busybox-1.15.3/B921600.patch b/meta/packages/busybox/busybox-1.15.3/B921600.patch
new file mode 100644
index 0000000000..61cc32b0e5
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/B921600.patch
@@ -0,0 +1,13 @@
1diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c
2--- busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.000000000 +0200
3+++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200
4@@ -52,6 +52,9 @@ static const struct speed_map speeds[] =
5 #ifdef B460800
6 {B460800, 460800/256 + 0x8000U},
7 #endif
8+#ifdef B921600
9+ {B921600, 921600/256 + 0x8000U},
10+#endif
11 };
12
13 enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
diff --git a/meta/packages/busybox/busybox-1.9.1/defconfig b/meta/packages/busybox/busybox-1.15.3/defconfig
index a0768d4bb8..ddbaa0839d 100644
--- a/meta/packages/busybox/busybox-1.9.1/defconfig
+++ b/meta/packages/busybox/busybox-1.15.3/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.9.1 3# Busybox version: 1.13.2
4# Wed Oct 8 16:19:41 2008 4# Sun Feb 8 17:22:39 2009
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -12,13 +12,14 @@ CONFIG_HAVE_DOT_CONFIG=y
12# 12#
13# General Configuration 13# General Configuration
14# 14#
15# CONFIG_NITPICK is not set
16# CONFIG_DESKTOP is not set 15# CONFIG_DESKTOP is not set
17# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set 16# CONFIG_EXTRA_COMPAT is not set
17CONFIG_FEATURE_ASSUME_UNICODE=y
18CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
18# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set 19# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
19# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set 20# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
20CONFIG_SHOW_USAGE=y 21CONFIG_SHOW_USAGE=y
21# CONFIG_FEATURE_VERBOSE_USAGE is not set 22CONFIG_FEATURE_VERBOSE_USAGE=y
22CONFIG_FEATURE_COMPRESS_USAGE=y 23CONFIG_FEATURE_COMPRESS_USAGE=y
23# CONFIG_FEATURE_INSTALLER is not set 24# CONFIG_FEATURE_INSTALLER is not set
24CONFIG_LOCALE_SUPPORT=y 25CONFIG_LOCALE_SUPPORT=y
@@ -39,15 +40,19 @@ CONFIG_FEATURE_HAVE_RPC=y
39# Build Options 40# Build Options
40# 41#
41# CONFIG_STATIC is not set 42# CONFIG_STATIC is not set
43# CONFIG_PIE is not set
44# CONFIG_NOMMU is not set
42# CONFIG_BUILD_LIBBUSYBOX is not set 45# CONFIG_BUILD_LIBBUSYBOX is not set
43# CONFIG_FEATURE_INDIVIDUAL is not set 46# CONFIG_FEATURE_INDIVIDUAL is not set
44# CONFIG_FEATURE_SHARED_BUSYBOX is not set 47# CONFIG_FEATURE_SHARED_BUSYBOX is not set
45CONFIG_LFS=y 48CONFIG_LFS=y
49CONFIG_CROSS_COMPILER_PREFIX=""
46 50
47# 51#
48# Debugging Options 52# Debugging Options
49# 53#
50# CONFIG_DEBUG is not set 54# CONFIG_DEBUG is not set
55# CONFIG_DEBUG_PESSIMIZE is not set
51# CONFIG_WERROR is not set 56# CONFIG_WERROR is not set
52CONFIG_NO_DEBUG_LIB=y 57CONFIG_NO_DEBUG_LIB=y
53# CONFIG_DMALLOC is not set 58# CONFIG_DMALLOC is not set
@@ -76,16 +81,17 @@ CONFIG_FEATURE_FAST_TOP=y
76# CONFIG_FEATURE_ETC_NETWORKS is not set 81# CONFIG_FEATURE_ETC_NETWORKS is not set
77CONFIG_FEATURE_EDITING=y 82CONFIG_FEATURE_EDITING=y
78CONFIG_FEATURE_EDITING_MAX_LEN=1024 83CONFIG_FEATURE_EDITING_MAX_LEN=1024
79CONFIG_FEATURE_EDITING_FANCY_KEYS=y
80# CONFIG_FEATURE_EDITING_VI is not set 84# CONFIG_FEATURE_EDITING_VI is not set
81CONFIG_FEATURE_EDITING_HISTORY=15 85CONFIG_FEATURE_EDITING_HISTORY=64
82CONFIG_FEATURE_EDITING_SAVEHISTORY=y 86CONFIG_FEATURE_EDITING_SAVEHISTORY=y
83CONFIG_FEATURE_TAB_COMPLETION=y 87CONFIG_FEATURE_TAB_COMPLETION=y
84CONFIG_FEATURE_USERNAME_COMPLETION=y 88CONFIG_FEATURE_USERNAME_COMPLETION=y
85CONFIG_FEATURE_EDITING_FANCY_PROMPT=y 89CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
90CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
86CONFIG_FEATURE_COPYBUF_KB=4 91CONFIG_FEATURE_COPYBUF_KB=4
87CONFIG_MONOTONIC_SYSCALL=y 92CONFIG_MONOTONIC_SYSCALL=y
88CONFIG_IOCTL_HEX2STR_ERROR=y 93CONFIG_IOCTL_HEX2STR_ERROR=y
94CONFIG_FEATURE_HWIB=y
89 95
90# 96#
91# Applets 97# Applets
@@ -94,45 +100,38 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
94# 100#
95# Archival Utilities 101# Archival Utilities
96# 102#
103# CONFIG_FEATURE_SEAMLESS_LZMA is not set
104CONFIG_FEATURE_SEAMLESS_BZ2=y
105CONFIG_FEATURE_SEAMLESS_GZ=y
106CONFIG_FEATURE_SEAMLESS_Z=y
97CONFIG_AR=y 107CONFIG_AR=y
98# CONFIG_FEATURE_AR_LONG_FILENAMES is not set 108# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
99CONFIG_BUNZIP2=y 109CONFIG_BUNZIP2=y
100# CONFIG_BZIP2 is not set 110# CONFIG_BZIP2 is not set
101CONFIG_CPIO=y 111CONFIG_CPIO=y
112# CONFIG_FEATURE_CPIO_O is not set
102# CONFIG_DPKG is not set 113# CONFIG_DPKG is not set
103# CONFIG_DPKG_DEB is not set 114# CONFIG_DPKG_DEB is not set
104# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set 115# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
105CONFIG_GUNZIP=y 116CONFIG_GUNZIP=y
106# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
107CONFIG_GZIP=y 117CONFIG_GZIP=y
108# CONFIG_RPM2CPIO is not set 118# CONFIG_RPM2CPIO is not set
109# CONFIG_RPM is not set 119# CONFIG_RPM is not set
110# CONFIG_FEATURE_RPM_BZ2 is not set
111CONFIG_TAR=y 120CONFIG_TAR=y
112CONFIG_FEATURE_TAR_CREATE=y 121CONFIG_FEATURE_TAR_CREATE=y
113CONFIG_FEATURE_TAR_BZIP2=y 122CONFIG_FEATURE_TAR_AUTODETECT=y
114# CONFIG_FEATURE_TAR_LZMA is not set
115CONFIG_FEATURE_TAR_FROM=y 123CONFIG_FEATURE_TAR_FROM=y
116CONFIG_FEATURE_TAR_GZIP=y 124CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
117# CONFIG_FEATURE_TAR_COMPRESS is not set
118# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
119# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set 125# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
120CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y 126CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
121# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set 127CONFIG_FEATURE_TAR_LONG_OPTIONS=y
128CONFIG_FEATURE_TAR_UNAME_GNAME=y
122# CONFIG_UNCOMPRESS is not set 129# CONFIG_UNCOMPRESS is not set
123# CONFIG_UNLZMA is not set 130# CONFIG_UNLZMA is not set
124# CONFIG_FEATURE_LZMA_FAST is not set 131# CONFIG_FEATURE_LZMA_FAST is not set
125CONFIG_UNZIP=y 132CONFIG_UNZIP=y
126 133
127# 134#
128# Common options for cpio and tar
129#
130# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
131# CONFIG_FEATURE_DEB_TAR_GZ is not set
132# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
133# CONFIG_FEATURE_DEB_TAR_LZMA is not set
134
135#
136# Coreutils 135# Coreutils
137# 136#
138CONFIG_BASENAME=y 137CONFIG_BASENAME=y
@@ -148,12 +147,12 @@ CONFIG_CHROOT=y
148CONFIG_CP=y 147CONFIG_CP=y
149CONFIG_CUT=y 148CONFIG_CUT=y
150CONFIG_DATE=y 149CONFIG_DATE=y
151# CONFIG_FEATURE_DATE_ISOFMT is not set 150CONFIG_FEATURE_DATE_ISOFMT=y
152CONFIG_DD=y 151CONFIG_DD=y
153CONFIG_FEATURE_DD_SIGNAL_HANDLING=y 152CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
154# CONFIG_FEATURE_DD_IBS_OBS is not set 153# CONFIG_FEATURE_DD_IBS_OBS is not set
155CONFIG_DF=y 154CONFIG_DF=y
156# CONFIG_FEATURE_DF_INODE is not set 155CONFIG_FEATURE_DF_FANCY=y
157CONFIG_DIRNAME=y 156CONFIG_DIRNAME=y
158# CONFIG_DOS2UNIX is not set 157# CONFIG_DOS2UNIX is not set
159# CONFIG_UNIX2DOS is not set 158# CONFIG_UNIX2DOS is not set
@@ -170,7 +169,7 @@ CONFIG_EXPR=y
170CONFIG_FALSE=y 169CONFIG_FALSE=y
171# CONFIG_FOLD is not set 170# CONFIG_FOLD is not set
172CONFIG_HEAD=y 171CONFIG_HEAD=y
173# CONFIG_FEATURE_FANCY_HEAD is not set 172CONFIG_FEATURE_FANCY_HEAD=y
174# CONFIG_HOSTID is not set 173# CONFIG_HOSTID is not set
175CONFIG_ID=y 174CONFIG_ID=y
176# CONFIG_INSTALL is not set 175# CONFIG_INSTALL is not set
@@ -193,8 +192,8 @@ CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
193CONFIG_MKFIFO=y 192CONFIG_MKFIFO=y
194CONFIG_MKNOD=y 193CONFIG_MKNOD=y
195CONFIG_MV=y 194CONFIG_MV=y
196# CONFIG_FEATURE_MV_LONG_OPTIONS is not set 195CONFIG_FEATURE_MV_LONG_OPTIONS=y
197# CONFIG_NICE is not set 196CONFIG_NICE=y
198CONFIG_NOHUP=y 197CONFIG_NOHUP=y
199CONFIG_OD=y 198CONFIG_OD=y
200# CONFIG_PRINTENV is not set 199# CONFIG_PRINTENV is not set
@@ -205,10 +204,12 @@ CONFIG_FEATURE_READLINK_FOLLOW=y
205CONFIG_REALPATH=y 204CONFIG_REALPATH=y
206CONFIG_RM=y 205CONFIG_RM=y
207CONFIG_RMDIR=y 206CONFIG_RMDIR=y
207CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
208CONFIG_SEQ=y 208CONFIG_SEQ=y
209# CONFIG_SHA1SUM is not set 209# CONFIG_SHA1SUM is not set
210CONFIG_SLEEP=y 210CONFIG_SLEEP=y
211CONFIG_FEATURE_FANCY_SLEEP=y 211CONFIG_FEATURE_FANCY_SLEEP=y
212CONFIG_FEATURE_FLOAT_SLEEP=y
212CONFIG_SORT=y 213CONFIG_SORT=y
213CONFIG_FEATURE_SORT_BIG=y 214CONFIG_FEATURE_SORT_BIG=y
214# CONFIG_SPLIT is not set 215# CONFIG_SPLIT is not set
@@ -218,10 +219,11 @@ CONFIG_FEATURE_SORT_BIG=y
218CONFIG_STTY=y 219CONFIG_STTY=y
219# CONFIG_SUM is not set 220# CONFIG_SUM is not set
220CONFIG_SYNC=y 221CONFIG_SYNC=y
222# CONFIG_TAC is not set
221CONFIG_TAIL=y 223CONFIG_TAIL=y
222CONFIG_FEATURE_FANCY_TAIL=y 224CONFIG_FEATURE_FANCY_TAIL=y
223CONFIG_TEE=y 225CONFIG_TEE=y
224# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set 226CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
225CONFIG_TEST=y 227CONFIG_TEST=y
226# CONFIG_FEATURE_TEST_64 is not set 228# CONFIG_FEATURE_TEST_64 is not set
227CONFIG_TOUCH=y 229CONFIG_TOUCH=y
@@ -279,8 +281,12 @@ CONFIG_RESET=y
279# CONFIG_FEATURE_RESIZE_PRINT is not set 281# CONFIG_FEATURE_RESIZE_PRINT is not set
280CONFIG_SETCONSOLE=y 282CONFIG_SETCONSOLE=y
281# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set 283# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
284CONFIG_SETFONT=y
285CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
286CONFIG_DEFAULT_SETFONT_DIR=""
282# CONFIG_SETKEYCODES is not set 287# CONFIG_SETKEYCODES is not set
283# CONFIG_SETLOGCONS is not set 288# CONFIG_SETLOGCONS is not set
289CONFIG_SHOWKEY=y
284 290
285# 291#
286# Debian Utilities 292# Debian Utilities
@@ -289,7 +295,7 @@ CONFIG_MKTEMP=y
289# CONFIG_PIPE_PROGRESS is not set 295# CONFIG_PIPE_PROGRESS is not set
290CONFIG_RUN_PARTS=y 296CONFIG_RUN_PARTS=y
291CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y 297CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
292# CONFIG_FEATURE_RUN_PARTS_FANCY is not set 298CONFIG_FEATURE_RUN_PARTS_FANCY=y
293CONFIG_START_STOP_DAEMON=y 299CONFIG_START_STOP_DAEMON=y
294CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y 300CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
295CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y 301CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
@@ -299,12 +305,12 @@ CONFIG_WHICH=y
299# Editors 305# Editors
300# 306#
301CONFIG_AWK=y 307CONFIG_AWK=y
302CONFIG_FEATURE_AWK_MATH=y 308CONFIG_FEATURE_AWK_LIBM=y
303CONFIG_CMP=y 309CONFIG_CMP=y
304CONFIG_DIFF=y 310CONFIG_DIFF=y
305CONFIG_FEATURE_DIFF_BINARY=y 311CONFIG_FEATURE_DIFF_BINARY=y
306CONFIG_FEATURE_DIFF_DIR=y 312CONFIG_FEATURE_DIFF_DIR=y
307# CONFIG_FEATURE_DIFF_MINIMAL is not set 313CONFIG_FEATURE_DIFF_MINIMAL=y
308# CONFIG_ED is not set 314# CONFIG_ED is not set
309CONFIG_PATCH=y 315CONFIG_PATCH=y
310CONFIG_SED=y 316CONFIG_SED=y
@@ -315,10 +321,10 @@ CONFIG_FEATURE_VI_COLON=y
315CONFIG_FEATURE_VI_YANKMARK=y 321CONFIG_FEATURE_VI_YANKMARK=y
316CONFIG_FEATURE_VI_SEARCH=y 322CONFIG_FEATURE_VI_SEARCH=y
317CONFIG_FEATURE_VI_USE_SIGNALS=y 323CONFIG_FEATURE_VI_USE_SIGNALS=y
318# CONFIG_FEATURE_VI_DOT_CMD is not set 324CONFIG_FEATURE_VI_DOT_CMD=y
319# CONFIG_FEATURE_VI_READONLY is not set 325# CONFIG_FEATURE_VI_READONLY is not set
320# CONFIG_FEATURE_VI_SETOPTS is not set 326# CONFIG_FEATURE_VI_SETOPTS is not set
321# CONFIG_FEATURE_VI_SET is not set 327CONFIG_FEATURE_VI_SET=y
322CONFIG_FEATURE_VI_WIN_RESIZE=y 328CONFIG_FEATURE_VI_WIN_RESIZE=y
323CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y 329CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
324CONFIG_FEATURE_ALLOW_EXEC=y 330CONFIG_FEATURE_ALLOW_EXEC=y
@@ -335,7 +341,7 @@ CONFIG_FEATURE_FIND_TYPE=y
335CONFIG_FEATURE_FIND_XDEV=y 341CONFIG_FEATURE_FIND_XDEV=y
336CONFIG_FEATURE_FIND_MAXDEPTH=y 342CONFIG_FEATURE_FIND_MAXDEPTH=y
337CONFIG_FEATURE_FIND_NEWER=y 343CONFIG_FEATURE_FIND_NEWER=y
338# CONFIG_FEATURE_FIND_INUM is not set 344CONFIG_FEATURE_FIND_INUM=y
339CONFIG_FEATURE_FIND_EXEC=y 345CONFIG_FEATURE_FIND_EXEC=y
340CONFIG_FEATURE_FIND_USER=y 346CONFIG_FEATURE_FIND_USER=y
341CONFIG_FEATURE_FIND_GROUP=y 347CONFIG_FEATURE_FIND_GROUP=y
@@ -344,7 +350,7 @@ CONFIG_FEATURE_FIND_DEPTH=y
344CONFIG_FEATURE_FIND_PAREN=y 350CONFIG_FEATURE_FIND_PAREN=y
345CONFIG_FEATURE_FIND_SIZE=y 351CONFIG_FEATURE_FIND_SIZE=y
346CONFIG_FEATURE_FIND_PRUNE=y 352CONFIG_FEATURE_FIND_PRUNE=y
347# CONFIG_FEATURE_FIND_DELETE is not set 353CONFIG_FEATURE_FIND_DELETE=y
348CONFIG_FEATURE_FIND_PATH=y 354CONFIG_FEATURE_FIND_PATH=y
349CONFIG_FEATURE_FIND_REGEX=y 355CONFIG_FEATURE_FIND_REGEX=y
350# CONFIG_FEATURE_FIND_CONTEXT is not set 356# CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -354,54 +360,57 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y
354CONFIG_FEATURE_GREP_CONTEXT=y 360CONFIG_FEATURE_GREP_CONTEXT=y
355CONFIG_XARGS=y 361CONFIG_XARGS=y
356# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set 362# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
357# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set 363CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
358# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set 364CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
359# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set 365CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
360 366
361# 367#
362# Init Utilities 368# Init Utilities
363# 369#
364# CONFIG_INIT is not set 370CONFIG_INIT=y
365# CONFIG_DEBUG_INIT is not set 371CONFIG_FEATURE_USE_INITTAB=y
366# CONFIG_FEATURE_USE_INITTAB is not set 372CONFIG_FEATURE_KILL_REMOVED=y
373CONFIG_FEATURE_KILL_DELAY=0
367# CONFIG_FEATURE_INIT_SCTTY is not set 374# CONFIG_FEATURE_INIT_SCTTY is not set
368# CONFIG_FEATURE_INIT_SYSLOG is not set 375# CONFIG_FEATURE_INIT_SYSLOG is not set
369# CONFIG_FEATURE_EXTRA_QUIET is not set 376# CONFIG_FEATURE_EXTRA_QUIET is not set
370# CONFIG_FEATURE_INIT_COREDUMPS is not set 377# CONFIG_FEATURE_INIT_COREDUMPS is not set
371# CONFIG_FEATURE_INITRD is not set 378CONFIG_FEATURE_INITRD=y
372CONFIG_HALT=y 379CONFIG_HALT=y
373# CONFIG_MESG is not set 380# CONFIG_MESG is not set
374 381
375# 382#
376# Login/Password Management Utilities 383# Login/Password Management Utilities
377# 384#
378# CONFIG_FEATURE_SHADOWPASSWDS is not set 385CONFIG_FEATURE_SHADOWPASSWDS=y
379# CONFIG_USE_BB_SHADOW is not set
380# CONFIG_USE_BB_PWD_GRP is not set 386# CONFIG_USE_BB_PWD_GRP is not set
381# CONFIG_ADDGROUP is not set 387# CONFIG_USE_BB_SHADOW is not set
382# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set 388CONFIG_USE_BB_CRYPT=y
383# CONFIG_DELGROUP is not set 389CONFIG_ADDGROUP=y
384# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set 390CONFIG_FEATURE_ADDUSER_TO_GROUP=y
385# CONFIG_ADDUSER is not set 391CONFIG_DELGROUP=y
386# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set 392CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
387# CONFIG_DELUSER is not set 393CONFIG_FEATURE_CHECK_NAMES=y
388# CONFIG_GETTY is not set 394CONFIG_ADDUSER=y
395CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
396CONFIG_DELUSER=y
397CONFIG_GETTY=y
389CONFIG_FEATURE_UTMP=y 398CONFIG_FEATURE_UTMP=y
390# CONFIG_FEATURE_WTMP is not set 399CONFIG_FEATURE_WTMP=y
391# CONFIG_LOGIN is not set 400CONFIG_LOGIN=y
392# CONFIG_PAM is not set 401# CONFIG_PAM is not set
393# CONFIG_LOGIN_SCRIPTS is not set 402CONFIG_LOGIN_SCRIPTS=y
394# CONFIG_FEATURE_NOLOGIN is not set 403CONFIG_FEATURE_NOLOGIN=y
395# CONFIG_FEATURE_SECURETTY is not set 404CONFIG_FEATURE_SECURETTY=y
396# CONFIG_PASSWD is not set 405CONFIG_PASSWD=y
397# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set 406CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
398# CONFIG_CRYPTPW is not set 407CONFIG_CRYPTPW=y
399# CONFIG_CHPASSWD is not set 408CONFIG_CHPASSWD=y
400# CONFIG_SU is not set 409CONFIG_SU=y
401# CONFIG_FEATURE_SU_SYSLOG is not set 410CONFIG_FEATURE_SU_SYSLOG=y
402# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set 411CONFIG_FEATURE_SU_CHECKS_SHELLS=y
403# CONFIG_SULOGIN is not set 412CONFIG_SULOGIN=y
404# CONFIG_VLOCK is not set 413CONFIG_VLOCK=y
405 414
406# 415#
407# Linux Ext2 FS Progs 416# Linux Ext2 FS Progs
@@ -413,30 +422,36 @@ CONFIG_FSCK=y
413# 422#
414# Linux Module Utilities 423# Linux Module Utilities
415# 424#
425CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
426CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
427# CONFIG_MODPROBE_SMALL is not set
428# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
429# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
416CONFIG_INSMOD=y 430CONFIG_INSMOD=y
417# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
418# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
419# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
420# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
421# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
422CONFIG_RMMOD=y 431CONFIG_RMMOD=y
423CONFIG_LSMOD=y 432CONFIG_LSMOD=y
424# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set 433CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
425CONFIG_MODPROBE=y 434CONFIG_MODPROBE=y
426CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y 435CONFIG_FEATURE_MODPROBE_BLACKLIST=y
427CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y 436# CONFIG_DEPMOD is not set
428 437
429# 438#
430# Options common to multiple modutils 439# Options common to multiple modutils
431# 440#
432CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
433# CONFIG_FEATURE_2_4_MODULES is not set 441# CONFIG_FEATURE_2_4_MODULES is not set
434CONFIG_FEATURE_2_6_MODULES=y 442# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
435# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set 443# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
444# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
445# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
446# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
447CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
448CONFIG_FEATURE_MODUTILS_ALIAS=y
449CONFIG_FEATURE_MODUTILS_SYMBOLS=y
436 450
437# 451#
438# Linux System Utilities 452# Linux System Utilities
439# 453#
454CONFIG_BLKID=y
440CONFIG_DMESG=y 455CONFIG_DMESG=y
441CONFIG_FEATURE_DMESG_PRETTY=y 456CONFIG_FEATURE_DMESG_PRETTY=y
442CONFIG_FBSET=y 457CONFIG_FBSET=y
@@ -450,9 +465,10 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
450# CONFIG_FEATURE_AIX_LABEL is not set 465# CONFIG_FEATURE_AIX_LABEL is not set
451# CONFIG_FEATURE_SGI_LABEL is not set 466# CONFIG_FEATURE_SGI_LABEL is not set
452# CONFIG_FEATURE_SUN_LABEL is not set 467# CONFIG_FEATURE_SUN_LABEL is not set
453# CONFIG_FEATURE_OSF_LABEL is not set 468CONFIG_FEATURE_OSF_LABEL=y
454# CONFIG_FEATURE_FDISK_ADVANCED is not set 469CONFIG_FEATURE_FDISK_ADVANCED=y
455# CONFIG_FREERAMDISK is not set 470# CONFIG_FINDFS is not set
471CONFIG_FREERAMDISK=y
456CONFIG_FSCK_MINIX=y 472CONFIG_FSCK_MINIX=y
457CONFIG_MKFS_MINIX=y 473CONFIG_MKFS_MINIX=y
458 474
@@ -460,38 +476,64 @@ CONFIG_MKFS_MINIX=y
460# Minix filesystem support 476# Minix filesystem support
461# 477#
462CONFIG_FEATURE_MINIX2=y 478CONFIG_FEATURE_MINIX2=y
463# CONFIG_GETOPT is not set 479CONFIG_GETOPT=y
464CONFIG_HEXDUMP=y 480CONFIG_HEXDUMP=y
465# CONFIG_HD is not set
466# CONFIG_FEATURE_HEXDUMP_REVERSE is not set 481# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
482# CONFIG_HD is not set
467CONFIG_HWCLOCK=y 483CONFIG_HWCLOCK=y
468CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y 484CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
469CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y 485CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
470# CONFIG_IPCRM is not set 486# CONFIG_IPCRM is not set
471# CONFIG_IPCS is not set 487# CONFIG_IPCS is not set
472CONFIG_LOSETUP=y 488CONFIG_LOSETUP=y
473# CONFIG_MDEV is not set 489CONFIG_MDEV=y
474# CONFIG_FEATURE_MDEV_CONF is not set 490CONFIG_FEATURE_MDEV_CONF=y
475# CONFIG_FEATURE_MDEV_EXEC is not set 491CONFIG_FEATURE_MDEV_RENAME=y
476# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set 492CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
493CONFIG_FEATURE_MDEV_EXEC=y
494CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
477CONFIG_MKSWAP=y 495CONFIG_MKSWAP=y
478# CONFIG_FEATURE_MKSWAP_V0 is not set 496# CONFIG_FEATURE_MKSWAP_V0 is not set
479CONFIG_MORE=y 497CONFIG_MORE=y
480CONFIG_FEATURE_USE_TERMIOS=y 498CONFIG_FEATURE_USE_TERMIOS=y
499CONFIG_VOLUMEID=y
500# CONFIG_FEATURE_VOLUMEID_EXT is not set
501# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
502# CONFIG_FEATURE_VOLUMEID_FAT is not set
503# CONFIG_FEATURE_VOLUMEID_HFS is not set
504# CONFIG_FEATURE_VOLUMEID_JFS is not set
505# CONFIG_FEATURE_VOLUMEID_XFS is not set
506# CONFIG_FEATURE_VOLUMEID_NTFS is not set
507# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
508# CONFIG_FEATURE_VOLUMEID_UDF is not set
509# CONFIG_FEATURE_VOLUMEID_LUKS is not set
510# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
511# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
512# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
513# CONFIG_FEATURE_VOLUMEID_SYSV is not set
514# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
515# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
481CONFIG_MOUNT=y 516CONFIG_MOUNT=y
482# CONFIG_FEATURE_MOUNT_HELPERS is not set 517# CONFIG_FEATURE_MOUNT_FAKE is not set
518CONFIG_FEATURE_MOUNT_VERBOSE=y
519CONFIG_FEATURE_MOUNT_HELPERS=y
520CONFIG_FEATURE_MOUNT_LABEL=y
483CONFIG_FEATURE_MOUNT_NFS=y 521CONFIG_FEATURE_MOUNT_NFS=y
484# CONFIG_FEATURE_MOUNT_CIFS is not set 522CONFIG_FEATURE_MOUNT_CIFS=y
485CONFIG_FEATURE_MOUNT_FLAGS=y 523CONFIG_FEATURE_MOUNT_FLAGS=y
486CONFIG_FEATURE_MOUNT_FSTAB=y 524CONFIG_FEATURE_MOUNT_FSTAB=y
487CONFIG_PIVOT_ROOT=y 525CONFIG_PIVOT_ROOT=y
488CONFIG_RDATE=y 526CONFIG_RDATE=y
489# CONFIG_READPROFILE is not set 527CONFIG_RDEV=y
528CONFIG_READPROFILE=y
529CONFIG_RTCWAKE=y
530# CONFIG_SCRIPT is not set
490# CONFIG_SETARCH is not set 531# CONFIG_SETARCH is not set
491CONFIG_SWAPONOFF=y 532CONFIG_SWAPONOFF=y
533# CONFIG_FEATURE_SWAPON_PRI is not set
492CONFIG_SWITCH_ROOT=y 534CONFIG_SWITCH_ROOT=y
493CONFIG_UMOUNT=y 535CONFIG_UMOUNT=y
494# CONFIG_FEATURE_UMOUNT_ALL is not set 536CONFIG_FEATURE_UMOUNT_ALL=y
495 537
496# 538#
497# Common options for mount/umount 539# Common options for mount/umount
@@ -504,26 +546,43 @@ CONFIG_FEATURE_MOUNT_LOOP=y
504# 546#
505# CONFIG_ADJTIMEX is not set 547# CONFIG_ADJTIMEX is not set
506# CONFIG_BBCONFIG is not set 548# CONFIG_BBCONFIG is not set
549# CONFIG_CHAT is not set
550# CONFIG_FEATURE_CHAT_NOFAIL is not set
551# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
552# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
553# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
554# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
555# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
556# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
507# CONFIG_CHRT is not set 557# CONFIG_CHRT is not set
508# CONFIG_CROND is not set 558# CONFIG_CROND is not set
509# CONFIG_DEBUG_CROND_OPTION is not set 559# CONFIG_FEATURE_CROND_D is not set
510# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set 560# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
511# CONFIG_CRONTAB is not set 561# CONFIG_CRONTAB is not set
512CONFIG_DC=y 562CONFIG_DC=y
563CONFIG_FEATURE_DC_LIBM=y
513# CONFIG_DEVFSD is not set 564# CONFIG_DEVFSD is not set
514# CONFIG_DEVFSD_MODLOAD is not set 565# CONFIG_DEVFSD_MODLOAD is not set
515# CONFIG_DEVFSD_FG_NP is not set 566# CONFIG_DEVFSD_FG_NP is not set
516# CONFIG_DEVFSD_VERBOSE is not set 567# CONFIG_DEVFSD_VERBOSE is not set
517# CONFIG_FEATURE_DEVFS is not set 568# CONFIG_FEATURE_DEVFS is not set
569# CONFIG_DEVMEM is not set
518# CONFIG_EJECT is not set 570# CONFIG_EJECT is not set
519# CONFIG_LAST is not set 571# CONFIG_FEATURE_EJECT_SCSI is not set
572CONFIG_FBSPLASH=y
573# CONFIG_INOTIFYD is not set
574CONFIG_LAST=y
575CONFIG_FEATURE_LAST_SMALL=y
576# CONFIG_FEATURE_LAST_FANCY is not set
520CONFIG_LESS=y 577CONFIG_LESS=y
521CONFIG_FEATURE_LESS_MAXLINES=9999999 578CONFIG_FEATURE_LESS_MAXLINES=9999999
522CONFIG_FEATURE_LESS_BRACKETS=y 579CONFIG_FEATURE_LESS_BRACKETS=y
523CONFIG_FEATURE_LESS_FLAGS=y 580CONFIG_FEATURE_LESS_FLAGS=y
524# CONFIG_FEATURE_LESS_FLAGCS is not set 581# CONFIG_FEATURE_LESS_DASHCMD is not set
525# CONFIG_FEATURE_LESS_MARKS is not set 582# CONFIG_FEATURE_LESS_MARKS is not set
526# CONFIG_FEATURE_LESS_REGEXP is not set 583# CONFIG_FEATURE_LESS_REGEXP is not set
584# CONFIG_FEATURE_LESS_LINENUMS is not set
585# CONFIG_FEATURE_LESS_WINCH is not set
527# CONFIG_HDPARM is not set 586# CONFIG_HDPARM is not set
528# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set 587# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
529# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set 588# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -531,18 +590,19 @@ CONFIG_FEATURE_LESS_FLAGS=y
531# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set 590# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
532# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set 591# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
533# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set 592# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
534# CONFIG_MAKEDEVS is not set 593CONFIG_MAKEDEVS=y
535# CONFIG_FEATURE_MAKEDEVS_LEAF is not set 594# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
536# CONFIG_FEATURE_MAKEDEVS_TABLE is not set 595CONFIG_FEATURE_MAKEDEVS_TABLE=y
596# CONFIG_MAN is not set
537CONFIG_MICROCOM=y 597CONFIG_MICROCOM=y
538# CONFIG_MOUNTPOINT is not set 598# CONFIG_MOUNTPOINT is not set
539# CONFIG_MT is not set 599# CONFIG_MT is not set
540# CONFIG_RAIDAUTORUN is not set 600# CONFIG_RAIDAUTORUN is not set
541# CONFIG_READAHEAD is not set 601CONFIG_READAHEAD=y
542# CONFIG_RUNLEVEL is not set 602# CONFIG_RUNLEVEL is not set
543# CONFIG_RX is not set 603# CONFIG_RX is not set
544CONFIG_STRINGS=y
545# CONFIG_SETSID is not set 604# CONFIG_SETSID is not set
605CONFIG_STRINGS=y
546# CONFIG_TASKSET is not set 606# CONFIG_TASKSET is not set
547# CONFIG_FEATURE_TASKSET_FANCY is not set 607# CONFIG_FEATURE_TASKSET_FANCY is not set
548CONFIG_TIME=y 608CONFIG_TIME=y
@@ -557,6 +617,9 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
557# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set 617# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
558# CONFIG_ARP is not set 618# CONFIG_ARP is not set
559# CONFIG_ARPING is not set 619# CONFIG_ARPING is not set
620# CONFIG_BRCTL is not set
621# CONFIG_FEATURE_BRCTL_FANCY is not set
622# CONFIG_FEATURE_BRCTL_SHOW is not set
560# CONFIG_DNSD is not set 623# CONFIG_DNSD is not set
561# CONFIG_ETHER_WAKE is not set 624# CONFIG_ETHER_WAKE is not set
562# CONFIG_FAKEIDENTD is not set 625# CONFIG_FAKEIDENTD is not set
@@ -564,26 +627,27 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
564# CONFIG_FTPPUT is not set 627# CONFIG_FTPPUT is not set
565# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set 628# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
566CONFIG_HOSTNAME=y 629CONFIG_HOSTNAME=y
567# CONFIG_HTTPD is not set 630CONFIG_HTTPD=y
568# CONFIG_FEATURE_HTTPD_RANGES is not set 631CONFIG_FEATURE_HTTPD_RANGES=y
569# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set 632CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
570# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set 633CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y
571# CONFIG_FEATURE_HTTPD_SETUID is not set 634CONFIG_FEATURE_HTTPD_SETUID=y
572# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set 635CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
573# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set 636CONFIG_FEATURE_HTTPD_AUTH_MD5=y
574# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set 637CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y
575# CONFIG_FEATURE_HTTPD_CGI is not set 638CONFIG_FEATURE_HTTPD_CGI=y
576# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set 639CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
577# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set 640CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
578# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set 641CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
579# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set 642CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
580# CONFIG_FEATURE_HTTPD_PROXY is not set 643CONFIG_FEATURE_HTTPD_PROXY=y
581CONFIG_IFCONFIG=y 644CONFIG_IFCONFIG=y
582CONFIG_FEATURE_IFCONFIG_STATUS=y 645CONFIG_FEATURE_IFCONFIG_STATUS=y
583# CONFIG_FEATURE_IFCONFIG_SLIP is not set 646# CONFIG_FEATURE_IFCONFIG_SLIP is not set
584# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set 647# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
585CONFIG_FEATURE_IFCONFIG_HW=y 648CONFIG_FEATURE_IFCONFIG_HW=y
586# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set 649CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
650# CONFIG_IFENSLAVE is not set
587CONFIG_IFUPDOWN=y 651CONFIG_IFUPDOWN=y
588CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" 652CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
589# CONFIG_FEATURE_IFUPDOWN_IP is not set 653# CONFIG_FEATURE_IFUPDOWN_IP is not set
@@ -619,39 +683,44 @@ CONFIG_FEATURE_IP_TUNNEL=y
619# CONFIG_NAMEIF is not set 683# CONFIG_NAMEIF is not set
620# CONFIG_FEATURE_NAMEIF_EXTENDED is not set 684# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
621CONFIG_NC=y 685CONFIG_NC=y
622# CONFIG_NC_SERVER is not set 686CONFIG_NC_SERVER=y
623# CONFIG_NC_EXTRA is not set 687CONFIG_NC_EXTRA=y
624CONFIG_NETSTAT=y 688CONFIG_NETSTAT=y
625# CONFIG_FEATURE_NETSTAT_WIDE is not set 689CONFIG_FEATURE_NETSTAT_WIDE=y
690CONFIG_FEATURE_NETSTAT_PRG=y
626CONFIG_NSLOOKUP=y 691CONFIG_NSLOOKUP=y
627CONFIG_PING=y 692CONFIG_PING=y
628CONFIG_PING6=y 693CONFIG_PING6=y
629# CONFIG_PSCAN is not set
630CONFIG_FEATURE_FANCY_PING=y 694CONFIG_FEATURE_FANCY_PING=y
695# CONFIG_PSCAN is not set
631CONFIG_ROUTE=y 696CONFIG_ROUTE=y
632# CONFIG_SLATTACH is not set 697# CONFIG_SLATTACH is not set
633CONFIG_TELNET=y 698CONFIG_TELNET=y
634# CONFIG_FEATURE_TELNET_TTYPE is not set 699# CONFIG_FEATURE_TELNET_TTYPE is not set
635CONFIG_FEATURE_TELNET_AUTOLOGIN=y 700CONFIG_FEATURE_TELNET_AUTOLOGIN=y
636# CONFIG_TELNETD is not set 701CONFIG_TELNETD=y
637# CONFIG_FEATURE_TELNETD_STANDALONE is not set 702# CONFIG_FEATURE_TELNETD_STANDALONE is not set
638CONFIG_TFTP=y 703CONFIG_TFTP=y
704# CONFIG_TFTPD is not set
639CONFIG_FEATURE_TFTP_GET=y 705CONFIG_FEATURE_TFTP_GET=y
640CONFIG_FEATURE_TFTP_PUT=y 706CONFIG_FEATURE_TFTP_PUT=y
641# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set 707# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
642# CONFIG_DEBUG_TFTP is not set 708# CONFIG_TFTP_DEBUG is not set
643CONFIG_TRACEROUTE=y 709CONFIG_TRACEROUTE=y
644# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set 710CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
645# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set 711CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
646# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set 712CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
647CONFIG_APP_UDHCPD=y 713CONFIG_APP_UDHCPD=y
648# CONFIG_APP_DHCPRELAY is not set 714CONFIG_APP_DHCPRELAY=y
649CONFIG_APP_DUMPLEASES=y 715CONFIG_APP_DUMPLEASES=y
650# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set 716# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
717CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
651CONFIG_APP_UDHCPC=y 718CONFIG_APP_UDHCPC=y
652CONFIG_FEATURE_UDHCPC_ARPING=y 719CONFIG_FEATURE_UDHCPC_ARPING=y
653# CONFIG_FEATURE_UDHCP_DEBUG is not set 720# CONFIG_FEATURE_UDHCP_PORT is not set
654# CONFIG_FEATURE_RFC3397 is not set 721# CONFIG_UDHCP_DEBUG is not set
722# CONFIG_FEATURE_UDHCP_RFC3397 is not set
723CONFIG_UDHCPC_DEFAULT_SCRIPT="@DATADIR@/udhcpc/default.script"
655CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 724CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
656# CONFIG_VCONFIG is not set 725# CONFIG_VCONFIG is not set
657CONFIG_WGET=y 726CONFIG_WGET=y
@@ -659,6 +728,28 @@ CONFIG_FEATURE_WGET_STATUSBAR=y
659CONFIG_FEATURE_WGET_AUTHENTICATION=y 728CONFIG_FEATURE_WGET_AUTHENTICATION=y
660CONFIG_FEATURE_WGET_LONG_OPTIONS=y 729CONFIG_FEATURE_WGET_LONG_OPTIONS=y
661# CONFIG_ZCIP is not set 730# CONFIG_ZCIP is not set
731# CONFIG_TCPSVD is not set
732# CONFIG_UDPSVD is not set
733
734#
735# Print Utilities
736#
737# CONFIG_LPD is not set
738# CONFIG_LPR is not set
739# CONFIG_LPQ is not set
740
741#
742# Mail Utilities
743#
744# CONFIG_MAKEMIME is not set
745CONFIG_FEATURE_MIME_CHARSET=""
746# CONFIG_POPMAILDIR is not set
747# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
748# CONFIG_REFORMIME is not set
749# CONFIG_FEATURE_REFORMIME_COMPAT is not set
750# CONFIG_SENDMAIL is not set
751# CONFIG_FEATURE_SENDMAIL_MAILX is not set
752# CONFIG_FEATURE_SENDMAIL_MAILXX is not set
662 753
663# 754#
664# Process Utilities 755# Process Utilities
@@ -671,22 +762,56 @@ CONFIG_KILLALL=y
671# CONFIG_NMETER is not set 762# CONFIG_NMETER is not set
672# CONFIG_PGREP is not set 763# CONFIG_PGREP is not set
673CONFIG_PIDOF=y 764CONFIG_PIDOF=y
674# CONFIG_FEATURE_PIDOF_SINGLE is not set 765CONFIG_FEATURE_PIDOF_SINGLE=y
675# CONFIG_FEATURE_PIDOF_OMIT is not set 766CONFIG_FEATURE_PIDOF_OMIT=y
676# CONFIG_PKILL is not set 767# CONFIG_PKILL is not set
677CONFIG_PS=y 768CONFIG_PS=y
678CONFIG_FEATURE_PS_WIDE=y 769CONFIG_FEATURE_PS_WIDE=y
770# CONFIG_FEATURE_PS_TIME is not set
771# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
679CONFIG_RENICE=y 772CONFIG_RENICE=y
680CONFIG_BB_SYSCTL=y 773CONFIG_BB_SYSCTL=y
681CONFIG_TOP=y 774CONFIG_TOP=y
682CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y 775CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
683CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y 776CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
777# CONFIG_FEATURE_TOP_SMP_CPU is not set
684# CONFIG_FEATURE_TOP_DECIMALS is not set 778# CONFIG_FEATURE_TOP_DECIMALS is not set
779# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
685# CONFIG_FEATURE_TOPMEM is not set 780# CONFIG_FEATURE_TOPMEM is not set
686CONFIG_UPTIME=y 781CONFIG_UPTIME=y
687CONFIG_WATCH=y 782CONFIG_WATCH=y
688 783
689# 784#
785# Runit Utilities
786#
787# CONFIG_RUNSV is not set
788# CONFIG_RUNSVDIR is not set
789# CONFIG_FEATURE_RUNSVDIR_LOG is not set
790# CONFIG_SV is not set
791CONFIG_SV_DEFAULT_SERVICE_DIR=""
792# CONFIG_SVLOGD is not set
793# CONFIG_CHPST is not set
794# CONFIG_SETUIDGID is not set
795# CONFIG_ENVUIDGID is not set
796# CONFIG_ENVDIR is not set
797# CONFIG_SOFTLIMIT is not set
798# CONFIG_CHCON is not set
799# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
800# CONFIG_GETENFORCE is not set
801# CONFIG_GETSEBOOL is not set
802# CONFIG_LOAD_POLICY is not set
803# CONFIG_MATCHPATHCON is not set
804# CONFIG_RESTORECON is not set
805# CONFIG_RUNCON is not set
806# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
807# CONFIG_SELINUXENABLED is not set
808# CONFIG_SETENFORCE is not set
809# CONFIG_SETFILES is not set
810# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
811# CONFIG_SETSEBOOL is not set
812# CONFIG_SESTATUS is not set
813
814#
690# Shells 815# Shells
691# 816#
692CONFIG_FEATURE_SH_IS_ASH=y 817CONFIG_FEATURE_SH_IS_ASH=y
@@ -698,6 +823,7 @@ CONFIG_ASH=y
698# 823#
699# Ash Shell Options 824# Ash Shell Options
700# 825#
826CONFIG_ASH_BASH_COMPAT=y
701CONFIG_ASH_JOB_CONTROL=y 827CONFIG_ASH_JOB_CONTROL=y
702CONFIG_ASH_READ_NCHARS=y 828CONFIG_ASH_READ_NCHARS=y
703CONFIG_ASH_READ_TIMEOUT=y 829CONFIG_ASH_READ_TIMEOUT=y
@@ -706,10 +832,11 @@ CONFIG_ASH_MATH_SUPPORT=y
706# CONFIG_ASH_MATH_SUPPORT_64 is not set 832# CONFIG_ASH_MATH_SUPPORT_64 is not set
707CONFIG_ASH_GETOPTS=y 833CONFIG_ASH_GETOPTS=y
708CONFIG_ASH_BUILTIN_ECHO=y 834CONFIG_ASH_BUILTIN_ECHO=y
835CONFIG_ASH_BUILTIN_PRINTF=y
709CONFIG_ASH_BUILTIN_TEST=y 836CONFIG_ASH_BUILTIN_TEST=y
710# CONFIG_ASH_CMDCMD is not set 837# CONFIG_ASH_CMDCMD is not set
711# CONFIG_ASH_MAIL is not set 838# CONFIG_ASH_MAIL is not set
712CONFIG_ASH_OPTIMIZE_FOR_SIZE=y 839# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
713# CONFIG_ASH_RANDOM_SUPPORT is not set 840# CONFIG_ASH_RANDOM_SUPPORT is not set
714CONFIG_ASH_EXPAND_PRMT=y 841CONFIG_ASH_EXPAND_PRMT=y
715# CONFIG_HUSH is not set 842# CONFIG_HUSH is not set
@@ -719,6 +846,7 @@ CONFIG_ASH_EXPAND_PRMT=y
719# CONFIG_HUSH_TICK is not set 846# CONFIG_HUSH_TICK is not set
720# CONFIG_HUSH_IF is not set 847# CONFIG_HUSH_IF is not set
721# CONFIG_HUSH_LOOPS is not set 848# CONFIG_HUSH_LOOPS is not set
849# CONFIG_HUSH_CASE is not set
722# CONFIG_LASH is not set 850# CONFIG_LASH is not set
723# CONFIG_MSH is not set 851# CONFIG_MSH is not set
724 852
@@ -727,6 +855,7 @@ CONFIG_ASH_EXPAND_PRMT=y
727# 855#
728CONFIG_FEATURE_SH_EXTRA_QUIET=y 856CONFIG_FEATURE_SH_EXTRA_QUIET=y
729# CONFIG_FEATURE_SH_STANDALONE is not set 857# CONFIG_FEATURE_SH_STANDALONE is not set
858# CONFIG_FEATURE_SH_NOFORK is not set
730# CONFIG_CTTYHACK is not set 859# CONFIG_CTTYHACK is not set
731 860
732# 861#
@@ -735,43 +864,10 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y
735CONFIG_SYSLOGD=y 864CONFIG_SYSLOGD=y
736CONFIG_FEATURE_ROTATE_LOGFILE=y 865CONFIG_FEATURE_ROTATE_LOGFILE=y
737CONFIG_FEATURE_REMOTE_LOG=y 866CONFIG_FEATURE_REMOTE_LOG=y
867CONFIG_FEATURE_SYSLOGD_DUP=y
738CONFIG_FEATURE_IPC_SYSLOG=y 868CONFIG_FEATURE_IPC_SYSLOG=y
739CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 869CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
740CONFIG_LOGREAD=y 870CONFIG_LOGREAD=y
741CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y 871CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
742CONFIG_KLOGD=y 872CONFIG_KLOGD=y
743CONFIG_LOGGER=y 873CONFIG_LOGGER=y
744
745#
746# Runit Utilities
747#
748# CONFIG_RUNSV is not set
749# CONFIG_RUNSVDIR is not set
750# CONFIG_SV is not set
751# CONFIG_SVLOGD is not set
752# CONFIG_CHPST is not set
753# CONFIG_SETUIDGID is not set
754# CONFIG_ENVUIDGID is not set
755# CONFIG_ENVDIR is not set
756# CONFIG_SOFTLIMIT is not set
757# CONFIG_CHCON is not set
758# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
759# CONFIG_GETENFORCE is not set
760# CONFIG_GETSEBOOL is not set
761# CONFIG_LOAD_POLICY is not set
762# CONFIG_MATCHPATHCON is not set
763# CONFIG_RESTORECON is not set
764# CONFIG_RUNCON is not set
765# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
766# CONFIG_SELINUXENABLED is not set
767# CONFIG_SETENFORCE is not set
768# CONFIG_SETFILES is not set
769# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
770# CONFIG_SETSEBOOL is not set
771# CONFIG_SESTATUS is not set
772
773#
774# ipsvd utilities
775#
776# CONFIG_TCPSVD is not set
777# CONFIG_UDPSVD is not set
diff --git a/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch b/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch
new file mode 100644
index 0000000000..633153f1ce
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch
@@ -0,0 +1,12 @@
1--- old/libbb/lineedit.c 2008/09/27 01:28:56 23530
2+++ new/libbb/lineedit.c 2008/11/02 00:41:05 23898
3@@ -1412,7 +1412,8 @@
4 if ((state->flags & SAVE_HISTORY) && state->hist_file)
5 load_history(state->hist_file);
6 #endif
7- state->cur_history = state->cnt_history;
8+ if (state->flags & DO_HISTORY)
9+ state->cur_history = state->cnt_history;
10
11 /* prepare before init handlers */
12 cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
diff --git a/meta/packages/busybox/busybox-1.15.3/fix b/meta/packages/busybox/busybox-1.15.3/fix
new file mode 100644
index 0000000000..544f41b256
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/fix
@@ -0,0 +1,31 @@
1---
2 util-linux/mdev.c | 3 ++-
3 1 file changed, 2 insertions(+), 1 deletion(-)
4
5--- busybox-1.13.2.orig/util-linux/mdev.c
6+++ busybox-1.13.2/util-linux/mdev.c
7@@ -107,11 +107,11 @@ static void make_device(char *path, int
8
9 #if ENABLE_FEATURE_MDEV_CONF
10 parser = config_open2("/etc/mdev.conf", fopen_for_read);
11
12 /* If we have config file, look up user settings */
13- while (config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)) {
14+ while (config_read(parser, tokens, 5, 3, "# \t", PARSE_NORMAL)) {
15 regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP];
16 char *val;
17
18 /* Fields: regex uid:gid mode [alias] [cmd] */
19
20@@ -211,10 +211,11 @@ static void make_device(char *path, int
21 }
22 #endif /* ENABLE_FEATURE_MDEV_RENAME */
23
24 #if ENABLE_FEATURE_MDEV_EXEC
25 /* The rest (opt): command to run */
26+ val = tokens[4];
27 if (!val)
28 break;
29 {
30 const char *s = "@$*";
31 const char *s2 = strchr(s, *val);
diff --git a/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch b/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch
new file mode 100644
index 0000000000..0121cd1b61
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch
@@ -0,0 +1,11 @@
1--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100
2+++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100
3@@ -252,6 +252,8 @@
4 file_header->name = concat_path_file(tar.prefix, tar.name);
5 } else
6 file_header->name = xstrdup(tar.name);
7+ if (strlen(file_header->name) > 100)
8+ file_header->name[100] = 0;
9 }
10
11 /* Set bits 12-15 of the files mode */
diff --git a/meta/packages/busybox/busybox-1.15.3/r24785.patch b/meta/packages/busybox/busybox-1.15.3/r24785.patch
new file mode 100644
index 0000000000..e3e80befcd
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/r24785.patch
@@ -0,0 +1,14 @@
1--- busybox/util-linux/mdev.c 2009/01/08 17:19:01 24725
2+++ busybox/util-linux/mdev.c 2009/01/12 07:57:52 24785
3@@ -179,8 +179,9 @@
4 unsigned i, n;
5 #endif
6 char *a = val;
7- s = strchr(val, ' ');
8- val = (s && s[1]) ? s+1 : NULL;
9+ s = strchrnul(val, ' ');
10+ val = (s[0] && s[1]) ? s+1 : NULL;
11+ s[0] = '\0';
12 #if ENABLE_FEATURE_MDEV_RENAME_REGEXP
13 /* substitute %1..9 with off[1..9], if any */
14 n = 0;
diff --git a/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch b/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
new file mode 100644
index 0000000000..6f209ce571
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
@@ -0,0 +1,12 @@
1diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
2--- busybox-1.15.3.orig//include/applets.h 2009-12-12 22:13:28.000000000 +0100
3+++ busybox-1.15.3/include/applets.h 2010-04-30 15:35:40.000000000 +0200
4@@ -323,7 +323,7 @@
5 IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
6 IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
7 IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP))
8-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts))
9+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_USR_BIN, _BB_SUID_DROP, run_parts))
10 IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
11 IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP))
12 IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP))
diff --git a/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch b/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch
new file mode 100644
index 0000000000..3b975b63f9
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch
@@ -0,0 +1,47 @@
1Index: busybox-1.15.1/examples/udhcp/simple.script
2===================================================================
3--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-16 22:52:09.000000000 +0200
4+++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:57:11.424608476 +0200
5@@ -10,10 +10,17 @@ NETMASK=""
6 BROADCAST="broadcast +"
7 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
8
9+# return 0 if root is mounted on a network filesystem
10+root_is_nfs() {
11+ grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts
12+}
13+
14 case "$1" in
15 deconfig)
16+ if ! root_is_nfs ; then
17 echo "Setting IP address 0.0.0.0 on $interface"
18- ifconfig $interface 0.0.0.0
19+ ifconfig $interface 0.0.0.0
20+ fi
21 ;;
22
23 renew|bound)
24@@ -21,15 +28,18 @@ case "$1" in
25 ifconfig $interface $ip $NETMASK $BROADCAST
26
27 if [ -n "$router" ] ; then
28- echo "Deleting routers"
29- while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
30- :
31- done
32+ if ! root_is_nfs ; then
33+ echo "Deleting routers"
34+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
35+ :
36+ done
37+ :
38+ done
39
40 metric=0
41 for i in $router ; do
42 echo "Adding router $i"
43- route add default gw $i dev $interface metric $((metric++))
44+ route add default gw $i dev $interface metric $((metric++)) 2>/dev/null
45 done
46 fi
47
diff --git a/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch b/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch
new file mode 100644
index 0000000000..2ffba956ae
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch
@@ -0,0 +1,13 @@
1Index: busybox-1.15.1/examples/udhcp/simple.script
2===================================================================
3--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-12 17:55:36.000000000 +0200
4+++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:51:06.599693412 +0200
5@@ -22,7 +22,7 @@ case "$1" in
6
7 if [ -n "$router" ] ; then
8 echo "Deleting routers"
9- while route del default gw 0.0.0.0 dev $interface ; do
10+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
11 :
12 done
13
diff --git a/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch b/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch
new file mode 100644
index 0000000000..df64554ffc
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch
@@ -0,0 +1,13 @@
1--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200
2+++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200
3@@ -466,8 +466,8 @@
4 have it at 1 meg). Things will work fine with a large ARG_MAX but it
5 will probably hurt the system more than it needs to; an array of this
6 size is allocated. */
7- if (orig_arg_max > 20 * 1024)
8- orig_arg_max = 20 * 1024;
9+ if (orig_arg_max > 40 * 1024)
10+ orig_arg_max = 40 * 1024;
11 n_max_chars = orig_arg_max;
12 }
13 max_chars = xmalloc(n_max_chars);
diff --git a/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch b/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch
deleted file mode 100644
index f221d30895..0000000000
--- a/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1upstream: http://bugs.busybox.net/view.php?id=2134
2status: accepted in rev. 21031 on Feb 15 2008
3comment: fixes OE bug 3781, applied by mickeyl
4
5diff -Nuar busybox-1.9.1.old/loginutils/Config.in busybox-1.9.1/loginutils/Config.in
6--- busybox-1.9.1.old/loginutils/Config.in Tue Feb 12 10:03:11 2008
7+++ busybox-1.9.1/loginutils/Config.in Thu Feb 14 11:48:31 2008
8@@ -88,6 +88,13 @@
9 help
10 Utility for creating a new user account.
11
12+config FEATURE_ADDUSER_LONG_OPTIONS
13+ bool "Enable long options"
14+ default n
15+ depends on ADDUSER && GETOPT_LONG
16+ help
17+ Support long options for the adduser applet.
18+
19 config DELUSER
20 bool "deluser"
21 default n
22diff -Nuar busybox-1.9.1.old/loginutils/adduser.c busybox-1.9.1/loginutils/adduser.c
23--- busybox-1.9.1.old/loginutils/adduser.c Thu Feb 14 10:25:33 2008
24+++ busybox-1.9.1/loginutils/adduser.c Thu Feb 14 13:32:47 2008
25@@ -66,6 +66,19 @@
26 bb_error_msg_and_die("cannot execute %s, you must set password manually", prog);
27 }
28
29+#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
30+static const char adduser_longopts[] ALIGN1 =
31+ "home\0" Required_argument "h"
32+ "gecos\0" Required_argument "g"
33+ "shell\0" Required_argument "s"
34+ "ingroup\0" Required_argument "G"
35+ "disabled-password\0" No_argument "D"
36+ "empty-password\0" No_argument "D"
37+ "system\0" No_argument "S"
38+ "no-create-home\0" No_argument "H"
39+ ;
40+#endif
41+
42 /*
43 * adduser will take a login_name as its first parameter.
44 * home, shell, gecos:
45@@ -77,6 +90,10 @@
46 struct passwd pw;
47 const char *usegroup = NULL;
48 FILE *file;
49+
50+#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
51+ applet_long_options = adduser_longopts;
52+#endif
53
54 /* got root? */
55 if (geteuid()) {
diff --git a/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh b/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh
deleted file mode 100755
index 9744322fa9..0000000000
--- a/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh
+++ /dev/null
@@ -1,69 +0,0 @@
1#!/bin/sh
2MDEV=/sbin/mdev
3DESC="Busybox mdev setup"
4
5# Complain if thing's aren't right
6if [ ! -e /proc/filesystems ]; then
7 echo "mdev requires a mounted procfs, not started."
8 exit 1
9fi
10
11if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
12 echo "mdev requires tmpfs support, not started."
13 exit 1
14fi
15
16if [ ! -d /sys/class/ ]; then
17 echo "mdev requires a mounted sysfs, not started."
18 exit 1
19fi
20
21if [ ! -e /proc/sys/kernel/hotplug ]; then
22 echo "mdev requires hotplug support, not started."
23 exit 1
24fi
25
26# We need to unmount /dev/pts/ and remount it later over the tmpfs
27if mountpoint -q /dev/pts/; then
28 umount -l /dev/pts/
29fi
30
31if mountpoint -q /dev/shm/; then
32 umount -l /dev/shm/
33fi
34
35# Create tmpfs for /dev
36echo "Creating tmpfs at /dev"
37mount -t tmpfs tmpfs /dev -o size=800k
38
39# Register mdev as hotplug event helper
40echo "$MDEV" > /proc/sys/kernel/hotplug
41
42# Populate /dev from /sys info
43echo "Populating /dev using mdev"
44$MDEV -s
45
46# Touch .udev to inform scripts that /dev needs no further setup
47touch /dev/.udev
48
49# Mount devpts
50TTYGRP=5
51TTYMODE=620
52mkdir -m 755 -p /dev/pts
53if [ ! -e /dev/ptmx ]; then
54 mknod -m 666 /dev/ptmx c 5 2
55fi
56mount -t devpts devpts /dev/pts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
57
58# Make shm directory
59mkdir -m 755 -p /dev/shm
60
61# Make extraneous links
62ln -sf /proc/self/fd /dev/fd
63ln -sf /proc/self/fd/0 /dev/stdin
64ln -sf /proc/self/fd/1 /dev/stdout
65ln -sf /proc/self/fd/2 /dev/stderr
66ln -sf /proc/kcore /dev/core
67ln -sf /proc/asound/oss/sndstat /dev/sndstat
68
69exit 0
diff --git a/meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch b/meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch
deleted file mode 100644
index 55452a4524..0000000000
--- a/meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1Summary: 0001591: inconsistent behavior of sort -z
2
3URL: http://busybox.net/bugs/view.php?id=1591
4http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u
5
6Description:
7
8busybox sort -z does:
9use NUL instead of EOL on input
10
11GNU sort -z does:
12use NUL instead of EOL on input and output
13
14GNU sort -z documents:
15use NUL instead of EOL on input
16
17Additional Information:
18
19Note that sort -z is not part of any standard. But several applications
20(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior.
21
22GNU sort documentation bug was reported to coreutils maintainers.
23
24Notes:
25
26vda 02-13-08 06:30 (0004364)
27Fixed in revision 21004. Thanks!
28
29--- busybox/coreutils/sort.c 2007/11/16 12:39:16 20435
30+++ busybox/coreutils/sort.c 2008/02/13 14:30:33 21004
31@@ -32,7 +32,7 @@
32 FLAG_u = 8, /* Unique */
33 FLAG_c = 0x10, /* Check: no output, exit(!ordered) */
34 FLAG_s = 0x20, /* Stable sort, no ascii fallback at end */
35- FLAG_z = 0x40, /* Input is null terminated, not \n */
36+ FLAG_z = 0x40, /* Input and output is NUL terminated, not \n */
37 /* These can be applied to search keys, the previous four can't */
38 FLAG_b = 0x80, /* Ignore leading blanks */
39 FLAG_r = 0x100, /* Reverse */
40@@ -396,8 +396,9 @@
41 if (linecount) linecount = flag+1;
42 }
43 /* Print it */
44+ flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
45 for (i = 0; i < linecount; i++)
46- fprintf(outfile, "%s\n", lines[i]);
47+ fprintf(outfile, "%s%c", lines[i], flag);
48
49 fflush_stdout_and_exit(EXIT_SUCCESS);
50 }
diff --git a/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch b/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch
deleted file mode 100644
index d00755fa3a..0000000000
--- a/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6Index: busybox-1.9.1/examples/udhcp/simple.script
7===================================================================
8--- busybox-1.9.1.orig/examples/udhcp/simple.script 2008-02-12 16:03:13.000000000 +0000
9+++ busybox-1.9.1/examples/udhcp/simple.script 2009-05-27 22:54:42.000000000 +0100
10@@ -17,14 +17,13 @@
11 /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
12
13 if [ -n "$router" ] ; then
14- echo "deleting routers"
15- while route del default gw 0.0.0.0 dev $interface ; do
16+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
17 :
18 done
19
20 metric=0
21 for i in $router ; do
22- route add default gw $i dev $interface metric $((metric++))
23+ /sbin/route add default gw $i dev $interface metric $((metric++))
24 done
25 fi
26
diff --git a/meta/packages/busybox/busybox.inc b/meta/packages/busybox/busybox.inc
index 1419251b3d..93711cef00 100644
--- a/meta/packages/busybox/busybox.inc
+++ b/meta/packages/busybox/busybox.inc
@@ -31,6 +31,11 @@ INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
31 31
32inherit cml1 update-rc.d 32inherit cml1 update-rc.d
33 33
34do_configure () {
35 install -m 0644 ${WORKDIR}/defconfig ${S}/.config
36 cml1_do_configure
37}
38
34do_compile() { 39do_compile() {
35 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 40 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
36 base_do_compile 41 base_do_compile
diff --git a/meta/packages/busybox/busybox_1.15.3.bb b/meta/packages/busybox/busybox_1.15.3.bb
new file mode 100644
index 0000000000..25c2983e1e
--- /dev/null
+++ b/meta/packages/busybox/busybox_1.15.3.bb
@@ -0,0 +1,37 @@
1require busybox.inc
2PR = "1"
3
4SRC_URI = "\
5 http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
6 file://udhcpscript.patch;patch=1 \
7 file://udhcpc-fix-nfsroot.patch;patch=1 \
8 file://B921600.patch;patch=1 \
9 file://get_header_tar.patch;patch=1 \
10 file://busybox-appletlib-dependency.patch;patch=1 \
11 file://0000-wget-no-check-certificate.patch;patch=1 \
12 file://run-parts.in.usr-bin.patch;patch=1 \
13 file://find-touchscreen.sh \
14 file://busybox-cron \
15 file://busybox-httpd \
16 file://busybox-udhcpd \
17 file://default.script file://simple.script \
18 file://hwclock.sh \
19 file://mount.busybox \
20 file://mountall \
21 file://syslog \
22 file://syslog.conf \
23 file://umount.busybox \
24 file://defconfig \
25 file://mdev \
26 file://mdev.conf \
27"
28
29EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
30
31do_install_append() {
32 install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/
33 install -d ${D}${sysconfdir}/init.d/
34 install -d ${D}${sysconfdir}/mdev
35 install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/
36 install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/
37}
diff --git a/meta/packages/busybox/busybox_1.9.1.bb b/meta/packages/busybox/busybox_1.9.1.bb
deleted file mode 100644
index 26b73530f5..0000000000
--- a/meta/packages/busybox/busybox_1.9.1.bb
+++ /dev/null
@@ -1,30 +0,0 @@
1require busybox.inc
2PR = "r10"
3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
5 http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
6 file://udhcpscript.patch;patch=1 \
7 file://adduser-longops.patch;patch=1 \
8 file://sort-z-nul.patch;patch=1;status=upstream \
9 file://busybox-cron \
10 file://busybox-httpd \
11 file://busybox-udhcpd \
12 file://default.script \
13 file://hwclock.sh \
14 file://mount.busybox \
15 file://syslog \
16 file://syslog.conf \
17 file://umount.busybox \
18 file://defconfig"
19
20EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
21
22do_configure () {
23 install -m 0644 ${WORKDIR}/defconfig ${S}/.config
24 cml1_do_configure
25}
26
27#
28# libbb/appletlib.c:38:27: error: applet_tables.h: No such file or directory
29#
30PARALLEL_MAKE = ""
diff --git a/meta/packages/busybox/files/busybox-appletlib-dependency.patch b/meta/packages/busybox/files/busybox-appletlib-dependency.patch
new file mode 100644
index 0000000000..3efd4c0882
--- /dev/null
+++ b/meta/packages/busybox/files/busybox-appletlib-dependency.patch
@@ -0,0 +1,15 @@
1Index: busybox-1.13.2/Makefile
2===================================================================
3--- busybox-1.13.2.orig/Makefile 2009-03-19 15:44:37.419270265 +0300
4+++ busybox-1.13.2/Makefile 2009-03-19 15:45:57.737521296 +0300
5@@ -471,6 +471,10 @@
6 util-linux/ \
7 util-linux/volume_id/ \
8
9+# Lib interdeps
10+# libbb uses headers generated in applets
11+libbb: applets
12+
13 endif # KBUILD_EXTMOD
14
15 ifeq ($(dot-config),1)
diff --git a/meta/packages/busybox/files/find-touchscreen.sh b/meta/packages/busybox/files/find-touchscreen.sh
new file mode 100644
index 0000000000..1582ea891c
--- /dev/null
+++ b/meta/packages/busybox/files/find-touchscreen.sh
@@ -0,0 +1,9 @@
1#!/bin/sh
2
3if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
4 ln -sf /dev/input/$MDEV /dev/input/touchscreen0
5fi
6
7if [ `egrep "ads7846" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
8 ln -sf /dev/input/$MDEV /dev/input/touchscreen0
9fi
diff --git a/meta/packages/busybox/files/mdev b/meta/packages/busybox/files/mdev
new file mode 100755
index 0000000000..4eed51e94c
--- /dev/null
+++ b/meta/packages/busybox/files/mdev
@@ -0,0 +1,11 @@
1#!/bin/sh
2
3mount -t tmpfs tmpfs /dev -o size=64k,mode=0755
4
5mkdir /dev/pts /dev/shm
6
7mount -t devpts devpts /dev/pts
8
9echo "/sbin/mdev" >/proc/sys/kernel/hotplug
10
11mdev -s
diff --git a/meta/packages/busybox/files/mdev.conf b/meta/packages/busybox/files/mdev.conf
new file mode 100644
index 0000000000..163ebfe45d
--- /dev/null
+++ b/meta/packages/busybox/files/mdev.conf
@@ -0,0 +1,33 @@
1console 0:0 0600
2cpu_dma_latency 0:0 0660
3fb0:0 44 0660
4full 0:0 0666
5initctl 0:0 0600
6ircomm[0-9].* 0:20 0660
7kmem 0:15 0640
8kmsg 0:0 0660
9log 0:0 0666
10loop[0-9].* 0:6 0640
11mem 0:15 0640
12network_latency 0:0 0660
13network_throughput 0:0 0660
14null 0:0 0666
15port 0:15 0640
16ptmx 0:5 0666
17ram[0-9].* 0:6 0640
18random 0:0 0666
19sda 0:6 0640
20tty 0:5 0666
21tty.* 0:0 0620
22urandom 0:0 0666
23usbdev.* 0:0 0660
24vcs.* 0:5 0660
25zero 0:0 0666
26
27pcm.* 0:0 0660 =snd/
28control.* 0:0 0660 =snd/
29timer 0:0 0660 =snd/
30
31event.* 0:0 0660 =input/ @/etc/mdev/find-touchscreen.sh
32mice 0:0 0660 =input/
33mouse.* 0:0 0660 =input/
diff --git a/meta/packages/busybox/files/mountall b/meta/packages/busybox/files/mountall
new file mode 100644
index 0000000000..d5408b8f8d
--- /dev/null
+++ b/meta/packages/busybox/files/mountall
@@ -0,0 +1 @@
MOUNTALL="-t nonfs,nosmbfs,noncpfs"
diff --git a/meta/packages/busybox/files/simple.script b/meta/packages/busybox/files/simple.script
new file mode 100644
index 0000000000..5cc21b9de2
--- /dev/null
+++ b/meta/packages/busybox/files/simple.script
@@ -0,0 +1,72 @@
1#!/bin/sh
2
3# udhcpc script edited by Tim Riker <Tim@Rikers.org>
4
5[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
6
7RESOLV_CONF="/etc/resolv.conf"
8[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
9[ -n "$subnet" ] && NETMASK="netmask $subnet"
10
11# return 0 if root is mounted on a network filesystem
12root_is_nfs() {
13 grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts
14}
15
16have_bin_ip=0
17if [ -x /bin/ip ]; then
18 have_bin_ip=1
19fi
20
21case "$1" in
22 deconfig)
23 if ! root_is_nfs ; then
24 if [ $have_bin_ip -eq 1 ]; then
25 ip addr flush dev $interface
26 ip link set dev $interface up
27 else
28 /sbin/ifconfig $interface 0.0.0.0
29 fi
30 fi
31 ;;
32
33 renew|bound)
34 if [ $have_bin_ip -eq 1 ]; then
35 ip addr add dev $interface local $ip/$mask $BROADCAST
36 else
37 /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
38 fi
39
40 if [ -n "$router" ] ; then
41 if ! root_is_nfs ; then
42 if [ $have_bin_ip -eq 1 ]; then
43 while ip route del default 2>/dev/null ; do
44 :
45 done
46 else
47 while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
48 :
49 done
50 fi
51 fi
52
53 metric=0
54 for i in $router ; do
55 if [ $have_bin_ip -eq 1 ]; then
56 ip route add default via $i metric $((metric++))
57 else
58 route add default gw $i dev $interface metric $((metric++)) 2>/dev/null
59 fi
60 done
61 fi
62
63 echo -n > $RESOLV_CONF
64 [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
65 for i in $dns ; do
66 echo adding dns $i
67 echo nameserver $i >> $RESOLV_CONF
68 done
69 ;;
70esac
71
72exit 0
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 09:52:39 +0000