From c795f1b32487df79c43998aa13745ddf5d3eb44c Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 20 Dec 2019 15:12:30 -0600 Subject: Making sh single build work broke other single builds. Fix them again. --- scripts/single.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'scripts/single.sh') diff --git a/scripts/single.sh b/scripts/single.sh index 41d1e33e..c40c6bcf 100755 --- a/scripts/single.sh +++ b/scripts/single.sh @@ -41,17 +41,15 @@ do then DEPENDS="$(sed -n 's/USE_\([^(]*\)(NEWTOY([^,]*,.*TOYFLAG_MAYFORK.*/\1/p' toys/*/*.c)" else - MPDEL="-e 's/CONFIG_TOYBOX=y/# CONFIG_TOYBOX is not set/;t'" + MPDEL='s/CONFIG_TOYBOX=y/# CONFIG_TOYBOX is not set/;t' fi # Enable stuff this command depends on - DEPENDS="$({ echo $DEPENDS; sed -n "/^config *$i"'$/,/^$/{s/^[ \t]*depends on //;T;s/[!][A-Z0-9_]*//g;s/ *&& */|/g;p}' $TOYFILE ;}| xargs | tr ' ' '|')" - + DEPENDS="$({ echo $DEPENDS; sed -n "/^config *$i"'$/,/^$/{s/^[ \t]*depends on //;T;s/[!][A-Z0-9_]*//g;s/ *&& */|/g;p}' $TOYFILE; sed -n 's/CONFIG_\(TOYBOX_[^=]*\)=y/\1/p' .config;}| xargs | tr ' ' '|')" NAME=$(echo $i | tr a-z- A-Z_) - sed -ri $MPDEL \ + sed -ri -e "$MPDEL" \ -e "s/# (CONFIG_($NAME|${NAME}_.*${DEPENDS:+|$DEPENDS})) is not set/\1=y/" \ - "$KCONFIG_CONFIG" && - grep "CONFIG_TOYBOX_" .config >> "$KCONFIG_CONFIG" || exit 1 + "$KCONFIG_CONFIG" || exit 1 #&& grep "CONFIG_TOYBOX_" .config >> "$KCONFIG_CONFIG" || exit 1 export OUTNAME="$PREFIX$i" rm -f "$OUTNAME" && -- cgit v1.2.3