aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/make.sh5
-rwxr-xr-xscripts/single.sh22
2 files changed, 18 insertions, 9 deletions
diff --git a/scripts/make.sh b/scripts/make.sh
index b91576ee..207a0827 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -56,7 +56,10 @@ fi
[ ! -z "$V" ] && echo "Which C files to build..."
# Extract a list of toys/*/*.c files to compile from the data in $KCONFIG_CONFIG
-TOYFILES="$(egrep -l "TOY[(]($(sed -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' [A-Z]' '|[a-z]'))[ ,]" toys/*/*.c)"
+# (First command names, then filenames with relevant {NEW,OLD}TOY() macro.)
+
+TOYFILES="$(sed -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' [A-Z]' '|[a-z]')"
+TOYFILES="$(egrep -l "TOY[(]($TOYFILES)[ ,]" toys/*/*.c)"
BUILD="$(echo ${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE)"
FILES="$(echo lib/*.c main.c $TOYFILES)"
diff --git a/scripts/single.sh b/scripts/single.sh
index c6416a35..ce8695c0 100755
--- a/scripts/single.sh
+++ b/scripts/single.sh
@@ -10,18 +10,24 @@ fi
for i in "$@"
do
+
+ TOYFILE="$(egrep -l "TOY[(]($i)[ ,]" toys/*/*.c)"
+
+ if [ -z "$TOYFILE" ]
+ then
+ echo "Unknown command '$i'" >&2
+ exit 1
+ fi
+
+ DEPENDS="$(sed -n 's/^[ \t]*depends on //;T;s/[!][A-Z0-9_]*//g;s/ *&& */|/g;p' $TOYFILE | xargs | tr ' ' '|')"
+
NAME=$(echo $i | tr a-z- A-Z_)
export KCONFIG_CONFIG=.singleconfig
- USET="is not set"
make allnoconfig > /dev/null &&
- sed -i -e "s/\(CONFIG_TOYBOX\)=y/# \1 $USET/" \
- -e "s/# \(CONFIG_$NAME\) $USET/\1=y/" \
- -e "s/# \(CONFIG_${NAME}_.*\) $USET/\1=y/" \
- -e "s/# \(CONFIG_TOYBOX_HELP.*\) $USET/\1=y/" \
- -e "s/# \(CONFIG_TOYBOX_I18N\) $USET/\1=y/" \
- -e "s/# \(CONFIG_TOYBOX_FLOAT\) $USET/\1=y/" \
- "$KCONFIG_CONFIG" &&
+ sed -ri -e "s/CONFIG_TOYBOX=y/# CONFIG_TOYBOX is not set/;t" \
+ -e "s/# (CONFIG_(TOYBOX(|_HELP|_I18N|_FLOAT)|$NAME|${NAME}_.*${DEPENDS:+|$DEPENDS})) is not set/\1=y/" \
+ "$KCONFIG_CONFIG" &&
make &&
mv toybox $PREFIX$i || exit 1
done