Merge branch 'busybox' into merge

3 files changed, 154 insertions, 13 deletions

diff --git a/scripts/embedded_scripts b/scripts/embedded_scripts
new file mode 100755
index 000000000..aa7bf3e8a
--- /dev/null
+++ b/scripts/embedded_scripts
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+. ./.config || exit 1
+
+target="$1"
+custom_loc="$2"
+applet_loc="$3"
+
+test "$target" || exit 1
+test "$SED" || SED=sed
+test "$DD" || DD=dd
+
+if [ x"$CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS" != x"y" ]
+then
+        printf '#define NUM_SCRIPTS 0\n' >"$target"
+        exit 0
+fi
+
+# Some people were bitten by their system lacking a (proper) od
+od -v -b </dev/null >/dev/null
+if test $? != 0; then
+        echo 'od tool is not installed or cannot accept "-v -b" options'
+        exit 1
+fi
+
+custom_scripts=""
+if [ -d "$custom_loc" ]
+then
+        custom_scripts=$(cd $custom_loc; ls * 2>/dev/null)
+fi
+all_scripts=$($srctree/applets/busybox.mkscripts)
+
+# all_scripts includes applet scripts and custom scripts, sort them out
+applet_scripts=""
+for i in $all_scripts
+do
+    found=0
+        for j in $custom_scripts
+        do
+                if [ "$i" = "$j" ]
+                then
+                        found=1
+                        break;
+                fi
+        done
+        if [ $found -eq 0 ]
+        then
+                # anything that isn't a custom script is an applet script
+                applet_scripts="$applet_scripts $i"
+        fi
+done
+
+# we know the custom scripts are present but applet scripts might have
+# become detached from their configuration
+for i in $applet_scripts
+do
+        #if [ ! -f "$applet_loc/$i" -a ! -f "$custom_loc/$i" ]
+        if [ ! -f "$applet_loc/$i" ]
+        then
+                echo "missing applet script $i"
+                exit 1
+        fi
+done
+
+n=$(echo $custom_scripts $applet_scripts | wc -w)
+nall=$(echo $all_scripts | wc -w)
+
+if [ $n -ne $nall ]
+then
+        echo "script mismatch $n != $nall"
+        exit 1
+fi
+
+concatenate_scripts() {
+        for i in $custom_scripts
+        do
+                cat $custom_loc/$i
+                printf '\000'
+        done
+        for i in $applet_scripts
+        do
+                cat $applet_loc/$i
+                printf '\000'
+        done
+}
+
+exec >"$target.$$"
+
+if [ $n -ne 0 ]
+then
+        printf '#ifdef DEFINE_SCRIPT_DATA\n'
+        printf 'const uint16_t applet_numbers[] = {\n'
+        for i in $custom_scripts $applet_scripts
+        do
+                # TODO support applets with names including invalid characters
+                printf '\tAPPLET_NO_%s,\n' $i
+        done
+        printf '};\n'
+        printf '#else\n'
+        printf 'extern const uint16_t applet_numbers[];\n'
+        printf '#endif\n'
+fi
+
+printf "\n"
+printf '#define NUM_SCRIPTS %d\n' $n
+printf "\n"
+
+if [ $n -ne 0 ]
+then
+        printf '#define UNPACKED_SCRIPTS_LENGTH '
+        concatenate_scripts | wc -c
+
+        printf '#define PACKED_SCRIPTS \\\n'
+        concatenate_scripts | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | \
+        od -v -b \
+        | grep -v '^ ' \
+        | $SED -e 's/^[^ ]*//' \
+                -e 's/ //g' \
+                -e '/^$/d' \
+                -e 's/\(...\)/0\1,/g' \
+                -e 's/$/ \\/'
+        printf '\n'
+fi
+
+mv -- "$target.$$" "$target"
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index f79fa2f83..92de681ac 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -17,12 +17,26 @@ status() { printf '  %-8s%s\n' "$1" "$2"; }
 gen() { status "GEN" "$@"; }
 chk() { status "CHK" "$@"; }
 
+# scripts in the 'embed' directory are treated as fake applets
+custom_scripts()
+{
+        custom_loc="$1"
+        if [ -d "$custom_loc" ]
+        then
+                for i in $(cd "$custom_loc"; ls * 2>/dev/null)
+                do
+                        printf "IF_FEATURE_SH_EMBEDDED_SCRIPTS(APPLET_SCRIPTED(%s, scripted, BB_DIR_USR_BIN, BB_SUID_DROP, scripted))\n" $i;
+                done
+        fi
+}
+
 generate()
 {
         # NB: data to be inserted at INSERT line is coming on stdin
         src="$1"
         dst="$2"
         header="$3"
+        loc="$4"
         #chk "${dst}"
         {
                 # Need to use printf: different shells have inconsistent
@@ -32,6 +46,10 @@ generate()
                 sed -n '/^INSERT$/ q; p' "${src}"
                 # copy stdin to stdout
                 cat
+                if [ -n "$loc" ]
+                then
+                        custom_scripts "$loc"
+                fi
                 # print everything after INSERT line
                 sed -n '/^INSERT$/ {
                 :l
@@ -53,7 +71,8 @@ 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 */"
+        "/* DO NOT EDIT. This file is generated from applets.src.h */" \
+        "$srctree/embed"
 
 # (Re)generate include/usage.h
 # We add line continuation backslash after each line,
diff --git a/scripts/trylink b/scripts/trylink
index ba2d265bc..bb6b2de2f 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -149,8 +149,8 @@ try $CC $CFLAGS $LDFLAGS \
 # Stop when no lib can be removed.
 while test "$LDLIBS"; do
     $debug && echo "Trying libraries: $LDLIBS"
-    all_needed=true
-    last_needed=false
+    dropped_non_first_lib=false
+    first_lib=true
     for one in $LDLIBS; do
         without_one=`echo " $LDLIBS " | sed "s/ $one / /g" | xargs`
         # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
@@ -167,20 +167,17 @@ while test "$LDLIBS"; do
         if test $? = 0; then
             echo " Library $one is not needed, excluding it"
             LDLIBS="$without_one"
-            all_needed=false
-            last_needed=false
+            $first_lib || dropped_non_first_lib=true
         else
             echo " Library $one is needed, can't exclude it (yet)"
-            last_needed=true
+            first_lib=false
         fi
     done
-    # All libs were needed, can't remove any
-    $all_needed && break
-    # Optimization: was the last tried lib needed?
-    if $last_needed; then
-        # Was it the only one lib left? Don't test again then.
-        { echo "$LDLIBS" | grep -q ' '; } || break
-    fi
+    # We can stop trying to drop libs if either all libs were needed,
+    # or we excluded only the _first_ few.
+    # (else: we dropped some intermediate lib(s), maybe now we can succeed
+    # in dropping some of the preceding ones)
+    $dropped_non_first_lib || break
 done
 
 # Make the binary with final, minimal list of libs