emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make_single_applets.sh: SH_IS_HUSH needs special handling too

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2016-12-23 19:42:53 +01:00
parent 0b8835861b
commit 7d5c881bd0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
make_single_applets.sh
View File

@ -39,11 +39,11 @@ for app in $apps; do
echo "CONFIG_${app}=y" >.config echo "CONFIG_${app}=y" >.config
echo "$allno" | sed "/^# CONFIG_${app} is not set\$/d" >>.config echo "$allno" | sed "/^# CONFIG_${app} is not set\$/d" >>.config
if test x"${app}" != x"SH_IS_ASH"; then if test x"${app}" != x"SH_IS_ASH" && test x"${app}" != x"SH_IS_HUSH"; then
# $allno has all choices for "sh" aliasing at off. # $allno has all choices for "sh" aliasing set to off.
# "sh" aliasing defaults to "ash", not none. # "sh" aliasing defaults to "ash", not none.
# without this fix, "make oldconfig" sets it wrong, # 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 sed '/CONFIG_SH_IS_NONE/d' -i .config
echo "CONFIG_SH_IS_NONE=y" >>.config echo "CONFIG_SH_IS_NONE=y" >>.config
fi fi
@ -52,7 +52,7 @@ for app in $apps; do
: $((fail++)) : $((fail++))
echo "Config error for ${app}" echo "Config error for ${app}"
mv .config busybox_config_${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++)) : $((fail++))
echo "Build error for ${app}" echo "Build error for ${app}"
mv .config busybox_config_${app} mv .config busybox_config_${app}