summaryrefslogtreecommitdiffstats
path: root/meta/packages/busybox
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-03 17:51:29 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-03 17:51:29 +0000
commit198a63fac56201ee520d94bf8345036e4927fce6 (patch)
treecf8acd5a45d75baa7b3e5828f47787aec287cb65 /meta/packages/busybox
parent6314103003cef434c29d2133769195daf5cc9309 (diff)
downloadpoky-198a63fac56201ee520d94bf8345036e4927fce6.tar.gz
busybox: update from 1.8.2 to 1.9.1 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3889 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/busybox')
-rw-r--r--meta/packages/busybox/busybox-1.9.1/adduser-longops.patch55
-rwxr-xr-xmeta/packages/busybox/busybox-1.9.1/busybox-mdev.sh (renamed from meta/packages/busybox/busybox-1.8.2/busybox-mdev.sh)0
-rw-r--r--meta/packages/busybox/busybox-1.9.1/defconfig (renamed from meta/packages/busybox/busybox-1.8.2/defconfig)46
-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.patch (renamed from meta/packages/busybox/busybox-1.8.2/udhcpscript.patch)0
-rw-r--r--meta/packages/busybox/busybox.inc127
-rw-r--r--meta/packages/busybox/busybox_1.8.2.bb111
-rw-r--r--meta/packages/busybox/busybox_1.9.1.bb25
8 files changed, 276 insertions, 138 deletions
diff --git a/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch b/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch
new file mode 100644
index 0000000000..f221d30895
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch
@@ -0,0 +1,55 @@
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.8.2/busybox-mdev.sh b/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh
index 9744322fa9..9744322fa9 100755
--- a/meta/packages/busybox/busybox-1.8.2/busybox-mdev.sh
+++ b/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh
diff --git a/meta/packages/busybox/busybox-1.8.2/defconfig b/meta/packages/busybox/busybox-1.9.1/defconfig
index 19cfafab2c..770ef6eb12 100644
--- a/meta/packages/busybox/busybox-1.8.2/defconfig
+++ b/meta/packages/busybox/busybox-1.9.1/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.7.2 3# Busybox version: 1.9.1
4# Fri Oct 12 19:00:27 2007 4# Thu Feb 14 11:54:00 2008
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -40,10 +40,9 @@ CONFIG_FEATURE_HAVE_RPC=y
40# 40#
41# CONFIG_STATIC is not set 41# CONFIG_STATIC is not set
42# CONFIG_BUILD_LIBBUSYBOX is not set 42# CONFIG_BUILD_LIBBUSYBOX is not set
43# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set 43# CONFIG_FEATURE_INDIVIDUAL is not set
44# CONFIG_FEATURE_SHARED_BUSYBOX is not set 44# CONFIG_FEATURE_SHARED_BUSYBOX is not set
45CONFIG_LFS=y 45CONFIG_LFS=y
46CONFIG_BUILD_AT_ONCE=y
47 46
48# 47#
49# Debugging Options 48# Debugging Options
@@ -61,7 +60,11 @@ CONFIG_NO_DEBUG_LIB=y
61# CONFIG_INSTALL_NO_USR is not set 60# CONFIG_INSTALL_NO_USR is not set
62CONFIG_INSTALL_APPLET_SYMLINKS=y 61CONFIG_INSTALL_APPLET_SYMLINKS=y
63# CONFIG_INSTALL_APPLET_HARDLINKS is not set 62# CONFIG_INSTALL_APPLET_HARDLINKS is not set
63# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
64# CONFIG_INSTALL_APPLET_DONT is not set 64# CONFIG_INSTALL_APPLET_DONT is not set
65# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
66# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
67# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
65CONFIG_PREFIX="./_install" 68CONFIG_PREFIX="./_install"
66 69
67# 70#
@@ -73,13 +76,14 @@ CONFIG_FEATURE_FAST_TOP=y
73# CONFIG_FEATURE_ETC_NETWORKS is not set 76# CONFIG_FEATURE_ETC_NETWORKS is not set
74CONFIG_FEATURE_EDITING=y 77CONFIG_FEATURE_EDITING=y
75CONFIG_FEATURE_EDITING_MAX_LEN=1024 78CONFIG_FEATURE_EDITING_MAX_LEN=1024
76# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set 79CONFIG_FEATURE_EDITING_FANCY_KEYS=y
77# CONFIG_FEATURE_EDITING_VI is not set 80# CONFIG_FEATURE_EDITING_VI is not set
78CONFIG_FEATURE_EDITING_HISTORY=15 81CONFIG_FEATURE_EDITING_HISTORY=15
79CONFIG_FEATURE_EDITING_SAVEHISTORY=y 82CONFIG_FEATURE_EDITING_SAVEHISTORY=y
80CONFIG_FEATURE_TAB_COMPLETION=y 83CONFIG_FEATURE_TAB_COMPLETION=y
81CONFIG_FEATURE_USERNAME_COMPLETION=y 84CONFIG_FEATURE_USERNAME_COMPLETION=y
82CONFIG_FEATURE_EDITING_FANCY_PROMPT=y 85CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
86CONFIG_FEATURE_COPYBUF_KB=4
83CONFIG_MONOTONIC_SYSCALL=y 87CONFIG_MONOTONIC_SYSCALL=y
84CONFIG_IOCTL_HEX2STR_ERROR=y 88CONFIG_IOCTL_HEX2STR_ERROR=y
85 89
@@ -93,6 +97,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
93CONFIG_AR=y 97CONFIG_AR=y
94# CONFIG_FEATURE_AR_LONG_FILENAMES is not set 98# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
95CONFIG_BUNZIP2=y 99CONFIG_BUNZIP2=y
100# CONFIG_BZIP2 is not set
96CONFIG_CPIO=y 101CONFIG_CPIO=y
97# CONFIG_DPKG is not set 102# CONFIG_DPKG is not set
98# CONFIG_DPKG_DEB is not set 103# CONFIG_DPKG_DEB is not set
@@ -148,6 +153,7 @@ CONFIG_DD=y
148CONFIG_FEATURE_DD_SIGNAL_HANDLING=y 153CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
149# CONFIG_FEATURE_DD_IBS_OBS is not set 154# CONFIG_FEATURE_DD_IBS_OBS is not set
150CONFIG_DF=y 155CONFIG_DF=y
156# CONFIG_FEATURE_DF_INODE is not set
151CONFIG_DIRNAME=y 157CONFIG_DIRNAME=y
152# CONFIG_DOS2UNIX is not set 158# CONFIG_DOS2UNIX is not set
153# CONFIG_UNIX2DOS is not set 159# CONFIG_UNIX2DOS is not set
@@ -264,6 +270,7 @@ CONFIG_CHVT=y
264CONFIG_CLEAR=y 270CONFIG_CLEAR=y
265CONFIG_DEALLOCVT=y 271CONFIG_DEALLOCVT=y
266CONFIG_DUMPKMAP=y 272CONFIG_DUMPKMAP=y
273# CONFIG_KBD_MODE is not set
267CONFIG_LOADFONT=y 274CONFIG_LOADFONT=y
268CONFIG_LOADKMAP=y 275CONFIG_LOADKMAP=y
269CONFIG_OPENVT=y 276CONFIG_OPENVT=y
@@ -281,7 +288,7 @@ CONFIG_SETCONSOLE=y
281CONFIG_MKTEMP=y 288CONFIG_MKTEMP=y
282# CONFIG_PIPE_PROGRESS is not set 289# CONFIG_PIPE_PROGRESS is not set
283CONFIG_RUN_PARTS=y 290CONFIG_RUN_PARTS=y
284# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set 291CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
285# CONFIG_FEATURE_RUN_PARTS_FANCY is not set 292# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
286CONFIG_START_STOP_DAEMON=y 293CONFIG_START_STOP_DAEMON=y
287CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y 294CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
@@ -293,7 +300,7 @@ CONFIG_WHICH=y
293# 300#
294CONFIG_AWK=y 301CONFIG_AWK=y
295CONFIG_FEATURE_AWK_MATH=y 302CONFIG_FEATURE_AWK_MATH=y
296# CONFIG_CMP is not set 303CONFIG_CMP=y
297CONFIG_DIFF=y 304CONFIG_DIFF=y
298CONFIG_FEATURE_DIFF_BINARY=y 305CONFIG_FEATURE_DIFF_BINARY=y
299CONFIG_FEATURE_DIFF_DIR=y 306CONFIG_FEATURE_DIFF_DIR=y
@@ -303,6 +310,7 @@ CONFIG_PATCH=y
303CONFIG_SED=y 310CONFIG_SED=y
304CONFIG_VI=y 311CONFIG_VI=y
305CONFIG_FEATURE_VI_MAX_LEN=1024 312CONFIG_FEATURE_VI_MAX_LEN=1024
313CONFIG_FEATURE_VI_8BIT=y
306CONFIG_FEATURE_VI_COLON=y 314CONFIG_FEATURE_VI_COLON=y
307CONFIG_FEATURE_VI_YANKMARK=y 315CONFIG_FEATURE_VI_YANKMARK=y
308CONFIG_FEATURE_VI_SEARCH=y 316CONFIG_FEATURE_VI_SEARCH=y
@@ -375,9 +383,10 @@ CONFIG_XARGS=y
375# CONFIG_DELGROUP is not set 383# CONFIG_DELGROUP is not set
376# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set 384# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
377# CONFIG_ADDUSER is not set 385# CONFIG_ADDUSER is not set
386# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
378# CONFIG_DELUSER is not set 387# CONFIG_DELUSER is not set
379# CONFIG_GETTY is not set 388# CONFIG_GETTY is not set
380CONFIG_FEATURE_UTMP=y 389# CONFIG_FEATURE_UTMP is not set
381# CONFIG_FEATURE_WTMP is not set 390# CONFIG_FEATURE_WTMP is not set
382# CONFIG_LOGIN is not set 391# CONFIG_LOGIN is not set
383# CONFIG_PAM is not set 392# CONFIG_PAM is not set
@@ -453,6 +462,8 @@ CONFIG_MKFS_MINIX=y
453CONFIG_FEATURE_MINIX2=y 462CONFIG_FEATURE_MINIX2=y
454# CONFIG_GETOPT is not set 463# CONFIG_GETOPT is not set
455CONFIG_HEXDUMP=y 464CONFIG_HEXDUMP=y
465# CONFIG_HD is not set
466# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
456CONFIG_HWCLOCK=y 467CONFIG_HWCLOCK=y
457CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y 468CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
458CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y 469CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
@@ -468,6 +479,7 @@ CONFIG_MKSWAP=y
468CONFIG_MORE=y 479CONFIG_MORE=y
469CONFIG_FEATURE_USE_TERMIOS=y 480CONFIG_FEATURE_USE_TERMIOS=y
470CONFIG_MOUNT=y 481CONFIG_MOUNT=y
482# CONFIG_FEATURE_MOUNT_HELPERS is not set
471CONFIG_FEATURE_MOUNT_NFS=y 483CONFIG_FEATURE_MOUNT_NFS=y
472# CONFIG_FEATURE_MOUNT_CIFS is not set 484# CONFIG_FEATURE_MOUNT_CIFS is not set
473CONFIG_FEATURE_MOUNT_FLAGS=y 485CONFIG_FEATURE_MOUNT_FLAGS=y
@@ -522,6 +534,7 @@ CONFIG_FEATURE_LESS_FLAGS=y
522# CONFIG_MAKEDEVS is not set 534# CONFIG_MAKEDEVS is not set
523# CONFIG_FEATURE_MAKEDEVS_LEAF is not set 535# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
524# CONFIG_FEATURE_MAKEDEVS_TABLE is not set 536# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
537# CONFIG_MICROCOM is not set
525# CONFIG_MOUNTPOINT is not set 538# CONFIG_MOUNTPOINT is not set
526# CONFIG_MT is not set 539# CONFIG_MT is not set
527# CONFIG_RAIDAUTORUN is not set 540# CONFIG_RAIDAUTORUN is not set
@@ -540,6 +553,7 @@ CONFIG_TIME=y
540# Networking Utilities 553# Networking Utilities
541# 554#
542CONFIG_FEATURE_IPV6=y 555CONFIG_FEATURE_IPV6=y
556CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
543# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set 557# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
544# CONFIG_ARP is not set 558# CONFIG_ARP is not set
545# CONFIG_ARPING is not set 559# CONFIG_ARPING is not set
@@ -551,6 +565,7 @@ CONFIG_FEATURE_IPV6=y
551# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set 565# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
552CONFIG_HOSTNAME=y 566CONFIG_HOSTNAME=y
553# CONFIG_HTTPD is not set 567# CONFIG_HTTPD is not set
568# CONFIG_FEATURE_HTTPD_RANGES is not set
554# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set 569# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
555# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set 570# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
556# CONFIG_FEATURE_HTTPD_SETUID is not set 571# CONFIG_FEATURE_HTTPD_SETUID is not set
@@ -562,6 +577,7 @@ CONFIG_HOSTNAME=y
562# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set 577# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
563# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set 578# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
564# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set 579# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
580# CONFIG_FEATURE_HTTPD_PROXY is not set
565CONFIG_IFCONFIG=y 581CONFIG_IFCONFIG=y
566CONFIG_FEATURE_IFCONFIG_STATUS=y 582CONFIG_FEATURE_IFCONFIG_STATUS=y
567# CONFIG_FEATURE_IFCONFIG_SLIP is not set 583# CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -591,6 +607,7 @@ CONFIG_FEATURE_IP_ROUTE=y
591CONFIG_FEATURE_IP_TUNNEL=y 607CONFIG_FEATURE_IP_TUNNEL=y
592# CONFIG_FEATURE_IP_RULE is not set 608# CONFIG_FEATURE_IP_RULE is not set
593# CONFIG_FEATURE_IP_SHORT_FORMS is not set 609# CONFIG_FEATURE_IP_SHORT_FORMS is not set
610# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
594# CONFIG_IPADDR is not set 611# CONFIG_IPADDR is not set
595# CONFIG_IPLINK is not set 612# CONFIG_IPLINK is not set
596# CONFIG_IPROUTE is not set 613# CONFIG_IPROUTE is not set
@@ -600,6 +617,7 @@ CONFIG_FEATURE_IP_TUNNEL=y
600# CONFIG_FEATURE_IPCALC_FANCY is not set 617# CONFIG_FEATURE_IPCALC_FANCY is not set
601# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set 618# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
602# CONFIG_NAMEIF is not set 619# CONFIG_NAMEIF is not set
620# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
603CONFIG_NC=y 621CONFIG_NC=y
604# CONFIG_NC_SERVER is not set 622# CONFIG_NC_SERVER is not set
605# CONFIG_NC_EXTRA is not set 623# CONFIG_NC_EXTRA is not set
@@ -631,8 +649,10 @@ CONFIG_APP_UDHCPD=y
631CONFIG_APP_DUMPLEASES=y 649CONFIG_APP_DUMPLEASES=y
632# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set 650# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
633CONFIG_APP_UDHCPC=y 651CONFIG_APP_UDHCPC=y
652CONFIG_FEATURE_UDHCPC_ARPING=y
634# CONFIG_FEATURE_UDHCP_DEBUG is not set 653# CONFIG_FEATURE_UDHCP_DEBUG is not set
635# CONFIG_FEATURE_RFC3397 is not set 654# CONFIG_FEATURE_RFC3397 is not set
655CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
636# CONFIG_VCONFIG is not set 656# CONFIG_VCONFIG is not set
637CONFIG_WGET=y 657CONFIG_WGET=y
638CONFIG_FEATURE_WGET_STATUSBAR=y 658CONFIG_FEATURE_WGET_STATUSBAR=y
@@ -649,9 +669,11 @@ CONFIG_KILL=y
649CONFIG_KILLALL=y 669CONFIG_KILLALL=y
650# CONFIG_KILLALL5 is not set 670# CONFIG_KILLALL5 is not set
651# CONFIG_NMETER is not set 671# CONFIG_NMETER is not set
672# CONFIG_PGREP is not set
652CONFIG_PIDOF=y 673CONFIG_PIDOF=y
653# CONFIG_FEATURE_PIDOF_SINGLE is not set 674# CONFIG_FEATURE_PIDOF_SINGLE is not set
654# CONFIG_FEATURE_PIDOF_OMIT is not set 675# CONFIG_FEATURE_PIDOF_OMIT is not set
676# CONFIG_PKILL is not set
655CONFIG_PS=y 677CONFIG_PS=y
656CONFIG_FEATURE_PS_WIDE=y 678CONFIG_FEATURE_PS_WIDE=y
657CONFIG_RENICE=y 679CONFIG_RENICE=y
@@ -660,6 +682,7 @@ CONFIG_TOP=y
660CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y 682CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
661CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y 683CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
662# CONFIG_FEATURE_TOP_DECIMALS is not set 684# CONFIG_FEATURE_TOP_DECIMALS is not set
685# CONFIG_FEATURE_TOPMEM is not set
663CONFIG_UPTIME=y 686CONFIG_UPTIME=y
664CONFIG_WATCH=y 687CONFIG_WATCH=y
665 688
@@ -668,7 +691,6 @@ CONFIG_WATCH=y
668# 691#
669CONFIG_FEATURE_SH_IS_ASH=y 692CONFIG_FEATURE_SH_IS_ASH=y
670# CONFIG_FEATURE_SH_IS_HUSH is not set 693# CONFIG_FEATURE_SH_IS_HUSH is not set
671# CONFIG_FEATURE_SH_IS_LASH is not set
672# CONFIG_FEATURE_SH_IS_MSH is not set 694# CONFIG_FEATURE_SH_IS_MSH is not set
673# CONFIG_FEATURE_SH_IS_NONE is not set 695# CONFIG_FEATURE_SH_IS_NONE is not set
674CONFIG_ASH=y 696CONFIG_ASH=y
@@ -677,8 +699,8 @@ CONFIG_ASH=y
677# Ash Shell Options 699# Ash Shell Options
678# 700#
679CONFIG_ASH_JOB_CONTROL=y 701CONFIG_ASH_JOB_CONTROL=y
680# CONFIG_ASH_READ_NCHARS is not set 702CONFIG_ASH_READ_NCHARS=y
681# CONFIG_ASH_READ_TIMEOUT is not set 703CONFIG_ASH_READ_TIMEOUT=y
682CONFIG_ASH_ALIAS=y 704CONFIG_ASH_ALIAS=y
683CONFIG_ASH_MATH_SUPPORT=y 705CONFIG_ASH_MATH_SUPPORT=y
684# CONFIG_ASH_MATH_SUPPORT_64 is not set 706# CONFIG_ASH_MATH_SUPPORT_64 is not set
@@ -745,6 +767,8 @@ CONFIG_LOGGER=y
745# CONFIG_SETENFORCE is not set 767# CONFIG_SETENFORCE is not set
746# CONFIG_SETFILES is not set 768# CONFIG_SETFILES is not set
747# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set 769# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
770# CONFIG_SETSEBOOL is not set
771# CONFIG_SESTATUS is not set
748 772
749# 773#
750# ipsvd utilities 774# ipsvd utilities
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
new file mode 100644
index 0000000000..55452a4524
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch
@@ -0,0 +1,50 @@
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.8.2/udhcpscript.patch b/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch
index fc21d440cd..fc21d440cd 100644
--- a/meta/packages/busybox/busybox-1.8.2/udhcpscript.patch
+++ b/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch
diff --git a/meta/packages/busybox/busybox.inc b/meta/packages/busybox/busybox.inc
index ab17d96db4..0fb3b5efff 100644
--- a/meta/packages/busybox/busybox.inc
+++ b/meta/packages/busybox/busybox.inc
@@ -11,19 +11,21 @@ LICENSE = "GPL"
11SECTION = "base" 11SECTION = "base"
12PRIORITY = "required" 12PRIORITY = "required"
13 13
14SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ 14SRC_URI = "\
15 file://busybox-cron \ 15 http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
16 file://busybox-httpd \ 16 file://busybox-cron \
17 file://busybox-udhcpd \ 17 file://busybox-httpd \
18 file://default.script \ 18 file://busybox-udhcpd \
19 file://dhcp-hostname.patch;patch=1 \ 19 file://default.script \
20 file://hwclock.sh \ 20 file://dhcp-hostname.patch;patch=1 \
21 file://ifupdown-spurious-environ.patch;patch=1 \ 21 file://hwclock.sh \
22 file://mount.busybox \ 22 file://ifupdown-spurious-environ.patch;patch=1 \
23 file://syslog \ 23 file://mount.busybox \
24 file://syslog.conf \ 24 file://syslog \
25 file://udhcpscript.patch;patch=1 \ 25 file://syslog.conf \
26 file://umount.busybox" 26 file://udhcpscript.patch;patch=1 \
27 file://umount.busybox \
28"
27 29
28SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" 30SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
29 31
@@ -34,7 +36,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
34FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" 36FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
35FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" 37FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
36 38
37FILES_${PN} += " ${datadir}/udhcpc" 39FILES_${PN} += "${datadir}/udhcpc"
38 40
39INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd" 41INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
40INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" 42INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
@@ -47,11 +49,73 @@ INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
47 49
48inherit cml1 update-rc.d 50inherit cml1 update-rc.d
49 51
50do_compile () { 52do_compile() {
51 unset CFLAGS 53 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
52 base_do_compile 54 base_do_compile
53} 55}
54 56
57do_install () {
58 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
59 install -d ${D}${sysconfdir}/init.d
60 oe_runmake "PREFIX=${D}" install
61 cp -pPR ${S}/_install/* ${D}/
62
63 # Move everything to /busybox (not supposed to end up in any package)
64 install -d ${D}/busybox
65 ls ${D} -R
66
67 cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
68 # Move the busybox binary back to /bin
69 install -d ${D}${base_bindir}
70 mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
71 # Move back the sh symlink
72 test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
73
74 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
75 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
76 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
77 # Move crond back to /usr/sbin/crond
78 install -d ${D}${sbindir}
79 mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
80
81 install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
82 fi
83 if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
84 # Move httpd back to /usr/sbin/httpd
85 install -d ${D}${sbindir}
86 mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
87
88 install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
89 install -d ${D}/srv/www
90 fi
91 if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
92 # Move udhcpd back to /usr/sbin/udhcpd
93 install -d ${D}${sbindir}
94 mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
95
96 install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
97 fi
98 if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
99 # Move hwclock back to /sbin/hwclock
100 install -d ${D}${base_sbindir}
101 mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
102
103 install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
104 fi
105 if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
106 # Move dhcpc back to /usr/sbin/udhcpc
107 install -d ${D}${base_sbindir}
108 mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
109
110 install -d ${D}${sysconfdir}/udhcpc.d
111 install -d ${D}${datadir}/udhcpc
112 install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
113 install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
114 fi
115
116 install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
117}
118
55pkg_postinst_${PN} () { 119pkg_postinst_${PN} () {
56 # If we are not making an image we create links for the utilities that doesn't exist 120 # If we are not making an image we create links for the utilities that doesn't exist
57 # so the update-alternatives script will get the utilities it needs 121 # so the update-alternatives script will get the utilities it needs
@@ -62,3 +126,34 @@ pkg_postinst_${PN} () {
62 # This adds the links, remember that this has to work when building an image too, hence the $D 126 # This adds the links, remember that this has to work when building an image too, hence the $D
63 while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links 127 while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
64} 128}
129
130pkg_prerm_${PN} () {
131 # This is so you can make busybox commit suicide - removing busybox with no other packages
132 # providing its files, this will make update-alternatives work, but the update-rc.d part
133 # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
134 tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
135 ln -s /bin/busybox $tmpdir/[
136 ln -s /bin/busybox $tmpdir/test
137 ln -s /bin/busybox $tmpdir/head
138 ln -s /bin/busybox $tmpdir/sh
139 ln -s /bin/busybox $tmpdir/basename
140 ln -s /bin/busybox $tmpdir/echo
141 ln -s /bin/busybox $tmpdir/mv
142 ln -s /bin/busybox $tmpdir/ln
143 ln -s /bin/busybox $tmpdir/dirname
144 ln -s /bin/busybox $tmpdir/rm
145 ln -s /bin/busybox $tmpdir/sed
146 ln -s /bin/busybox $tmpdir/sort
147 export PATH=$PATH:$tmpdir
148
149 while read link
150 do
151 case "$link" in
152 /*/*/*) to="../../bin/busybox";;
153 /bin/*) to="busybox";;
154 /*/*) to="../bin/busybox";;
155 esac
156 bn=`basename $link`
157 sh /usr/bin/update-alternatives --remove $bn $to
158 done </etc/busybox.links
159}
diff --git a/meta/packages/busybox/busybox_1.8.2.bb b/meta/packages/busybox/busybox_1.8.2.bb
deleted file mode 100644
index a1ed55a53f..0000000000
--- a/meta/packages/busybox/busybox_1.8.2.bb
+++ /dev/null
@@ -1,111 +0,0 @@
1require busybox.inc
2
3PR = "r2"
4
5SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
6 file://busybox-cron \
7 file://busybox-httpd \
8 file://busybox-udhcpd \
9 file://default.script \
10 file://hwclock.sh \
11 file://mount.busybox \
12 file://syslog \
13 file://syslog.conf \
14 file://udhcpscript.patch;patch=1 \
15 file://umount.busybox \
16 file://defconfig"
17
18EXTRA_OEMAKE_append = " V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
19
20do_configure () {
21 install -m 0644 ${WORKDIR}/defconfig ${S}/.config
22 cml1_do_configure
23}
24
25do_compile () {
26 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
27 base_do_compile
28}
29
30do_install () {
31 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
32 install -d ${D}${sysconfdir}/init.d
33 oe_runmake "PREFIX=${D}" install
34 cp -pPR ${S}/_install/* ${D}/
35
36 # Move everything to /busybox (not supposed to end up in any package)
37 install -d ${D}/busybox
38 ls ${D} -R
39
40 cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
41 # Move the busybox binary back to /bin
42 install -d ${D}${base_bindir}
43 mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
44 # Move back the sh symlink
45 test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
46
47 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
48 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
49 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
50 # Move crond back to /usr/sbin/crond
51 install -d ${D}${sbindir}
52 mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
53
54 install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
55 fi
56 if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
57 # Move httpd back to /usr/sbin/httpd
58 install -d ${D}${sbindir}
59 mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
60
61 install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
62 install -d ${D}/srv/www
63 fi
64 if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
65 # Move udhcpd back to /usr/sbin/udhcpd
66 install -d ${D}${sbindir}
67 mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
68
69 install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
70 fi
71 if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
72 # Move hwclock back to /sbin/hwclock
73 install -d ${D}${base_sbindir}
74 mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
75
76 install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
77 fi
78 if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
79 # Move dhcpc back to /usr/sbin/udhcpc
80 install -d ${D}${base_sbindir}
81 mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
82
83 install -d ${D}${sysconfdir}/udhcpc.d
84 install -d ${D}${datadir}/udhcpc
85 install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
86 install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
87 fi
88
89 install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
90}
91
92pkg_prerm_${PN} () {
93 # This is so you can make busybox commit suicide - removing busybox with no other packages
94 # providing its files, this will make update-alternatives work, but the update-rc.d part
95 # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
96 tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
97 ln -s /bin/busybox $tmpdir/[
98 ln -s /bin/busybox $tmpdir/test
99 ln -s /bin/busybox $tmpdir/head
100 ln -s /bin/busybox $tmpdir/sh
101 ln -s /bin/busybox $tmpdir/basename
102 ln -s /bin/busybox $tmpdir/echo
103 ln -s /bin/busybox $tmpdir/mv
104 ln -s /bin/busybox $tmpdir/ln
105 ln -s /bin/busybox $tmpdir/dirname
106 ln -s /bin/busybox $tmpdir/rm
107 ln -s /bin/busybox $tmpdir/sed
108 ln -s /bin/busybox $tmpdir/sort
109 export PATH=$PATH:$tmpdir
110 while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links
111}
diff --git a/meta/packages/busybox/busybox_1.9.1.bb b/meta/packages/busybox/busybox_1.9.1.bb
new file mode 100644
index 0000000000..cec4af8d59
--- /dev/null
+++ b/meta/packages/busybox/busybox_1.9.1.bb
@@ -0,0 +1,25 @@
1require busybox.inc
2PR = "r4"
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}