diff options
| author | Rob Landley <rob@landley.net> | 2012-02-03 23:16:28 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2012-02-03 23:16:28 -0600 |
| commit | 27f5779a7a3d71cd26107d26330c67445341e879 (patch) | |
| tree | 4972135e57c3390a929d91a603359c80179088b8 | |
| parent | f83305e5fb4ab97df47825cd2c2ed4fad758e5b8 (diff) | |
| download | toybox-27f5779a7a3d71cd26107d26330c67445341e879.tar.gz | |
Add autodetect for container support.
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | scripts/genconfig.sh | 21 | ||||
| -rw-r--r-- | toys/unshare.c | 1 |
3 files changed, 19 insertions, 5 deletions
@@ -12,7 +12,7 @@ toybox toybox_unstripped: .config *.[ch] lib/*.[ch] toys/*.[ch] scripts/*.sh include kconfig/Makefile $(KCONFIG_TOP): generated/Config.in -generated/Config.in: toys/*.c +generated/Config.in: toys/*.c scripts/genconfig.sh scripts/genconfig.sh HOSTCC:=cc diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index 126e52ef..1911efc6 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -4,16 +4,29 @@ # before menuconfig. (It's called again from scripts/make.sh just to be sure.) mkdir -p generated +OUTFILE=generated/Config.in -function genconfig() +genconfig() { - for i in $(echo toys/*.c | sort) + # Probe for container support on target + + echo -e "# container support\nconfig TOYBOX_CONTAINER\n\tbool" || return 1 + $CC -c -xc -o /dev/null - 2>/dev/null << EOF + #include <sched.h> + int x=CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWIPC|CLONE_NEWNET; +EOF + [ $? -eq 0 ] && DEFAULT=y || DEFAULT=n + echo -e "\tdefault $DEFAULT\n" || return 1 + + # extract config stanzas from each command source file, in alphabetical order + + for i in $(ls -1 toys/*.c) do # Grab the config block for Config.in echo "# $i" - sed -n '/^\*\//q;/^config [A-Z]/,$p' $i || exit 1 + sed -n '/^\*\//q;/^config [A-Z]/,$p' $i || return 1 echo done } -genconfig > generated/Config.in +genconfig > generated/Config.in || rm "$OUTFILE" diff --git a/toys/unshare.c b/toys/unshare.c index c708ebe9..6485e334 100644 --- a/toys/unshare.c +++ b/toys/unshare.c @@ -11,6 +11,7 @@ USE_UNSHARE(NEWTOY(unshare, "<1^nium", TOYFLAG_USR|TOYFLAG_BIN)) config UNSHARE bool "unshare" default y + depends on TOYBOX_CONTAINER help usage: unshare [-muin] COMMAND... |