Merge branch 'origin/master' (early part)

6 files changed, 72 insertions, 55 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index f343818b1..5685b5bcc 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -13,8 +13,13 @@ __build:
 include scripts/Kbuild.include
 
 # The filename Kbuild has precedence over Makefile
+# bbox: we also try to include Kbuild file in obj tree first
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
+include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, \
+                $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, \
+                        $(kbuild-dir)/Makefile \
+                ) \
+        )
 
 include scripts/Makefile.lib
 
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index ef5181226..50ef37157 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -86,7 +86,7 @@ void exec_kernel_doc(char **svec)
         fflush(stdout);
         switch(pid=fork()) {
                 case -1:
-                        perror("fork");
+                        perror("vfork"+1);
                         exit(1);
                 case  0:
                         rflen  = strlen(getenv("SRCTREE"));
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index 647c7daf7..968158758 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -4,6 +4,8 @@ test $# -ge 2 || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
 
 # cd to objtree
 cd -- "$2" || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
+# In separate objtree build, include/ might not exist yet
+mkdir include 2>/dev/null
 
 srctree="$1"
 
@@ -11,20 +13,19 @@ srctree="$1"
 src="$srctree/include/applets.src.h"
 dst="include/applets.h"
 s=`sed -n 's@^//applet:@@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-echo "/* DO NOT EDIT. This file is generated from applets.src.h */" >"$dst.$$.tmp"
+old=`cat "$dst" 2>/dev/null`
 # Why "IFS='' read -r REPLY"??
 # This atrocity is needed to read lines without mangling.
 # IFS='' prevents whitespace trimming,
 # -r suppresses backslash handling.
+new=`echo "/* DO NOT EDIT. This file is generated from applets.src.h */"
 while IFS='' read -r REPLY; do
         test x"$REPLY" = x"INSERT" && REPLY="$s"
         printf "%s\n" "$REPLY"
-done <"$src" >>"$dst.$$.tmp"
-if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-        rm -- "$dst.$$.tmp"
-else
+done <"$src"`
+if test x"$new" != x"$old"; then
         echo "  GEN     $dst"
-        mv -- "$dst.$$.tmp" "$dst"
+        printf "%s\n" "$new" >"$dst"
 fi
 
 # (Re)generate include/usage.h
@@ -35,62 +36,58 @@ dst="include/usage.h"
 # 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`
-echo "/* DO NOT EDIT. This file is generated from usage.src.h */" >"$dst.$$.tmp"
-# Why "IFS='' read -r REPLY"??
-# This atrocity is needed to read lines without mangling.
-# IFS='' prevents whitespace trimming,
-# -r suppresses backslash handling.
+old=`cat "$dst" 2>/dev/null`
+new=`echo "/* DO NOT EDIT. This file is generated from usage.src.h */"
 while IFS='' read -r REPLY; do
         test x"$REPLY" = x"INSERT" && REPLY="$s"
         printf "%s\n" "$REPLY"
-done <"$src" >>"$dst.$$.tmp"
-if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-        rm -- "$dst.$$.tmp"
-else
+done <"$src"`
+if test x"$new" != x"$old"; then
         echo "  GEN     $dst"
-        mv -- "$dst.$$.tmp" "$dst"
+        printf "%s\n" "$new" >"$dst"
 fi
 
 # (Re)generate */Kbuild and */Config.in
-find -type d | while read -r d; do
+{ cd -- "$srctree" && find -type d; } | while read -r d; do
         d="${d#./}"
+
         src="$srctree/$d/Kbuild.src"
         dst="$d/Kbuild"
+        mkdir -p -- "$d" 2>/dev/null
         if test -f "$src"; then
                 #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
 
-                echo "# DO NOT EDIT. This file is generated from Kbuild.src" >"$dst.$$.tmp"
+                old=`cat "$dst" 2>/dev/null`
+                new=`echo "# DO NOT EDIT. This file is generated from Kbuild.src"
                 while IFS='' read -r REPLY; do
                         test x"$REPLY" = x"INSERT" && REPLY="$s"
                         printf "%s\n" "$REPLY"
-                done <"$src" >>"$dst.$$.tmp"
-                if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-                        rm -- "$dst.$$.tmp"
-                else
+                done <"$src"`
+                if test x"$new" != x"$old"; then
                         echo "  GEN     $dst"
-                        mv -- "$dst.$$.tmp" "$dst"
+                        printf "%s\n" "$new" >"$dst"
                 fi
         fi
 
         src="$srctree/$d/Config.src"
         dst="$d/Config.in"
+        mkdir -p -- "$d" 2>/dev/null
         if test -f "$src"; then
                 #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
 
-                echo "# DO NOT EDIT. This file is generated from Config.src" >"$dst.$$.tmp"
+                old=`cat "$dst" 2>/dev/null`
+                new=`echo "# DO NOT EDIT. This file is generated from Config.src"
                 while IFS='' read -r REPLY; do
                         test x"$REPLY" = x"INSERT" && REPLY="$s"
                         printf "%s\n" "$REPLY"
-                done <"$src" >>"$dst.$$.tmp"
-                if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-                        rm -- "$dst.$$.tmp"
-                else
+                done <"$src"`
+                if test x"$new" != x"$old"; then
                         echo "  GEN     $dst"
-                        mv -- "$dst.$$.tmp" "$dst"
+                        printf "%s\n" "$new" >"$dst"
                 fi
         fi
 done
diff --git a/scripts/randomtest b/scripts/randomtest
index 8d0d79e64..a102593d3 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -43,6 +43,10 @@ mv .config.new .config
 echo '# CONFIG_DEBUG_PESSIMIZE is not set' >>.config
 echo '# CONFIG_WERROR is not set' >>.config
 echo "CONFIG_CROSS_COMPILER_PREFIX=\"${CROSS_COMPILER_PREFIX}\"" >>.config
+echo '# CONFIG_SELINUX is not set' >>.config
+echo '# CONFIG_EFENCE is not set' >>.config
+echo '# CONFIG_DMALLOC is not set' >>.config
+echo '# CONFIG_RFKILL is not set' >>.config
 
 # If glibc, don't build static
 if test x"$LIBC" = x"glibc"; then
@@ -53,18 +57,21 @@ if test x"$LIBC" = x"glibc"; then
         echo '# CONFIG_STATIC is not set' >>.config
 fi
 
-# If glibc, build static, and remove some things
+# If uclibc, build static, and remove some things
 # likely to not work on uclibc.
 if test x"$LIBC" = x"uclibc"; then
         cat .config \
         | grep -v CONFIG_STATIC \
         | grep -v CONFIG_BUILD_LIBBUSYBOX \
-        | grep -v CONFIG_TASKSET \
-        | grep -v CONFIG_UNICODE_SUPPORT \
         | grep -v CONFIG_PIE \
+        \
+        | grep -v CONFIG_FEATURE_2_4_MODULES \
         >.config.new
         mv .config.new .config
         echo 'CONFIG_STATIC=y' >>.config
+        echo '# CONFIG_BUILD_LIBBUSYBOX is not set' >>.config
+        echo '# CONFIG_PIE is not set' >>.config
+        echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config
 fi
 
 # If STATIC, remove some things.
@@ -75,6 +82,7 @@ if grep -q "^CONFIG_STATIC=y" .config; then
         | grep -v CONFIG_PAM \
         >.config.new
         mv .config.new .config
+        echo '# CONFIG_PAM is not set' >>.config
 fi
 
 # Regenerate .config with default answers for yanked-off options
diff --git a/scripts/test_make_O b/scripts/test_make_O
new file mode 100755
index 000000000..a0ee6a868
--- /dev/null
+++ b/scripts/test_make_O
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+b=`basename $PWD`
+test "${b#busybox}" != "$b" || { echo "Must be run in busybox tree"; exit 1; }
+
+rm -rf ../testdir_make_O.$$
+mkdir ../testdir_make_O.$$
+odir=`cd ../testdir_make_O.$$ && pwd`
+test -d "$odir" || exit 1
+
+make O="$odir" $MAKEOPTS "$@" defconfig busybox 2>&1 | tee test_make_O.log
diff --git a/scripts/trylink b/scripts/trylink
index 164f5274c..5994a757b 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -85,6 +85,10 @@ LDLIBS="$7"
 # The --sort-section option is not supported by older versions of ld
 SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`
 
+START_GROUP="-Wl,--start-group"
+END_GROUP="-Wl,--end-group"
+INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
+
 # gold may not support --sort-common (yet)
 SORT_COMMON=`check_cc "-Wl,--sort-common" ""`
 
@@ -114,13 +118,13 @@ LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
 echo "Trying libraries: $LDLIBS"
 # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
 l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
+test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
 try $CC $CFLAGS $LDFLAGS \
         -o $EXE \
         $SORT_COMMON \
         $SORT_SECTION \
         $GC_SECTIONS \
-        -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+        $START_GROUP $O_FILES $A_FILES $END_GROUP \
         $l_list \
 || {
     echo "Failed: $l_list"
@@ -138,14 +142,14 @@ while test "$LDLIBS"; do
         without_one=`echo " $LDLIBS " | sed "s/ $one / /g" | xargs`
         # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
         l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-        test x"$l_list" != x"" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
+        test x"$l_list" != x"" && l_list="$START_GROUP $l_list $END_GROUP"
         $debug && echo "Trying -l options: '$l_list'"
         try $CC $CFLAGS $LDFLAGS \
                 -o $EXE \
                 $SORT_COMMON \
                 $SORT_SECTION \
                 $GC_SECTIONS \
-                -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+                $START_GROUP $O_FILES $A_FILES $END_GROUP \
                 $l_list
         if test $? = 0; then
             echo " Library $one is not needed, excluding it"
@@ -169,7 +173,7 @@ done
 # Make the binary with final, minimal list of libs
 echo "Final link with: ${LDLIBS:-<none>}"
 l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
+test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
 # --verbose gives us gobs of info to stdout (e.g. linker script used)
 if ! test -f busybox_ldscript; then
     try $CC $CFLAGS $LDFLAGS \
@@ -177,11 +181,9 @@ if ! test -f busybox_ldscript; then
             $SORT_COMMON \
             $SORT_SECTION \
             $GC_SECTIONS \
-            -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+            $START_GROUP $O_FILES $A_FILES $END_GROUP \
             $l_list \
-            -Wl,--warn-common \
-            -Wl,-Map,$EXE.map \
-            -Wl,--verbose \
+            $INFO_OPTS \
     || {
         cat $EXE.out
         exit 1
@@ -200,11 +202,9 @@ else
             $SORT_SECTION \
             $GC_SECTIONS \
             -Wl,-T,busybox_ldscript \
-            -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
+            $START_GROUP $O_FILES $A_FILES $END_GROUP \
             $l_list \
-            -Wl,--warn-common \
-            -Wl,-Map,$EXE.map \
-            -Wl,--verbose \
+            $INFO_OPTS \
     || {
         cat $EXE.out
         exit 1
@@ -233,11 +233,9 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
             -Wl,--undefined=lbb_main \
             $SORT_COMMON \
             $SORT_SECTION \
-            -Wl,--start-group $A_FILES -Wl,--end-group \
+            $START_GROUP $A_FILES $END_GROUP \
             $l_list \
-            -Wl,--warn-common \
-            -Wl,-Map,$EXE.map \
-            -Wl,--verbose \
+            $INFO_OPTS \
     || {
         echo "Linking $EXE failed"
         cat $EXE.out
@@ -255,11 +253,9 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
             $SORT_COMMON \
             $SORT_SECTION \
             $GC_SECTIONS \
-            -Wl,--start-group $O_FILES -Wl,--end-group \
+            $START_GROUP $O_FILES $END_GROUP \
             -L"$sharedlib_dir" -lbusybox \
-            -Wl,--warn-common \
-            -Wl,-Map,$EXE.map \
-            -Wl,--verbose \
+            $INFO_OPTS \
     || {
         echo "Linking $EXE failed"
         cat $EXE.out