5 files changed, 16 insertions, 9 deletions

diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 6db2a5e58..cb861b8e9 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -7,11 +7,14 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-import sys, os#, re
+import sys, os
 
 def usage():
-    sys.stderr.write("usage: %s [-t] file1 file2\n" % sys.argv[0])
-    sys.exit(-1)
+    sys.stderr.write("usage: %s [-t] file1 file2 [-- <readelf options>]\n"
+                        % sys.argv[0])
+    sys.stderr.write("\t-t\tShow time spent on parsing/processing\n")
+    sys.stderr.write("\t--\tPass additional parameters to readelf\n")
+    sys.exit(1)
 
 f1, f2 = (None, None)
 flag_timing, dashes = (False, False)
@@ -31,6 +34,8 @@ for f in sys.argv[1:]:
             f1 = f
         elif f2 is None:
             f2 = f
+        else:
+            usage()
 if flag_timing:
     import time
 if f1 is None or f2 is None:
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 1651390a6..38bae809a 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -150,7 +150,7 @@ HOSTCFLAGS_zconf.tab.o	:= -I$(src)
 HOSTLOADLIBES_qconf     = $(KC_QT_LIBS) -ldl
 HOSTCXXFLAGS_qconf.o    = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
 
-HOSTLOADLIBES_gconf     = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+HOSTLOADLIBES_gconf     = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
 HOSTCFLAGS_gconf.o      = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
                           -D LKC_DIRECT_LINK
 
diff --git a/scripts/mkconfigs b/scripts/mkconfigs
index db94fcc44..6a26fe1dd 100755
--- a/scripts/mkconfigs
+++ b/scripts/mkconfigs
@@ -65,11 +65,11 @@ static const char bbconfig_config_bz2[] ALIGN1 = {"
 
 grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \
 | bzip2 -1 | dd bs=2 skip=1 2>/dev/null \
-| od -v -t x1 \
+| od -v -b \
 | sed -e 's/^[^ ]*//' \
         -e 's/ //g' \
         -e '/^$/d' \
-        -e 's/\(..\)/0x\1,/g'
+        -e 's/\(...\)/0\1,/g'
 
 echo "};"
 echo "#endif"
diff --git a/scripts/randomtest b/scripts/randomtest
index a102593d3..d2b26bc76 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -65,6 +65,7 @@ if test x"$LIBC" = x"uclibc"; then
         | grep -v CONFIG_BUILD_LIBBUSYBOX \
         | grep -v CONFIG_PIE \
         \
+        | grep -v CONFIG_FEATURE_TOUCH_NODEREF \
         | grep -v CONFIG_FEATURE_2_4_MODULES \
         >.config.new
         mv .config.new .config
@@ -72,6 +73,7 @@ if test x"$LIBC" = x"uclibc"; then
         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
+        echo '# CONFIG_FEATURE_TOUCH_NODEREF is not set' >>.config
 fi
 
 # If STATIC, remove some things.
diff --git a/scripts/trylink b/scripts/trylink
index a8b0b2e03..e47169917 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -117,7 +117,7 @@ LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
 # First link with all libs. If it fails, bail out
 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$//'`
+l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
 test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
 try $CC $CFLAGS $LDFLAGS \
         -o $EXE \
@@ -141,7 +141,7 @@ while test "$LDLIBS"; do
     for one in $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$//'`
+        l_list=`echo " $without_one " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
         test x"$l_list" != x"" && l_list="$START_GROUP $l_list $END_GROUP"
         $debug && echo "Trying -l options: '$l_list'"
         try $CC $CFLAGS $LDFLAGS \
@@ -172,7 +172,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$//'`
+l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'`
 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