diff options
| author | Denys Vlasenko | 2016-12-23 19:42:53 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2016-12-23 19:42:53 +0100 |
| commit | 7d5c881bd0cbf3cb1a755acf95a00b37625f7628 (patch) | |
| tree | 2ceca2504962d13bc783594fc32ef7a98d709e79 | |
| parent | 0b8835861b2e43cb45becdb560877bcc89aea827 (diff) | |
| download | busybox-7d5c881bd0cbf3cb1a755acf95a00b37625f7628.zip busybox-7d5c881bd0cbf3cb1a755acf95a00b37625f7628.tar.gz | |
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 705f982..00f502e 100755 --- a/make_single_applets.sh +++ b/make_single_applets.sh @@ -39,11 +39,11 @@ for app in $apps; do echo "CONFIG_${app}=y" >.config echo "$allno" | sed "/^# CONFIG_${app} is not set\$/d" >>.config - if test x"${app}" != x"SH_IS_ASH"; then - # $allno has all choices for "sh" aliasing at off. + if test x"${app}" != x"SH_IS_ASH" && test x"${app}" != x"SH_IS_HUSH"; then + # $allno has all choices for "sh" aliasing set to off. # "sh" aliasing defaults to "ash", not none. # without this fix, "make oldconfig" sets it wrong, - # resulting in NUM_APPLETS = 2 + # resulting in NUM_APPLETS = 2 (the second applet is "sh") sed '/CONFIG_SH_IS_NONE/d' -i .config echo "CONFIG_SH_IS_NONE=y" >>.config fi @@ -52,7 +52,7 @@ for app in $apps; do : $((fail++)) echo "Config error for ${app}" mv .config busybox_config_${app} - elif ! make $makeopts >busybox_make_${app}.log 2>&1; then + elif ! make $makeopts >>busybox_make_${app}.log 2>&1; then : $((fail++)) echo "Build error for ${app}" mv .config busybox_config_${app} |