busybox: update to 1.33

[openwrt/openwrt.git] / package / utils / busybox / config / Config.in

diff --git a/package/utils/busybox/config/Config.in b/package/utils/busybox/config/Config.in
index 03af3464f97b18237dd264fcf9daa647221299cb..f30629839e0d86a1e2604fbfa3eb867406a5750c 100644 (file)
--- 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