diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2018-08-30 18:02:44 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 18:00:25 +0100 |
commit | 29108755c1c5a23855ab4dda59ea728781b9d75e (patch) | |
tree | 94da1d09be6d8da1ace653b6c9a61949e5cea8b8 /meta/recipes-core/busybox/busybox/defconfig | |
parent | 5b2a6e0edc9fd012f09735cf170717eeddaa05a7 (diff) | |
download | poky-29108755c1c5a23855ab4dda59ea728781b9d75e.tar.gz |
busybox: update to 1.29.2
- refresh busybox-udhcpc-no_deconfig.patch
- remove obsolete patches which are included in this update
- update defconfig
- Add newly required virtual/crypt depends [RB]
(From OE-Core rev: b9c7fdd4b204ab1c2466e9ec5d933bbc635fcc4f)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox/defconfig')
-rw-r--r-- | meta/recipes-core/busybox/busybox/defconfig | 46 |
1 files changed, 37 insertions, 9 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index 59d93c7079..f081f281cc 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig | |||
@@ -1,12 +1,12 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Busybox version: 1.27.2 | 3 | # Busybox version: 1.29.1 |
4 | # Wed Sep 27 08:56:13 2017 | 4 | # Thu Jul 19 11:09:46 2018 |
5 | # | 5 | # |
6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Busybox Settings | 9 | # Settings |
10 | # | 10 | # |
11 | # CONFIG_DESKTOP is not set | 11 | # CONFIG_DESKTOP is not set |
12 | # CONFIG_EXTRA_COMPAT is not set | 12 | # CONFIG_EXTRA_COMPAT is not set |
@@ -78,7 +78,7 @@ CONFIG_NO_DEBUG_LIB=y | |||
78 | # CONFIG_EFENCE is not set | 78 | # CONFIG_EFENCE is not set |
79 | 79 | ||
80 | # | 80 | # |
81 | # Busybox Library Tuning | 81 | # Library Tuning |
82 | # | 82 | # |
83 | # CONFIG_FEATURE_USE_BSS_TAIL is not set | 83 | # CONFIG_FEATURE_USE_BSS_TAIL is not set |
84 | CONFIG_FEATURE_RTMINMAX=y | 84 | CONFIG_FEATURE_RTMINMAX=y |
@@ -90,6 +90,7 @@ CONFIG_MD5_SMALL=1 | |||
90 | CONFIG_SHA3_SMALL=1 | 90 | CONFIG_SHA3_SMALL=1 |
91 | CONFIG_FEATURE_FAST_TOP=y | 91 | CONFIG_FEATURE_FAST_TOP=y |
92 | # CONFIG_FEATURE_ETC_NETWORKS is not set | 92 | # CONFIG_FEATURE_ETC_NETWORKS is not set |
93 | # CONFIG_FEATURE_ETC_SERVICES is not set | ||
93 | CONFIG_FEATURE_EDITING=y | 94 | CONFIG_FEATURE_EDITING=y |
94 | CONFIG_FEATURE_EDITING_MAX_LEN=1024 | 95 | CONFIG_FEATURE_EDITING_MAX_LEN=1024 |
95 | # CONFIG_FEATURE_EDITING_VI is not set | 96 | # CONFIG_FEATURE_EDITING_VI is not set |
@@ -321,6 +322,7 @@ CONFIG_TRUE=y | |||
321 | CONFIG_TTY=y | 322 | CONFIG_TTY=y |
322 | CONFIG_UNAME=y | 323 | CONFIG_UNAME=y |
323 | CONFIG_UNAME_OSNAME="GNU/Linux" | 324 | CONFIG_UNAME_OSNAME="GNU/Linux" |
325 | # CONFIG_BB_ARCH is not set | ||
324 | CONFIG_UNIQ=y | 326 | CONFIG_UNIQ=y |
325 | CONFIG_UNLINK=y | 327 | CONFIG_UNLINK=y |
326 | CONFIG_USLEEP=y | 328 | CONFIG_USLEEP=y |
@@ -393,6 +395,14 @@ CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y | |||
393 | CONFIG_WHICH=y | 395 | CONFIG_WHICH=y |
394 | 396 | ||
395 | # | 397 | # |
398 | # klibc-utils | ||
399 | # | ||
400 | # CONFIG_MINIPS is not set | ||
401 | # CONFIG_NUKE is not set | ||
402 | # CONFIG_RESUME is not set | ||
403 | # CONFIG_RUN_INIT is not set | ||
404 | |||
405 | # | ||
396 | # Editors | 406 | # Editors |
397 | # | 407 | # |
398 | CONFIG_AWK=y | 408 | CONFIG_AWK=y |
@@ -678,6 +688,10 @@ CONFIG_FEATURE_MOUNT_LOOP=y | |||
678 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y | 688 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y |
679 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | 689 | # CONFIG_FEATURE_MTAB_SUPPORT is not set |
680 | # CONFIG_VOLUMEID is not set | 690 | # CONFIG_VOLUMEID is not set |
691 | |||
692 | # | ||
693 | # Filesystem/Volume identification | ||
694 | # | ||
681 | # CONFIG_FEATURE_VOLUMEID_BCACHE is not set | 695 | # CONFIG_FEATURE_VOLUMEID_BCACHE is not set |
682 | # CONFIG_FEATURE_VOLUMEID_BTRFS is not set | 696 | # CONFIG_FEATURE_VOLUMEID_BTRFS is not set |
683 | # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set | 697 | # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set |
@@ -725,6 +739,7 @@ CONFIG_FEATURE_CROND_DIR="" | |||
725 | # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set | 739 | # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set |
726 | # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set | 740 | # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set |
727 | # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set | 741 | # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set |
742 | # CONFIG_HEXEDIT is not set | ||
728 | # CONFIG_I2CGET is not set | 743 | # CONFIG_I2CGET is not set |
729 | # CONFIG_I2CSET is not set | 744 | # CONFIG_I2CSET is not set |
730 | # CONFIG_I2CDUMP is not set | 745 | # CONFIG_I2CDUMP is not set |
@@ -807,6 +822,7 @@ CONFIG_MICROCOM=y | |||
807 | # CONFIG_RUNLEVEL is not set | 822 | # CONFIG_RUNLEVEL is not set |
808 | # CONFIG_RX is not set | 823 | # CONFIG_RX is not set |
809 | # CONFIG_SETSID is not set | 824 | # CONFIG_SETSID is not set |
825 | # CONFIG_SETFATTR is not set | ||
810 | CONFIG_STRINGS=y | 826 | CONFIG_STRINGS=y |
811 | CONFIG_TIME=y | 827 | CONFIG_TIME=y |
812 | # CONFIG_TIMEOUT is not set | 828 | # CONFIG_TIMEOUT is not set |
@@ -912,6 +928,8 @@ CONFIG_FEATURE_FANCY_PING=y | |||
912 | CONFIG_ROUTE=y | 928 | CONFIG_ROUTE=y |
913 | # CONFIG_SLATTACH is not set | 929 | # CONFIG_SLATTACH is not set |
914 | # CONFIG_SSL_CLIENT is not set | 930 | # CONFIG_SSL_CLIENT is not set |
931 | # CONFIG_TC is not set | ||
932 | # CONFIG_FEATURE_TC_INGRESS is not set | ||
915 | # CONFIG_TCPSVD is not set | 933 | # CONFIG_TCPSVD is not set |
916 | # CONFIG_UDPSVD is not set | 934 | # CONFIG_UDPSVD is not set |
917 | CONFIG_TELNET=y | 935 | CONFIG_TELNET=y |
@@ -949,13 +967,9 @@ CONFIG_FEATURE_WGET_HTTPS=y | |||
949 | # CONFIG_FEATURE_WGET_OPENSSL is not set | 967 | # CONFIG_FEATURE_WGET_OPENSSL is not set |
950 | # CONFIG_WHOIS is not set | 968 | # CONFIG_WHOIS is not set |
951 | # CONFIG_ZCIP is not set | 969 | # CONFIG_ZCIP is not set |
952 | # CONFIG_UDHCPC6 is not set | ||
953 | # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set | ||
954 | # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set | ||
955 | # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set | ||
956 | CONFIG_UDHCPD=y | 970 | CONFIG_UDHCPD=y |
957 | # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set | ||
958 | # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set | 971 | # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set |
972 | # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set | ||
959 | CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" | 973 | CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" |
960 | CONFIG_DUMPLEASES=y | 974 | CONFIG_DUMPLEASES=y |
961 | # CONFIG_DHCPRELAY is not set | 975 | # CONFIG_DHCPRELAY is not set |
@@ -963,6 +977,15 @@ CONFIG_UDHCPC=y | |||
963 | CONFIG_FEATURE_UDHCPC_ARPING=y | 977 | CONFIG_FEATURE_UDHCPC_ARPING=y |
964 | CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y | 978 | CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y |
965 | CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" | 979 | CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" |
980 | # CONFIG_UDHCPC6 is not set | ||
981 | # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set | ||
982 | # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set | ||
983 | # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set | ||
984 | # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set | ||
985 | |||
986 | # | ||
987 | # Common options for DHCP applets | ||
988 | # | ||
966 | # CONFIG_FEATURE_UDHCP_PORT is not set | 989 | # CONFIG_FEATURE_UDHCP_PORT is not set |
967 | CONFIG_UDHCP_DEBUG=0 | 990 | CONFIG_UDHCP_DEBUG=0 |
968 | # CONFIG_FEATURE_UDHCP_RFC3397 is not set | 991 | # CONFIG_FEATURE_UDHCP_RFC3397 is not set |
@@ -1045,6 +1068,7 @@ CONFIG_WATCH=y | |||
1045 | # CONFIG_SV is not set | 1068 | # CONFIG_SV is not set |
1046 | CONFIG_SV_DEFAULT_SERVICE_DIR="" | 1069 | CONFIG_SV_DEFAULT_SERVICE_DIR="" |
1047 | # CONFIG_SVC is not set | 1070 | # CONFIG_SVC is not set |
1071 | # CONFIG_SVOK is not set | ||
1048 | # CONFIG_SVLOGD is not set | 1072 | # CONFIG_SVLOGD is not set |
1049 | # CONFIG_CHCON is not set | 1073 | # CONFIG_CHCON is not set |
1050 | # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set | 1074 | # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set |
@@ -1134,6 +1158,10 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y | |||
1134 | # System Logging Utilities | 1158 | # System Logging Utilities |
1135 | # | 1159 | # |
1136 | CONFIG_KLOGD=y | 1160 | CONFIG_KLOGD=y |
1161 | |||
1162 | # | ||
1163 | # klogd should not be used together with syslog to kernel printk buffer | ||
1164 | # | ||
1137 | CONFIG_FEATURE_KLOGD_KLOGCTL=y | 1165 | CONFIG_FEATURE_KLOGD_KLOGCTL=y |
1138 | CONFIG_LOGGER=y | 1166 | CONFIG_LOGGER=y |
1139 | # CONFIG_LOGREAD is not set | 1167 | # CONFIG_LOGREAD is not set |