From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 23 Dec 2016 18:42:53 +0000 (+0100)
Subject: make_single_applets.sh: SH_IS_HUSH needs special handling too
X-Git-Tag: 1_27_0~299
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7d5c881bd0cbf3cb1a755acf95a00b37625f7628;p=oweals%2Fbusybox.git

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>
---

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}