aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/Config-defaults.in
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2021-01-31 16:15:53 -0800
committerHauke Mehrtens <hauke@hauke-m.de>2021-02-14 15:15:32 +0100
commit0275ee5dde7c36c925396779dd23d4f470ab40e1 (patch)
tree88e07de1fa39b6c9909478b0909e617523d6c830 /package/utils/busybox/Config-defaults.in
parent157cd0bd97bcfec8a34d4ebb558f37bee4f0515f (diff)
downloadupstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.tar.gz
upstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.tar.bz2
upstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.zip
busybox: update to 1.33
Remove stime backport. Remove static libgcc patch as upstream fixed it with BUSYBOX_DEFAULT_STATIC_LIBGCC which defauls to off. Remove date -k patch as it no longer applies. It's also pointless as busybox' hwclock utility can do the same thing. Remove ntpd patch as that seems to have been applied upstream. Add smalll patch fixing compilation with SELinux. Upstream commit 2496616b0a8d1c80cd1416b73a4847b59b9f969a renamed the variable without renaming it in the SELinux path. Refresh config and patches. Config refresh: Refresh commands, run after busybox is first built once: cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0 cd .. ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0/.config > Config-defaults.in Manual edits needed afterward: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt configTARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit 547f1ec) * editors/Config.in: Add USE_GLIBC dependency to BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commit f141090) * shell/Config.in : change at "Options common to all shells" the symbol SHELL_ASH --> BUSYBOX_CONFIG_SHELL_ASH (discussion in http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html Apparently our script does not see the hidden option while prepending config options with "BUSYBOX_CONFIG_" which leads to a missed dependency when the options are later evaluated.) * Edit Config.in files by adding quotes to sourced items in config/Config.in, networking/Config.in and util-linux/Config.in (commit 1da014f) Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [Added comments from Hannu Nyman to commit message] Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/utils/busybox/Config-defaults.in')
-rw-r--r--package/utils/busybox/Config-defaults.in48
1 files changed, 42 insertions, 6 deletions
diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index 8d237ad181..04148df267 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -85,9 +85,6 @@ config BUSYBOX_DEFAULT_FEATURE_SYSLOG_INFO
config BUSYBOX_DEFAULT_FEATURE_SYSLOG
bool
default y
-config BUSYBOX_DEFAULT_PLATFORM_LINUX
- bool
- default y
config BUSYBOX_DEFAULT_STATIC
bool
default n
@@ -130,6 +127,9 @@ config BUSYBOX_DEFAULT_USE_PORTABLE_CODE
config BUSYBOX_DEFAULT_STACK_OPTIMIZATION_386
bool
default n
+config BUSYBOX_DEFAULT_STATIC_LIBGCC
+ bool
+ default n
config BUSYBOX_DEFAULT_INSTALL_APPLET_SYMLINKS
bool
default y
@@ -169,6 +169,9 @@ config BUSYBOX_DEFAULT_UNIT_TEST
config BUSYBOX_DEFAULT_WERROR
bool
default n
+config BUSYBOX_DEFAULT_WARN_SIMPLE_MSG
+ bool
+ default n
config BUSYBOX_DEFAULT_NO_DEBUG_LIB
bool
default y
@@ -872,6 +875,9 @@ config BUSYBOX_DEFAULT_USLEEP
config BUSYBOX_DEFAULT_UUDECODE
bool
default n
+config BUSYBOX_DEFAULT_BASE32
+ bool
+ default n
config BUSYBOX_DEFAULT_BASE64
bool
default n
@@ -1160,6 +1166,9 @@ config BUSYBOX_DEFAULT_FEATURE_FIND_QUIT
config BUSYBOX_DEFAULT_FEATURE_FIND_DELETE
bool
default n
+config BUSYBOX_DEFAULT_FEATURE_FIND_EMPTY
+ bool
+ default n
config BUSYBOX_DEFAULT_FEATURE_FIND_PATH
bool
default y
@@ -1565,9 +1574,6 @@ config BUSYBOX_DEFAULT_FEATURE_GETOPT_LONG
config BUSYBOX_DEFAULT_HEXDUMP
bool
default y
-config BUSYBOX_DEFAULT_FEATURE_HEXDUMP_REVERSE
- bool
- default n
config BUSYBOX_DEFAULT_HD
bool
default n
@@ -1778,6 +1784,9 @@ config BUSYBOX_DEFAULT_TASKSET
config BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY
bool
default n
+config BUSYBOX_DEFAULT_FEATURE_TASKSET_CPULIST
+ bool
+ default n
config BUSYBOX_DEFAULT_UEVENT
bool
default n
@@ -1814,6 +1823,9 @@ config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BTRFS
config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_CRAMFS
bool
default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EROFS
+ bool
+ default n
config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXFAT
bool
default n
@@ -2096,6 +2108,9 @@ config BUSYBOX_DEFAULT_MAN
config BUSYBOX_DEFAULT_MICROCOM
bool
default n
+config BUSYBOX_DEFAULT_MIM
+ bool
+ default n
config BUSYBOX_DEFAULT_MT
bool
default n
@@ -2268,6 +2283,18 @@ config BUSYBOX_DEFAULT_FEATURE_HTTPD_PROXY
config BUSYBOX_DEFAULT_FEATURE_HTTPD_GZIP
bool
default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_ETAG
+ bool
+ default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_LAST_MODIFIED
+ bool
+ default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_DATE
+ bool
+ default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_ACL_IP
+ bool
+ default n
config BUSYBOX_DEFAULT_IFCONFIG
bool
default y
@@ -2892,6 +2919,9 @@ config BUSYBOX_DEFAULT_BASH_IS_HUSH
config BUSYBOX_DEFAULT_BASH_IS_NONE
bool
default y
+config BUSYBOX_DEFAULT_SHELL_ASH
+ bool
+ default y
config BUSYBOX_DEFAULT_ASH
bool
default y
@@ -2952,6 +2982,9 @@ config BUSYBOX_DEFAULT_CTTYHACK
config BUSYBOX_DEFAULT_HUSH
bool
default n
+config BUSYBOX_DEFAULT_SHELL_HUSH
+ bool
+ default n
config BUSYBOX_DEFAULT_HUSH_BASH_COMPAT
bool
default n
@@ -3114,6 +3147,9 @@ config BUSYBOX_DEFAULT_FEATURE_SYSLOGD_DUP
config BUSYBOX_DEFAULT_FEATURE_SYSLOGD_CFG
bool
default n
+config BUSYBOX_DEFAULT_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS
+ bool
+ default n
config BUSYBOX_DEFAULT_FEATURE_SYSLOGD_READ_BUFFER_SIZE
int
default 0