Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge

Conflicts:
	coreutils/ls.c
	shell/ash.c

2 files changed, 25 insertions, 13 deletions

diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index a62618ae0..0eced2982 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -9,7 +9,10 @@ objtree		:= $(CURDIR)
 src             := $(srctree)
 obj             := $(objtree)
 
-# Look for make include files relative to root of kernel src
+# Make generated files
+DUMMY := $(shell $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree) >&2)
+
+# Look for make include files relative to root of src
 MAKEFLAGS += --include-dir=$(srctree)
 
 default: busybox
@@ -121,6 +124,9 @@ lib-y:=
 include miscutils/Kbuild
 lib-all-y += $(patsubst %,miscutils/%,$(sort $(lib-y)))
 lib-y:=
+include mailutils/Kbuild
+lib-all-y += $(patsubst %,mailutils/%,$(sort $(lib-y)))
+lib-y:=
 include coreutils/libcoreutils/Kbuild
 lib-all-y += $(patsubst %,coreutils/libcoreutils/%,$(sort $(lib-y)))
 lib-y:=
@@ -168,7 +174,7 @@ lib-all-y += $(patsubst %,libbb/%,$(sort $(lib-y)))
 lib-y:=
 
 comma:=,
-busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/autoconf.h
+busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/NUM_APPLETS.h include/autoconf.h
         $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) \
                 $(patsubst %,-Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS)) \
                 -DGCC_COMBINE=1 \
@@ -194,14 +200,9 @@ busybox: busybox_unstripped.o
 include/autoconf.h: .config
         $(MAKE) -f $(srctree)/Makefile silentoldconfig
 
+# Override rules for host compile
 applets/usage: include/autoconf.h
-        $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/usage applets/usage.c
+        $(HOSTCC) -Wall -O2 -I$(srctree)/include -o applets/usage applets/usage.c
 
 applets/applet_tables: include/autoconf.h
-        $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/applet_tables applets/applet_tables.c
-
-include/usage_compressed.h: include/usage.h applets/usage
-        $(srctree)/applets/usage_compressed include/usage_compressed.h applets
-
-include/applet_tables.h: include/applets.h
-        applets/applet_tables include/applet_tables.h
+        $(HOSTCC) -Wall -O2 -I$(srctree)/include -o applets/applet_tables applets/applet_tables.c
diff --git a/scripts/defconfig.tig b/scripts/defconfig.tig
index 52fddfbf6..3dd02983f 100644
--- a/scripts/defconfig.tig
+++ b/scripts/defconfig.tig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.19.0.git
-# Thu Mar 22 12:00:44 2012
+# Thu Mar 22 13:52:53 2012
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -431,6 +431,7 @@ CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_INITRD is not set
 CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 
 #
 # Login/Password Management Utilities
@@ -476,6 +477,10 @@ CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_FSCK is not set
 # CONFIG_LSATTR is not set
 # CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
 # CONFIG_MODINFO is not set
 # CONFIG_MODPROBE_SMALL is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
@@ -487,6 +492,10 @@ CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_MODPROBE is not set
 # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
 # CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
 # CONFIG_FEATURE_2_4_MODULES is not set
 # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
@@ -693,6 +702,8 @@ CONFIG_STRINGS=y
 #
 # Networking Utilities
 #
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NBDCLIENT is not set
 # CONFIG_NC is not set
 # CONFIG_NC_SERVER is not set
@@ -701,6 +712,7 @@ CONFIG_STRINGS=y
 # CONFIG_PING is not set
 # CONFIG_PING6 is not set
 # CONFIG_FEATURE_FANCY_PING is not set
+# CONFIG_WHOIS is not set
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
@@ -773,8 +785,6 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 # CONFIG_FEATURE_NETSTAT_PRG is not set
@@ -855,6 +865,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_PMAP is not set
 # CONFIG_POWERTOP is not set
 # CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
 # CONFIG_SMEMCAP is not set
 # CONFIG_FREE is not set
 # CONFIG_FUSER is not set