Merge branch 'busybox' into merge

3 files changed, 44 insertions, 6 deletions

diff --git a/scripts/randomtest b/scripts/randomtest
index 287f1c771..1809838a4 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -82,6 +82,9 @@ if test x"$LIBC" = x"uclibc"; then
         | grep -v CONFIG_BLKDISCARD \
         | grep -v CONFIG_NSENTER \
         | grep -v CONFIG_UNSHARE \
+        | grep -v CONFIG_FALLOCATE \
+        | grep -v CONFIG_UDHCPC6 \
+        | grep -v CONFIG_ASH_INTERNAL_GLOB \
         >.config.new
         mv .config.new .config
         echo 'CONFIG_STATIC=y' >>.config
@@ -96,6 +99,9 @@ if test x"$LIBC" = x"uclibc"; then
         echo '# CONFIG_BLKDISCARD is not set' >>.config
         echo '# CONFIG_NSENTER is not set' >>.config
         echo '# CONFIG_UNSHARE is not set' >>.config
+        echo '# CONFIG_FALLOCATE is not set' >>.config
+        echo '# CONFIG_UDHCPC6 is not set' >>.config
+        echo 'CONFIG_ASH_INTERNAL_GLOB=y' >>.config
 fi
 
 # If STATIC, remove some things.
diff --git a/scripts/randomtest.loop b/scripts/randomtest.loop
index 710f5fd05..4d14b652f 100755
--- a/scripts/randomtest.loop
+++ b/scripts/randomtest.loop
@@ -1,7 +1,11 @@
 #!/bin/sh
 
+run_testsuite=false
 run_testsuite=true
 
+run_single_test=false
+run_single_test=true
+
 test -d "$1" || { echo "'$1' is not a directory"; exit 1; }
 test -x "$1/scripts/randomtest" || { echo "No scripts/randomtest in '$1'"; exit 1; }
 
@@ -40,6 +44,28 @@ while sleep 1; do
                 fi
                 tail -n10 -- "$dir/testsuite/runtest.log"
         fi
+        if $run_single_test; then
+                (
+                        cd -- "$dir" || exit 1
+                        echo "Running make_single_applets.sh in $dir..."
+
+                        if grep -q '# CONFIG_FEATURE_TFTP_GET is not set' .config \
+                        && grep -q '# CONFIG_FEATURE_TFTP_PUT is not set' .config \
+                        ; then
+                                # If both off, tftp[d] is ifdefed out and test fails.
+                                # Enable one:
+                                sed 's/# CONFIG_FEATURE_TFTP_GET is not set/CONFIG_FEATURE_TFTP_GET=y/' -i .config
+                        fi
+
+                        ./make_single_applets.sh
+                )
+                if test $? != 0; then
+                        echo "Failed make_single_applets.sh in $dir"
+                        exit 1 # you may comment this out...
+                        let fail++
+                        continue
+                fi
+        fi
         rm -rf -- "$dir"
         let cnt++
 done
diff --git a/scripts/trylink b/scripts/trylink
index 9f288c141..ba2d265bc 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -91,7 +91,9 @@ fi
 
 START_GROUP="-Wl,--start-group"
 END_GROUP="-Wl,--end-group"
-INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
+INFO_OPTS() {
+        echo "-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
+}
 
 # gold may not support --sort-common (yet)
 SORT_COMMON="-Wl,--sort-common"
@@ -194,7 +196,7 @@ if ! test -f busybox_ldscript; then
             $GC_SECTIONS \
             $START_GROUP $O_FILES $A_FILES $END_GROUP \
             $l_list \
-            $INFO_OPTS \
+            `INFO_OPTS` \
     || {
         cat $EXE.out
         exit 1
@@ -225,7 +227,7 @@ else
             -Wl,-T,busybox_ldscript \
             $START_GROUP $O_FILES $A_FILES $END_GROUP \
             $l_list \
-            $INFO_OPTS \
+            `INFO_OPTS` \
     || {
         cat $EXE.out
         exit 1
@@ -244,10 +246,14 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
     }
     ln -s "libbusybox.so.$BB_VER" "$sharedlib_dir"/libbusybox.so 2>/dev/null
 
+    # Yes, "ld -shared -static" is a thing. It's a shared library which is itself static.
+    LBB_STATIC=""
+    test "$CONFIG_FEATURE_LIBBUSYBOX_STATIC" = y && LBB_STATIC="-Wl,-static"
+
     EXE="$sharedlib_dir/libbusybox.so.${BB_VER}_unstripped"
     try $CC $CFLAGS $LDFLAGS \
             -o $EXE \
-            -shared -fPIC \
+            -shared -fPIC $LBB_STATIC \
             -Wl,--enable-new-dtags \
             -Wl,-z,combreloc \
             -Wl,-soname="libbusybox.so.$BB_VER" \
@@ -256,7 +262,7 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
             $SORT_SECTION \
             $START_GROUP $A_FILES $END_GROUP \
             $l_list \
-            $INFO_OPTS \
+            `INFO_OPTS` \
     || {
         echo "Linking $EXE failed"
         cat $EXE.out
@@ -277,7 +283,7 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
             $START_GROUP $O_FILES $END_GROUP \
             -L"$sharedlib_dir" -lbusybox \
             $l_list \
-            $INFO_OPTS \
+            `INFO_OPTS` \
     || {
         echo "Linking $EXE failed"
         cat $EXE.out