Merge remote-tracking branch 'toybox/master' into HEAD am: 14cafec540

[android-x86/external-toybox.git] / .config

diff --git a/.config b/.config
index b272011..d0de7b0 100644 (file)
--- a/.config
+++ b/.config
@@ -28,7 +28,7 @@ CONFIG_TOYBOX_ANDROID_SCHEDPOLICY=y
 CONFIG_TOYBOX_SELINUX=y
 # CONFIG_TOYBOX_SHADOW is not set
 # CONFIG_TOYBOX_SMACK is not set
-CONFIG_TOYBOX_SUID=y
+# CONFIG_TOYBOX_SUID is not set
 CONFIG_TOYBOX_UID_SYS=100
 CONFIG_TOYBOX_UID_USR=500
 # CONFIG_TOYBOX_UTMPX is not set
@@ -72,6 +72,7 @@ CONFIG_CPIO=y
 CONFIG_CP_MORE=y
 CONFIG_CP_PRESERVE=y
 CONFIG_CP=y
+# CONFIG_CRC32 is not set
 # CONFIG_CROND is not set
 # CONFIG_CRONTAB is not set
 CONFIG_CUT=y
@@ -105,6 +106,7 @@ CONFIG_FGREP=y
 CONFIG_FILE=y
 CONFIG_FIND=y
 CONFIG_FLOCK=y
+CONFIG_FMT=y
 # CONFIG_FOLD is not set
 CONFIG_FREERAMDISK=y
 CONFIG_FREE=y
@@ -116,15 +118,14 @@ CONFIG_FSFREEZE=y
 # CONFIG_FTPPUT is not set
 CONFIG_GETENFORCE=y
 CONFIG_GETFATTR=y
-CONFIG_GETPROP=y
+# CONFIG_GETPROP is not set
 # CONFIG_GETTY is not set
 CONFIG_GREP=y
 # CONFIG_GROUPADD is not set
 # CONFIG_GROUPDEL is not set
 CONFIG_GROUPS=y
-# CONFIG_GUNZIP is not set
-# CONFIG_GZIP_D is not set
-# CONFIG_GZIP is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
 CONFIG_HEAD=y
 # CONFIG_HELLO is not set
 CONFIG_HELP_EXTRAS=y
@@ -144,7 +145,7 @@ CONFIG_INSMOD=y
 CONFIG_INSTALL=y
 CONFIG_IONICE=y
 CONFIG_IORENICE=y
-# CONFIG_IOTOP is not set
+CONFIG_IOTOP=y
 # CONFIG_IPCRM is not set
 # CONFIG_IPCS is not set
 # CONFIG_IP is not set
@@ -166,8 +167,8 @@ CONFIG_LSATTR=y
 CONFIG_LS_COLOR=y
 CONFIG_LSMOD=y
 CONFIG_LSOF=y
-# CONFIG_LSPCI is not set
-CONFIG_LSPCI_TEXT=y
+CONFIG_LSPCI=y
+# CONFIG_LSPCI_TEXT is not set
 CONFIG_LSUSB=y
 CONFIG_LS=y
 CONFIG_LS_Z=y
@@ -266,6 +267,7 @@ CONFIG_START=y
 CONFIG_STAT=y
 CONFIG_STOP=y
 CONFIG_STRINGS=y
+CONFIG_STTY=y
 # CONFIG_SU is not set
 # CONFIG_SULOGIN is not set
 CONFIG_SWAPOFF=y
@@ -288,6 +290,7 @@ CONFIG_TEE=y
 # CONFIG_TEST is not set
 # CONFIG_TEST_MANY_OPTIONS is not set
 # CONFIG_TEST_SCANKEY is not set
+# CONFIG_TEST_UTF8TOWC is not set
 # CONFIG_TFTPD is not set
 # CONFIG_TFTP is not set
 CONFIG_TIMEOUT=y
@@ -329,4 +332,4 @@ CONFIG_XARGS=y
 CONFIG_XXD=y
 # CONFIG_XZCAT is not set
 CONFIG_YES=y
-# CONFIG_ZCAT is not set
+CONFIG_ZCAT=y