Changeset 2859 in MondoRescue for branches/2.2.9/mindi-busybox/scripts

Timestamp:

Jul 26, 2011, 1:25:42 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Update to upstream busybox 1.18.5

Location:

branches/2.2.9/mindi-busybox/scripts

Files:

• kconfig/mconf.c (modified) (1 diff)
• mkconfigs (modified) (2 diffs)

branches/2.2.9/mindi-busybox/scripts/kconfig/mconf.c

@@ -257 +257 @@
     "\n");
 
-static char buf[4096], *bufptr = buf;
+static char buf[4096*10], *bufptr = buf;
 static char input_buf[4096];
 static const char filename[] = ".config";

branches/2.2.9/mindi-busybox/scripts/mkconfigs

@@ -43 +43 @@
 static const char bbconfig_config[] ALIGN1 ="
 
-grep '^#\? \?CONFIG_' "$config" \
+grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \
 | sed -e 's/\"/\\\"/g' -e 's/^/"/' -e 's/$/\\n"/'
 
@@ -64 +64 @@
 static const char bbconfig_config_bz2[] ALIGN1 = {"
 
-grep '^#\? \?CONFIG_' "$config" \
+grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \
 | bzip2 -1 | dd bs=2 skip=1 2>/dev/null \
 | od -v -t x1 \