3 files changed, 36 insertions, 11 deletions

diff --git a/scripts/echo.c b/scripts/echo.c
index 3c45e339c..cb207ae05 100644
--- a/scripts/echo.c
+++ b/scripts/echo.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1991, 1993
  *      The Regents of the University of California.  All rights reserved.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Original copyright notice is retained at the end of this file.
  */
diff --git a/scripts/mkconfigs b/scripts/mkconfigs
index ef6ae8aaf..47ac53330 100755
--- a/scripts/mkconfigs
+++ b/scripts/mkconfigs
@@ -26,26 +26,51 @@
 #      - Retain lines that begin with "# CONFIG_"
 #      - lines that use double-quotes must \\-escape-quote them
 
-config="$1"
-if [ $# -lt 1 ]
-then
-        config=.config
-fi
+config=.config
 
+{
 echo "\
 #ifndef _BBCONFIGOPTS_H
 #define _BBCONFIGOPTS_H
 /*
  * busybox configuration settings.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * This file is generated automatically by scripts/mkconfigs.
  * Do not edit.
  */
-static const char bbconfig_config[] ="
+static const char bbconfig_config[] ALIGN1 ="
 
-sed 's/\"/\\\"/g' $config | grep "^#\? \?CONFIG_" | awk '{print "\"" $0 "\\n\"";}'
+grep '^#\? \?CONFIG_' "$config" \
+| sed -e 's/\"/\\\"/g' -e 's/^/"/' -e 's/$/\\n"/'
 
 echo ";"
-echo "#endif /* _BBCONFIGOPTS_H */"
+echo "#endif"
+} >"$1"
+
+{
+echo "\
+#ifndef _BBCONFIGOPTS_BZ2_H
+#define _BBCONFIGOPTS_BZ2_H
+/*
+ * busybox configuration settings.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ *
+ * This file is generated automatically by scripts/mkconfigs.
+ * Do not edit.
+ */
+static const char bbconfig_config_bz2[] ALIGN1 = {"
+
+grep '^#\? \?CONFIG_' "$config" \
+| bzip2 -1 | dd bs=2 skip=1 2>/dev/null \
+| od -v -t x1 \
+| sed -e 's/^[^ ]*//' \
+        -e 's/ //g' \
+        -e '/^$/d' \
+        -e 's/\(..\)/0x\1,/g'
+
+echo "};"
+echo "#endif"
+} >"$2"
diff --git a/scripts/showasm b/scripts/showasm
index dc2cd705d..b61ab98d0 100755
--- a/scripts/showasm
+++ b/scripts/showasm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006 Rob Landley <rob@landley.net>
-# Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 
 # Dumb little utility function to print out the assembly dump of a single
 # function, or list the functions so dumpable in an executable.  You'd think