From fe3f55c540ed21005ba5bd981e098cb5dec64c37 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 23 Dec 2016 19:42:53 +0100 Subject: [PATCH] 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 --- make_single_applets.sh | 8 ++++---- 1 file 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 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} -- 2.25.1