diff options
author | Rosen Penev <rosenp@gmail.com> | 2021-01-31 16:15:53 -0800 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-02-14 15:15:32 +0100 |
commit | 0275ee5dde7c36c925396779dd23d4f470ab40e1 (patch) | |
tree | 88e07de1fa39b6c9909478b0909e617523d6c830 /package/utils/busybox/config/Config.in | |
parent | 157cd0bd97bcfec8a34d4ebb558f37bee4f0515f (diff) | |
download | upstream-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/Config.in')
-rw-r--r-- | package/utils/busybox/config/Config.in | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/package/utils/busybox/config/Config.in b/package/utils/busybox/config/Config.in index 03af3464f9..f30629839e 100644 --- a/package/utils/busybox/config/Config.in +++ b/package/utils/busybox/config/Config.in @@ -155,12 +155,13 @@ config BUSYBOX_CONFIG_FEATURE_PIDFILE config BUSYBOX_CONFIG_PID_FILE_PATH string "Directory for pidfiles" default BUSYBOX_DEFAULT_PID_FILE_PATH - depends on BUSYBOX_CONFIG_FEATURE_PIDFILE + depends on BUSYBOX_CONFIG_FEATURE_PIDFILE || BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES help This is the default path where pidfiles are created. Applets which allow you to set the pidfile path on the command line will override this value. The option has no effect on applets that require you to - specify a pidfile path. + specify a pidfile path. When crond has the 'Support special times' + option enabled, the 'crond.reboot' file is also stored here. config BUSYBOX_CONFIG_BUSYBOX bool "Include busybox applet" @@ -310,7 +311,6 @@ config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH config BUSYBOX_CONFIG_SELINUX bool "Support NSA Security Enhanced Linux" default BUSYBOX_DEFAULT_SELINUX - select BUSYBOX_CONFIG_PLATFORM_LINUX help Enable support for SELinux in applets ls, ps, and id. Also provide the option of compiling in SELinux applets. @@ -356,17 +356,6 @@ config BUSYBOX_CONFIG_FEATURE_SYSLOG #This option is auto-selected when you select any applet which may #send its output to syslog. You do not need to select it manually. -config BUSYBOX_CONFIG_PLATFORM_LINUX - bool #No description makes it a hidden option - default BUSYBOX_DEFAULT_PLATFORM_LINUX - #help - #For the most part, busybox requires only POSIX compatibility - #from the target system, but some applets and features use - #Linux-specific interfaces. - # - #This is automatically selected if any applet or feature requires - #Linux-specific interfaces. You do not need to select it manually. - comment 'Build Options' config BUSYBOX_CONFIG_STATIC @@ -539,6 +528,14 @@ config BUSYBOX_CONFIG_STACK_OPTIMIZATION_386 do not work with it (they use SSE instructions without ensuring stack alignment). +config BUSYBOX_CONFIG_STATIC_LIBGCC + bool "Use -static-libgcc" + default BUSYBOX_DEFAULT_STATIC_LIBGCC + help + This option instructs gcc to link in a static version of its + support library, libgcc. This means that the binary will require + one fewer dynamic library at run time. + comment 'Installation Options ("make install" behavior)' choice @@ -660,6 +657,19 @@ config BUSYBOX_CONFIG_WERROR Most people should answer N. +config BUSYBOX_CONFIG_WARN_SIMPLE_MSG + bool "Warn about single parameter bb_xx_msg calls" + default BUSYBOX_DEFAULT_WARN_SIMPLE_MSG + help + This will cause warnings to be shown for any instances of + bb_error_msg(), bb_error_msg_and_die(), bb_perror_msg(), + bb_perror_msg_and_die(), bb_herror_msg() or bb_herror_msg_and_die() + being called with a single parameter. In these cases the equivalent + bb_simple_xx_msg function should be used instead. + Note that use of STRERROR_FMT may give false positives. + + If you aren't developing busybox, say N here. + choice prompt "Additional debugging library" default BUSYBOX_CONFIG_NO_DEBUG_LIB |