PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move guts of "make change" to scripts/change.sh, don't try to build sh or help standalone.

Browse Source 
sh builtin commands need multiplexer, help describes other enabled commands.
This commit is contained in:
Rob Landley 2015-02-14 01:08:15 -06:00
parent 67d9ea5a81
commit 45962a70e0
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -11,7 +11,7 @@ toybox toybox_unstripped: toybox_stuff
scripts/make.sh
.PHONY: clean distclean baseline bloatcheck install install_flat \
uinstall uninstall_flat test tests help toybox_stuff
uinstall uninstall_flat test tests help toybox_stuff change
include kconfig/Makefile
@ -46,14 +46,7 @@ uninstall:
scripts/install.sh --long --uninstall
change:
@NOBUILD=1 scripts/make.sh > /dev/null&& \
$(HOSTCC) -I . scripts/install.c -o generated/instlist && \
export PREFIX=$${PREFIX:-change/} && \
mkdir -p "$$PREFIX" && \
for i in $$(generated/instlist); \
do echo -n "$$i " && \
scripts/single.sh $$i > /dev/null || touch $$PREFIX/$${i}.bad; \
done
scripts/change.sh
clean::
rm -rf toybox toybox_unstripped generated change .singleconfig*

19
scripts/change.sh Executable file
View File

@ -0,0 +1,19 @@
#!/bin/bash
# build each command as a standalone executable
NOBUILD=1 scripts/make.sh > /dev/null &&
${HOSTCC:-cc} -I . scripts/install.c -o generated/instlist &&
export PREFIX=${PREFIX:-change/} &&
mkdir -p "$PREFIX" || exit 1
# Build all the commands standalone except:
# sh - shell builtins like "cd" and "exit" need the multiplexer
# help - needs to know what other commands are enabled (use command --help)
for i in $(generated/instlist | egrep -vw "sh|help")
do
echo -n "$i " &&
scripts/single.sh $i > /dev/null || touch $PREFIX/${i}.bad
done