diff options
| author | Denys Vlasenko | 2016-12-23 16:49:07 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2016-12-23 16:56:43 +0100 |
| commit | 0b8835861b2e43cb45becdb560877bcc89aea827 (patch) | |
| tree | ed8dedb7521a120702e8d17ebecfb68e2c5c1103 /make_single_applets.sh | |
| parent | 04c1a2a2c4a5faaa1600ed0831c9a1be17dbdb3f (diff) | |
| download | busybox-0b8835861b2e43cb45becdb560877bcc89aea827.zip busybox-0b8835861b2e43cb45becdb560877bcc89aea827.tar.gz | |
Make it possible to select "sh" and "bash" aliases without selecting ash or hush
The same can be done for msh, but we are probably better off just deleting it
in a next versio or two.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'make_single_applets.sh')
| -rwxr-xr-x | make_single_applets.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/make_single_applets.sh b/make_single_applets.sh index 6473e4d..705f982 100755 --- a/make_single_applets.sh +++ b/make_single_applets.sh @@ -26,6 +26,7 @@ allno="$cfg" for app in $apps; do allno="`echo "$allno" | sed "s/^CONFIG_${app}=y\$/# CONFIG_${app} is not set/"`" done +#echo "$allno" >.config_allno # Turn on each applet individually and build single-applet executable fail=0 @@ -37,6 +38,16 @@ for app in $apps; do mv .config .config.SV 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. + # "sh" aliasing defaults to "ash", not none. + # without this fix, "make oldconfig" sets it wrong, + # resulting in NUM_APPLETS = 2 + sed '/CONFIG_SH_IS_NONE/d' -i .config + echo "CONFIG_SH_IS_NONE=y" >>.config + fi + if ! yes '' | make oldconfig >busybox_make_${app}.log 2>&1; then : $((fail++)) echo "Config error for ${app}" |