Merge remote-tracking branch 'toybox/master' into HEAD am: 52a5544db4

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

diff --git a/.config b/.config
index eb8069e..1c83bed 100644 (file)
--- a/.config
+++ b/.config
@@ -23,6 +23,7 @@ CONFIG_TOYBOX_LIBCRYPTO=y
 # CONFIG_TOYBOX_MUSL_NOMMU_IS_BROKEN is not set
 CONFIG_TOYBOX_NORECURSE=y
 CONFIG_TOYBOX_ON_ANDROID=y
+# CONFIG_TOYBOX_PEDANTIC_ARGS is not set
 CONFIG_TOYBOX_SELINUX=y
 # CONFIG_TOYBOX_SHADOW is not set
 # CONFIG_TOYBOX_SMACK is not set
@@ -45,8 +46,8 @@ CONFIG_BLKID=y
 CONFIG_BLOCKDEV=y
 # CONFIG_BOOTCHARTD is not set
 # CONFIG_BRCTL is not set
-CONFIG_BUNZIP2=y
-CONFIG_BZCAT=y
+# CONFIG_BUNZIP2 is not set
+# CONFIG_BZCAT is not set
 CONFIG_CAL=y
 # CONFIG_CATV is not set
 CONFIG_CAT_V=y
@@ -82,7 +83,7 @@ CONFIG_DF=y
 # CONFIG_DHCP6 is not set
 # CONFIG_DHCPD is not set
 # CONFIG_DHCP is not set
-# CONFIG_DIFF is not set
+CONFIG_DIFF=y
 CONFIG_DIRNAME=y
 CONFIG_DMESG=y
 CONFIG_DOS2UNIX=y