4 files changed, 39 insertions, 43 deletions

diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 0984e7d4b..b12569832 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -39,6 +39,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <alloca.h>
 
 /* exitstatus is used to keep track of any failing calls to kernel-doc,
  * but execution continues. */
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index fd2e2375f..b7f9e0c2f 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -117,6 +117,7 @@
 #ifndef __MINGW32__
 #include <arpa/inet.h>
 #endif
+#include <alloca.h>
 
 /* bbox: not needed
 #define INT_CONF ntohl(0x434f4e46)
diff --git a/scripts/defconfig.tig b/scripts/defconfig.tig
index 5da784617..2de0d8041 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
-# Thu Mar 22 15:45:17 2012
+# Busybox version: 1.20.0.git
+# Fri Mar 23 10:48:09 2012
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -95,7 +95,7 @@ CONFIG_PREFIX=""
 # CONFIG_FEATURE_SYSTEMD is not set
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_MD5_SMALL=1
 # CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 # CONFIG_FEATURE_USE_TERMIOS is not set
@@ -104,6 +104,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=255
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
 # CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
@@ -143,6 +144,7 @@ CONFIG_FEATURE_CPIO_P=y
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_GZIP_FAST=2
 CONFIG_LZOP=y
 # CONFIG_LZOP_COMPR_HIGH is not set
 CONFIG_RPM2CPIO=y
@@ -176,6 +178,7 @@ CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
+# CONFIG_HOSTID is not set
 # CONFIG_ID is not set
 # CONFIG_GROUPS is not set
 CONFIG_TEST=y
@@ -223,7 +226,6 @@ CONFIG_FOLD=y
 # CONFIG_FSYNC is not set
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
 # CONFIG_INSTALL is not set
 # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
 # CONFIG_LN is not set
@@ -460,6 +462,7 @@ CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
 # CONFIG_GETTY is not set
 # CONFIG_LOGIN is not set
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
 # CONFIG_PAM is not set
 # CONFIG_LOGIN_SCRIPTS is not set
 # CONFIG_FEATURE_NOLOGIN is not set
@@ -517,6 +520,12 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # Linux System Utilities
 #
 # CONFIG_BLOCKDEV is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 # CONFIG_REV is not set
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
@@ -560,12 +569,6 @@ CONFIG_HD=y
 # CONFIG_LOSETUP is not set
 # CONFIG_LSPCI is not set
 # CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 # CONFIG_MORE is not set
@@ -889,6 +892,7 @@ CONFIG_FEATURE_PIDOF_OMIT=y
 # CONFIG_PKILL is not set
 CONFIG_PS=y
 # CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_LONG is not set
 # CONFIG_FEATURE_PS_TIME is not set
 # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index e518a9008..c42fe9fbb 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -19,25 +19,20 @@ chk() { status "CHK" "$@"; }
 
 generate()
 {
-        local src="$1" dst="$2" header="$3" insert="$4"
+        # NB: data to be inserted at INSERT line is coming on stdin
+        local src="$1" dst="$2" header="$3"
         #chk "${dst}"
-        (
+        {
                 # Need to use printf: different shells have inconsistent
-                # rules re handling of "\n" in echo params,
-                # and ${insert} definitely contains "\n".
-                # Therefore, echo "${header}" would not work:
+                # rules re handling of "\n" in echo params.
                 printf "%s\n" "${header}"
-                if grep -qs '^INSERT$' "${src}"; then
-                        sed -n '1,/^INSERT$/p' "${src}"
-                        printf "%s\n" "${insert}"
-                        sed -n '/^INSERT$/,$p' "${src}"
-                else
-                        if [ -n "${insert}" ]; then
-                                printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
-                        fi
-                        cat "${src}"
-                fi
-        ) | sed '/^INSERT$/d' > "${dst}.tmp"
+                # print everything up to INSERT line
+                sed -n '/^INSERT$/ q; p' "${src}"
+                # copy stdin to stdout
+                cat
+                # print everything after INSERT line
+                sed -n '/^INSERT$/ { :l; n; p; bl }' "${src}"
+        } >"${dst}.tmp"
         if ! cmp -s "${dst}" "${dst}.tmp"; then
                 gen "${dst}"
                 mv "${dst}.tmp" "${dst}"
@@ -47,24 +42,21 @@ generate()
 }
 
 # (Re)generate include/applets.h
-s=`sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
-generate \
+sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
+| generate \
         "$srctree/include/applets.src.h" \
         "include/applets.h" \
-        "/* DO NOT EDIT. This file is generated from applets.src.h */" \
-        "${s}"
+        "/* DO NOT EDIT. This file is generated from applets.src.h */"
 
 # (Re)generate include/usage.h
 # We add line continuation backslash after each line,
 # and insert empty line before each line which doesn't start
 # with space or tab
-# (note: we need to use \\\\ because of ``)
-s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
-generate \
+sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
+| generate \
         "$srctree/include/usage.src.h" \
         "include/usage.h" \
-        "/* DO NOT EDIT. This file is generated from usage.src.h */" \
-        "${s}"
+        "/* DO NOT EDIT. This file is generated from usage.src.h */"
 
 # (Re)generate */Kbuild and */Config.in
 { cd -- "$srctree" && find . -type d; } | while read -r d; do
@@ -75,11 +67,10 @@ generate \
         if test -f "$src"; then
                 mkdir -p -- "$d" 2>/dev/null
 
-                s=`sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c`
-                generate \
+                sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c \
+                | generate \
                         "${src}" "${dst}" \
-                        "# DO NOT EDIT. This file is generated from Kbuild.src" \
-                        "${s}"
+                        "# DO NOT EDIT. This file is generated from Kbuild.src"
         fi
 
         src="$srctree/$d/Config.src"
@@ -87,11 +78,10 @@ generate \
         if test -f "$src"; then
                 mkdir -p -- "$d" 2>/dev/null
 
-                s=`sed -n 's@^//config:@@p' "$srctree/$d"/*.c`
-                generate \
+                sed -n 's@^//config:@@p' "$srctree/$d"/*.c \
+                | generate \
                         "${src}" "${dst}" \
-                        "# DO NOT EDIT. This file is generated from Config.src" \
-                        "${s}"
+                        "# DO NOT EDIT. This file is generated from Config.src"
         fi
 done