diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-12-23 19:42:53 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-12-23 19:42:53 +0100 |
commit | 7d5c881bd0cbf3cb1a755acf95a00b37625f7628 (patch) | |
tree | 2ceca2504962d13bc783594fc32ef7a98d709e79 | |
parent | 0b8835861b2e43cb45becdb560877bcc89aea827 (diff) | |
download | busybox-w32-7d5c881bd0cbf3cb1a755acf95a00b37625f7628.tar.gz busybox-w32-7d5c881bd0cbf3cb1a755acf95a00b37625f7628.tar.bz2 busybox-w32-7d5c881bd0cbf3cb1a755acf95a00b37625f7628.zip |
make_single_applets.sh: SH_IS_HUSH needs special handling too
Well, in fact it works (make oldconfig throws only a warning when it sees
both SH_IS_HUSH=y and SH_IS_NONE=y), but let's be nice.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-x | make_single_applets.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make_single_applets.sh b/make_single_applets.sh index 705f9821c..00f502eda 100755 --- a/make_single_applets.sh +++ b/make_single_applets.sh | |||
@@ -39,11 +39,11 @@ for app in $apps; do | |||
39 | echo "CONFIG_${app}=y" >.config | 39 | echo "CONFIG_${app}=y" >.config |
40 | echo "$allno" | sed "/^# CONFIG_${app} is not set\$/d" >>.config | 40 | echo "$allno" | sed "/^# CONFIG_${app} is not set\$/d" >>.config |
41 | 41 | ||
42 | if test x"${app}" != x"SH_IS_ASH"; then | 42 | if test x"${app}" != x"SH_IS_ASH" && test x"${app}" != x"SH_IS_HUSH"; then |
43 | # $allno has all choices for "sh" aliasing at off. | 43 | # $allno has all choices for "sh" aliasing set to off. |
44 | # "sh" aliasing defaults to "ash", not none. | 44 | # "sh" aliasing defaults to "ash", not none. |
45 | # without this fix, "make oldconfig" sets it wrong, | 45 | # without this fix, "make oldconfig" sets it wrong, |
46 | # resulting in NUM_APPLETS = 2 | 46 | # resulting in NUM_APPLETS = 2 (the second applet is "sh") |
47 | sed '/CONFIG_SH_IS_NONE/d' -i .config | 47 | sed '/CONFIG_SH_IS_NONE/d' -i .config |
48 | echo "CONFIG_SH_IS_NONE=y" >>.config | 48 | echo "CONFIG_SH_IS_NONE=y" >>.config |
49 | fi | 49 | fi |
@@ -52,7 +52,7 @@ for app in $apps; do | |||
52 | : $((fail++)) | 52 | : $((fail++)) |
53 | echo "Config error for ${app}" | 53 | echo "Config error for ${app}" |
54 | mv .config busybox_config_${app} | 54 | mv .config busybox_config_${app} |
55 | elif ! make $makeopts >busybox_make_${app}.log 2>&1; then | 55 | elif ! make $makeopts >>busybox_make_${app}.log 2>&1; then |
56 | : $((fail++)) | 56 | : $((fail++)) |
57 | echo "Build error for ${app}" | 57 | echo "Build error for ${app}" |
58 | mv .config busybox_config_${app} | 58 | mv .config busybox_config_${app} |