OSDN Git Service
(root)
/
android-x86
/
external-toybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'toybox/master' into HEAD
[android-x86/external-toybox.git]
/
.config
diff --git
a/.config
b/.config
index
2cef7fd
..
db28cb2
100644
(file)
--- a/
.config
+++ b/
.config
@@
-41,6
+41,7
@@
CONFIG_ECHO=y
CONFIG_ENV=y
CONFIG_EXPAND=y
CONFIG_FALSE=y
CONFIG_ENV=y
CONFIG_EXPAND=y
CONFIG_FALSE=y
+# CONFIG_FILE is not set
CONFIG_FIND=y
CONFIG_GREP=y
CONFIG_EGREP=y
CONFIG_FIND=y
CONFIG_GREP=y
CONFIG_EGREP=y
@@
-96,6
+97,7
@@
CONFIG_TIME=y
CONFIG_TOUCH=y
CONFIG_TRUE=y
CONFIG_TTY=y
CONFIG_TOUCH=y
CONFIG_TRUE=y
CONFIG_TTY=y
+CONFIG_ULIMIT=y
CONFIG_UNAME=y
CONFIG_UNIQ=y
# CONFIG_UNLINK is not set
CONFIG_UNAME=y
CONFIG_UNIQ=y
# CONFIG_UNLINK is not set
@@
-164,9
+166,10
@@
CONFIG_NETSTAT=y
# CONFIG_OPENVT is not set
# CONFIG_DEALLOCVT is not set
CONFIG_PGREP=y
# CONFIG_OPENVT is not set
# CONFIG_DEALLOCVT is not set
CONFIG_PGREP=y
+CONFIG_PKILL=y
# CONFIG_PING is not set
# CONFIG_RESET is not set
# CONFIG_PING is not set
# CONFIG_RESET is not set
-CONFIG_ROUTE=y
+# CONFIG_ROUTE is not set
# CONFIG_SH is not set
# CONFIG_EXIT is not set
# CONFIG_CD is not set
# CONFIG_SH is not set
# CONFIG_EXIT is not set
# CONFIG_CD is not set
@@
-185,6
+188,7
@@
CONFIG_TR=y
# CONFIG_USERADD is not set
# CONFIG_USERDEL is not set
# CONFIG_WATCH is not set
# CONFIG_USERADD is not set
# CONFIG_USERDEL is not set
# CONFIG_WATCH is not set
+# CONFIG_WGET is not set
# CONFIG_XZCAT is not set
#
# CONFIG_XZCAT is not set
#
@@
-255,7
+259,7
@@
CONFIG_SETSID=y
CONFIG_STAT=y
CONFIG_SWAPOFF=y
CONFIG_SWAPON=y
CONFIG_STAT=y
CONFIG_SWAPOFF=y
CONFIG_SWAPON=y
-CONFIG_SWITCH_ROOT=y
+# CONFIG_SWITCH_ROOT is not set
CONFIG_SYSCTL=y
CONFIG_TAC=y
CONFIG_TASKSET=y
CONFIG_SYSCTL=y
CONFIG_TAC=y
CONFIG_TASKSET=y
@@
-326,7
+330,7
@@
CONFIG_TOYBOX_HELP=y
CONFIG_TOYBOX_HELP_DASHDASH=y
CONFIG_TOYBOX_I18N=y
# CONFIG_TOYBOX_FREE is not set
CONFIG_TOYBOX_HELP_DASHDASH=y
CONFIG_TOYBOX_I18N=y
# CONFIG_TOYBOX_FREE is not set
-# CONFIG_TOYBOX_NORECURSE is not set
+CONFIG_TOYBOX_NORECURSE=y
# CONFIG_TOYBOX_DEBUG is not set
CONFIG_TOYBOX_UID_SYS=100
CONFIG_TOYBOX_UID_USR=500
# CONFIG_TOYBOX_DEBUG is not set
CONFIG_TOYBOX_UID_SYS=100
CONFIG_TOYBOX_UID_USR=500