diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-06-12 17:49:38 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-06-12 17:49:38 +0200 |
commit | 2e79bc6c77560d4460847a459857039774de004a (patch) | |
tree | 17148ca59e5b221bcd0dda72023c6ac4748e93f4 /scripts/mkconfigs | |
parent | 30f0ea6cab956ed59ecc5de82459187763a2b868 (diff) | |
download | busybox-w32-1_18_5.tar.gz busybox-w32-1_18_5.tar.bz2 busybox-w32-1_18_5.zip |
Apply post-1.18.4 fixes, bump version to 1.18.51_18_5
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
-rwxr-xr-x | scripts/mkconfigs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mkconfigs b/scripts/mkconfigs index 47ac53330..db94fcc44 100755 --- a/scripts/mkconfigs +++ b/scripts/mkconfigs | |||
@@ -42,7 +42,7 @@ echo "\ | |||
42 | */ | 42 | */ |
43 | static const char bbconfig_config[] ALIGN1 =" | 43 | static const char bbconfig_config[] ALIGN1 =" |
44 | 44 | ||
45 | grep '^#\? \?CONFIG_' "$config" \ | 45 | grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \ |
46 | | sed -e 's/\"/\\\"/g' -e 's/^/"/' -e 's/$/\\n"/' | 46 | | sed -e 's/\"/\\\"/g' -e 's/^/"/' -e 's/$/\\n"/' |
47 | 47 | ||
48 | echo ";" | 48 | echo ";" |
@@ -63,7 +63,7 @@ echo "\ | |||
63 | */ | 63 | */ |
64 | static const char bbconfig_config_bz2[] ALIGN1 = {" | 64 | static const char bbconfig_config_bz2[] ALIGN1 = {" |
65 | 65 | ||
66 | grep '^#\? \?CONFIG_' "$config" \ | 66 | grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \ |
67 | | bzip2 -1 | dd bs=2 skip=1 2>/dev/null \ | 67 | | bzip2 -1 | dd bs=2 skip=1 2>/dev/null \ |
68 | | od -v -t x1 \ | 68 | | od -v -t x1 \ |
69 | | sed -e 's/^[^ ]*//' \ | 69 | | sed -e 's/^[^ ]*//' \ |