summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-07-30 13:56:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 22:24:14 +0100
commit35f02c930e18bd745cbd7d25893914a2477f9bcc (patch)
tree6a81651e0240d21def15e140a788690b10daf309
parent7ea959511d80616e3bb2bf88f7c5447e3aae2dc7 (diff)
downloadpoky-35f02c930e18bd745cbd7d25893914a2477f9bcc.tar.gz
busybox: refresh defconfig for busybox v1.23.2
The current oe-core busybox defconfig dates back to busybox v1.20.2, so configure options introduced in busybox v1.21.x, v1.22.x and v1.23.x take on default values when the oe-core defconfig is run through 'make oldconfig'. (From OE-Core rev: f3a95b6e00482de10f4698a3ab8cead336d11e9e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig47
1 files changed, 43 insertions, 4 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index ebe9354e19..357011ce5d 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.20.2 3# Busybox version: 1.23.2
4# Mon Aug 20 17:01:45 2012 4# Thu Jul 30 11:00:00 2015
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -37,12 +37,14 @@ CONFIG_LAST_SUPPORTED_WCHAR=0
37# CONFIG_UNICODE_NEUTRAL_TABLE is not set 37# CONFIG_UNICODE_NEUTRAL_TABLE is not set
38# CONFIG_UNICODE_PRESERVE_BROKEN is not set 38# CONFIG_UNICODE_PRESERVE_BROKEN is not set
39# CONFIG_PAM is not set 39# CONFIG_PAM is not set
40CONFIG_FEATURE_USE_SENDFILE=y
40CONFIG_LONG_OPTS=y 41CONFIG_LONG_OPTS=y
41CONFIG_FEATURE_DEVPTS=y 42CONFIG_FEATURE_DEVPTS=y
42# CONFIG_FEATURE_CLEAN_UP is not set 43# CONFIG_FEATURE_CLEAN_UP is not set
43CONFIG_FEATURE_UTMP=y 44CONFIG_FEATURE_UTMP=y
44# CONFIG_FEATURE_WTMP is not set 45# CONFIG_FEATURE_WTMP is not set
45CONFIG_FEATURE_PIDFILE=y 46CONFIG_FEATURE_PIDFILE=y
47CONFIG_PID_FILE_PATH="/var/run"
46CONFIG_FEATURE_SUID=y 48CONFIG_FEATURE_SUID=y
47CONFIG_FEATURE_SUID_CONFIG=y 49CONFIG_FEATURE_SUID_CONFIG=y
48CONFIG_FEATURE_SUID_CONFIG_QUIET=y 50CONFIG_FEATURE_SUID_CONFIG_QUIET=y
@@ -73,6 +75,7 @@ CONFIG_EXTRA_LDLIBS=""
73# 75#
74# CONFIG_DEBUG is not set 76# CONFIG_DEBUG is not set
75# CONFIG_DEBUG_PESSIMIZE is not set 77# CONFIG_DEBUG_PESSIMIZE is not set
78# CONFIG_UNIT_TEST is not set
76# CONFIG_WERROR is not set 79# CONFIG_WERROR is not set
77CONFIG_NO_DEBUG_LIB=y 80CONFIG_NO_DEBUG_LIB=y
78# CONFIG_DMALLOC is not set 81# CONFIG_DMALLOC is not set
@@ -97,6 +100,7 @@ CONFIG_FEATURE_SYSTEMD=y
97CONFIG_FEATURE_RTMINMAX=y 100CONFIG_FEATURE_RTMINMAX=y
98CONFIG_PASSWORD_MINLEN=6 101CONFIG_PASSWORD_MINLEN=6
99CONFIG_MD5_SMALL=1 102CONFIG_MD5_SMALL=1
103CONFIG_SHA3_SMALL=1
100CONFIG_FEATURE_FAST_TOP=y 104CONFIG_FEATURE_FAST_TOP=y
101# CONFIG_FEATURE_ETC_NETWORKS is not set 105# CONFIG_FEATURE_ETC_NETWORKS is not set
102CONFIG_FEATURE_USE_TERMIOS=y 106CONFIG_FEATURE_USE_TERMIOS=y
@@ -182,13 +186,16 @@ CONFIG_FEATURE_DATE_COMPAT=y
182# CONFIG_HOSTID is not set 186# CONFIG_HOSTID is not set
183CONFIG_ID=y 187CONFIG_ID=y
184CONFIG_GROUPS=y 188CONFIG_GROUPS=y
189CONFIG_SHUF=y
185CONFIG_TEST=y 190CONFIG_TEST=y
186CONFIG_FEATURE_TEST_64=y 191CONFIG_FEATURE_TEST_64=y
187CONFIG_TOUCH=y 192CONFIG_TOUCH=y
193CONFIG_FEATURE_TOUCH_NODEREF=y
188CONFIG_FEATURE_TOUCH_SUSV3=y 194CONFIG_FEATURE_TOUCH_SUSV3=y
189CONFIG_TR=y 195CONFIG_TR=y
190CONFIG_FEATURE_TR_CLASSES=y 196CONFIG_FEATURE_TR_CLASSES=y
191# CONFIG_FEATURE_TR_EQUIV is not set 197# CONFIG_FEATURE_TR_EQUIV is not set
198CONFIG_UNLINK=y
192# CONFIG_BASE64 is not set 199# CONFIG_BASE64 is not set
193CONFIG_WHO=y 200CONFIG_WHO=y
194CONFIG_USERS=y 201CONFIG_USERS=y
@@ -264,6 +271,7 @@ CONFIG_SEQ=y
264# CONFIG_SHA1SUM is not set 271# CONFIG_SHA1SUM is not set
265# CONFIG_SHA256SUM is not set 272# CONFIG_SHA256SUM is not set
266# CONFIG_SHA512SUM is not set 273# CONFIG_SHA512SUM is not set
274CONFIG_SHA3SUM=y
267CONFIG_SLEEP=y 275CONFIG_SLEEP=y
268CONFIG_FEATURE_FANCY_SLEEP=y 276CONFIG_FEATURE_FANCY_SLEEP=y
269# CONFIG_FEATURE_FLOAT_SLEEP is not set 277# CONFIG_FEATURE_FLOAT_SLEEP is not set
@@ -296,6 +304,11 @@ CONFIG_WHOAMI=y
296CONFIG_YES=y 304CONFIG_YES=y
297 305
298# 306#
307# Common options
308#
309CONFIG_FEATURE_VERBOSE=y
310
311#
299# Common options for cp and mv 312# Common options for cp and mv
300# 313#
301# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set 314# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
@@ -311,7 +324,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
311CONFIG_FEATURE_HUMAN_READABLE=y 324CONFIG_FEATURE_HUMAN_READABLE=y
312 325
313# 326#
314# Common options for md5sum, sha1sum, sha256sum, sha512sum 327# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
315# 328#
316CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y 329CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
317 330
@@ -363,6 +376,7 @@ CONFIG_WHICH=y
363# 376#
364CONFIG_AWK=y 377CONFIG_AWK=y
365CONFIG_FEATURE_AWK_LIBM=y 378CONFIG_FEATURE_AWK_LIBM=y
379CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
366CONFIG_CMP=y 380CONFIG_CMP=y
367CONFIG_DIFF=y 381CONFIG_DIFF=y
368# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set 382# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
@@ -384,6 +398,9 @@ CONFIG_FEATURE_VI_USE_SIGNALS=y
384# CONFIG_FEATURE_VI_SET is not set 398# CONFIG_FEATURE_VI_SET is not set
385CONFIG_FEATURE_VI_WIN_RESIZE=y 399CONFIG_FEATURE_VI_WIN_RESIZE=y
386# CONFIG_FEATURE_VI_ASK_TERMINAL is not set 400# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
401CONFIG_FEATURE_VI_UNDO=y
402CONFIG_FEATURE_VI_UNDO_QUEUE=y
403CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
387CONFIG_FEATURE_ALLOW_EXEC=y 404CONFIG_FEATURE_ALLOW_EXEC=y
388 405
389# 406#
@@ -400,6 +417,7 @@ CONFIG_FEATURE_FIND_MAXDEPTH=y
400CONFIG_FEATURE_FIND_NEWER=y 417CONFIG_FEATURE_FIND_NEWER=y
401# CONFIG_FEATURE_FIND_INUM is not set 418# CONFIG_FEATURE_FIND_INUM is not set
402CONFIG_FEATURE_FIND_EXEC=y 419CONFIG_FEATURE_FIND_EXEC=y
420CONFIG_FEATURE_FIND_EXEC_PLUS=y
403CONFIG_FEATURE_FIND_USER=y 421CONFIG_FEATURE_FIND_USER=y
404CONFIG_FEATURE_FIND_GROUP=y 422CONFIG_FEATURE_FIND_GROUP=y
405CONFIG_FEATURE_FIND_NOT=y 423CONFIG_FEATURE_FIND_NOT=y
@@ -421,6 +439,7 @@ CONFIG_XARGS=y
421# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set 439# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
422# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set 440# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
423# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set 441# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
442CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
424 443
425# 444#
426# Init Utilities 445# Init Utilities
@@ -457,6 +476,7 @@ CONFIG_USE_BB_CRYPT=y
457# CONFIG_ADDUSER is not set 476# CONFIG_ADDUSER is not set
458# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set 477# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
459# CONFIG_FEATURE_CHECK_NAMES is not set 478# CONFIG_FEATURE_CHECK_NAMES is not set
479CONFIG_LAST_ID=60000
460CONFIG_FIRST_SYSTEM_ID=100 480CONFIG_FIRST_SYSTEM_ID=100
461CONFIG_LAST_SYSTEM_ID=999 481CONFIG_LAST_SYSTEM_ID=999
462# CONFIG_ADDGROUP is not set 482# CONFIG_ADDGROUP is not set
@@ -525,6 +545,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
525# Linux System Utilities 545# Linux System Utilities
526# 546#
527# CONFIG_BLOCKDEV is not set 547# CONFIG_BLOCKDEV is not set
548CONFIG_FATATTR=y
549CONFIG_FSTRIM=y
528# CONFIG_MDEV is not set 550# CONFIG_MDEV is not set
529# CONFIG_FEATURE_MDEV_CONF is not set 551# CONFIG_FEATURE_MDEV_CONF is not set
530# CONFIG_FEATURE_MDEV_RENAME is not set 552# CONFIG_FEATURE_MDEV_RENAME is not set
@@ -595,6 +617,7 @@ CONFIG_RDATE=y
595# CONFIG_SCRIPTREPLAY is not set 617# CONFIG_SCRIPTREPLAY is not set
596# CONFIG_SETARCH is not set 618# CONFIG_SETARCH is not set
597CONFIG_SWAPONOFF=y 619CONFIG_SWAPONOFF=y
620CONFIG_FEATURE_SWAPON_DISCARD=y
598CONFIG_FEATURE_SWAPON_PRI=y 621CONFIG_FEATURE_SWAPON_PRI=y
599CONFIG_SWITCH_ROOT=y 622CONFIG_SWITCH_ROOT=y
600CONFIG_UMOUNT=y 623CONFIG_UMOUNT=y
@@ -607,9 +630,15 @@ CONFIG_FEATURE_MOUNT_LOOP=y
607CONFIG_FEATURE_MOUNT_LOOP_CREATE=y 630CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
608# CONFIG_FEATURE_MTAB_SUPPORT is not set 631# CONFIG_FEATURE_MTAB_SUPPORT is not set
609CONFIG_VOLUMEID=y 632CONFIG_VOLUMEID=y
633
634#
635# Filesystem/Volume identification
636#
610# CONFIG_FEATURE_VOLUMEID_BTRFS is not set 637# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
611# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set 638# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
639CONFIG_FEATURE_VOLUMEID_EXFAT=y
612CONFIG_FEATURE_VOLUMEID_EXT=y 640CONFIG_FEATURE_VOLUMEID_EXT=y
641CONFIG_FEATURE_VOLUMEID_F2FS=y
613CONFIG_FEATURE_VOLUMEID_FAT=y 642CONFIG_FEATURE_VOLUMEID_FAT=y
614# CONFIG_FEATURE_VOLUMEID_HFS is not set 643# CONFIG_FEATURE_VOLUMEID_HFS is not set
615# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set 644# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
@@ -617,10 +646,12 @@ CONFIG_FEATURE_VOLUMEID_FAT=y
617# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set 646# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
618# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set 647# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
619# CONFIG_FEATURE_VOLUMEID_LUKS is not set 648# CONFIG_FEATURE_VOLUMEID_LUKS is not set
649CONFIG_FEATURE_VOLUMEID_NILFS=y
620# CONFIG_FEATURE_VOLUMEID_NTFS is not set 650# CONFIG_FEATURE_VOLUMEID_NTFS is not set
621# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set 651# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
622# CONFIG_FEATURE_VOLUMEID_REISERFS is not set 652# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
623# CONFIG_FEATURE_VOLUMEID_ROMFS is not set 653# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
654# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
624# CONFIG_FEATURE_VOLUMEID_SYSV is not set 655# CONFIG_FEATURE_VOLUMEID_SYSV is not set
625# CONFIG_FEATURE_VOLUMEID_UDF is not set 656# CONFIG_FEATURE_VOLUMEID_UDF is not set
626# CONFIG_FEATURE_VOLUMEID_XFS is not set 657# CONFIG_FEATURE_VOLUMEID_XFS is not set
@@ -747,13 +778,13 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
747# CONFIG_FTPD is not set 778# CONFIG_FTPD is not set
748# CONFIG_FEATURE_FTP_WRITE is not set 779# CONFIG_FEATURE_FTP_WRITE is not set
749# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set 780# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
781# CONFIG_FEATURE_FTP_AUTHENTICATION is not set
750# CONFIG_FTPGET is not set 782# CONFIG_FTPGET is not set
751# CONFIG_FTPPUT is not set 783# CONFIG_FTPPUT is not set
752# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set 784# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
753CONFIG_HOSTNAME=y 785CONFIG_HOSTNAME=y
754# CONFIG_HTTPD is not set 786# CONFIG_HTTPD is not set
755# CONFIG_FEATURE_HTTPD_RANGES is not set 787# CONFIG_FEATURE_HTTPD_RANGES is not set
756# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
757# CONFIG_FEATURE_HTTPD_SETUID is not set 788# CONFIG_FEATURE_HTTPD_SETUID is not set
758# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set 789# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
759# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set 790# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
@@ -810,6 +841,7 @@ CONFIG_NETSTAT=y
810CONFIG_NSLOOKUP=y 841CONFIG_NSLOOKUP=y
811# CONFIG_NTPD is not set 842# CONFIG_NTPD is not set
812# CONFIG_FEATURE_NTPD_SERVER is not set 843# CONFIG_FEATURE_NTPD_SERVER is not set
844# CONFIG_FEATURE_NTPD_CONF is not set
813# CONFIG_PSCAN is not set 845# CONFIG_PSCAN is not set
814CONFIG_ROUTE=y 846CONFIG_ROUTE=y
815# CONFIG_SLATTACH is not set 847# CONFIG_SLATTACH is not set
@@ -847,6 +879,7 @@ CONFIG_DUMPLEASES=y
847CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" 879CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
848CONFIG_UDHCPC=y 880CONFIG_UDHCPC=y
849CONFIG_FEATURE_UDHCPC_ARPING=y 881CONFIG_FEATURE_UDHCPC_ARPING=y
882CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
850# CONFIG_FEATURE_UDHCP_PORT is not set 883# CONFIG_FEATURE_UDHCP_PORT is not set
851CONFIG_UDHCP_DEBUG=0 884CONFIG_UDHCP_DEBUG=0
852# CONFIG_FEATURE_UDHCP_RFC3397 is not set 885# CONFIG_FEATURE_UDHCP_RFC3397 is not set
@@ -965,6 +998,7 @@ CONFIG_ASH_GETOPTS=y
965CONFIG_ASH_BUILTIN_ECHO=y 998CONFIG_ASH_BUILTIN_ECHO=y
966CONFIG_ASH_BUILTIN_PRINTF=y 999CONFIG_ASH_BUILTIN_PRINTF=y
967CONFIG_ASH_BUILTIN_TEST=y 1000CONFIG_ASH_BUILTIN_TEST=y
1001CONFIG_ASH_HELP=y
968# CONFIG_ASH_CMDCMD is not set 1002# CONFIG_ASH_CMDCMD is not set
969# CONFIG_ASH_MAIL is not set 1003# CONFIG_ASH_MAIL is not set
970CONFIG_ASH_OPTIMIZE_FOR_SIZE=y 1004CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
@@ -1014,6 +1048,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y
1014CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64 1048CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
1015CONFIG_LOGREAD=y 1049CONFIG_LOGREAD=y
1016CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y 1050CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
1051CONFIG_FEATURE_KMSG_SYSLOG=y
1017CONFIG_KLOGD=y 1052CONFIG_KLOGD=y
1053
1054#
1055# klogd should not be used together with syslog to kernel printk buffer
1056#
1018CONFIG_FEATURE_KLOGD_KLOGCTL=y 1057CONFIG_FEATURE_KLOGD_KLOGCTL=y
1019CONFIG_LOGGER=y 1058CONFIG_LOGGER=y