add vif selection fix for the broadcom-wl wifi script (thx, sn9)

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

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 4df12cc..abeb472 100644 (file)
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -100,8 +100,7 @@ config BUSYBOX_CONFIG_FEATURE_INSTALLER
        help
          Enable 'busybox --install [-s]' support.  This will allow you to use
          busybox at runtime to create hard links or symlinks for all the
        help
          Enable 'busybox --install [-s]' support.  This will allow you to use
          busybox at runtime to create hard links or symlinks for all the

-         applets that are compiled into busybox.  This feature requires the
-         /proc filesystem.
+         applets that are compiled into busybox.

 
 config BUSYBOX_CONFIG_LOCALE_SUPPORT
        bool "Enable locale support (system needs locale for this to work)"
 
 config BUSYBOX_CONFIG_LOCALE_SUPPORT
        bool "Enable locale support (system needs locale for this to work)"


@@ -140,6 +139,13 @@ config BUSYBOX_CONFIG_FEATURE_CLEAN_UP
          Don't enable this unless you have a really good reason to clean
          things up manually.
 
          Don't enable this unless you have a really good reason to clean
          things up manually.
 

+config BUSYBOX_CONFIG_FEATURE_PIDFILE
+       bool "Support writing pidfiles"
+       default y
+       help
+         This option makes some applets (e.g. crond, syslogd, inetd) write
+         a pidfile in /var/run. Some applications rely on them.
+

 config BUSYBOX_CONFIG_FEATURE_SUID
        bool "Support for SUID/SGID handling"
        default y
 config BUSYBOX_CONFIG_FEATURE_SUID
        bool "Support for SUID/SGID handling"
        default y


@@ -155,13 +161,6 @@ config BUSYBOX_CONFIG_FEATURE_SUID
          are login, passwd, su, ping, traceroute, crontab, dnsd, ipcrm, ipcs,
          and vlock.
 
          are login, passwd, su, ping, traceroute, crontab, dnsd, ipcrm, ipcs,
          and vlock.
 

-config BUSYBOX_CONFIG_FEATURE_SYSLOG
-       bool "Support for syslog"
-       default y
-       help
-         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_FEATURE_SUID_CONFIG
        bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
        default n if BUSYBOX_CONFIG_FEATURE_SUID
 config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
        bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
        default n if BUSYBOX_CONFIG_FEATURE_SUID


@@ -186,10 +185,10 @@ config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
 
          The file has to be owned by user root, group root and has to be
          writeable only by root:
 
          The file has to be owned by user root, group root and has to be
          writeable only by root:

-               (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
+               (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)

          The busybox executable has to be owned by user root, group
          root and has to be setuid root for this to work:
          The busybox executable has to be owned by user root, group
          root and has to be setuid root for this to work:

-               (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+               (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)

 
          Robert 'sandman' Griebl has more information here:
          <url: http://www.softforge.de/bb/suid.html >.
 
          Robert 'sandman' Griebl has more information here:
          <url: http://www.softforge.de/bb/suid.html >.


@@ -202,14 +201,6 @@ config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG_QUIET
          /etc/busybox.conf should be readable by the user needing the SUID, check
          this option to avoid users to be notified about missing permissions.
 
          /etc/busybox.conf should be readable by the user needing the SUID, check
          this option to avoid users to be notified about missing permissions.
 

-config BUSYBOX_CONFIG_FEATURE_HAVE_RPC
-       bool "RPC support"
-       default y
-       help
-         Select this if you have rpc support.
-         This automatically turns off all configuration options that rely
-         on RPC.
-

 config BUSYBOX_CONFIG_SELINUX
        bool "Support NSA Security Enhanced Linux"
        default n
 config BUSYBOX_CONFIG_SELINUX
        bool "Support NSA Security Enhanced Linux"
        default n


@@ -230,6 +221,20 @@ config BUSYBOX_CONFIG_SELINUX
 
          Most people will leave this set to 'N'.
 
 
          Most people will leave this set to 'N'.
 

+config BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS
+       bool "exec prefers applets"
+       default y
+       help
+         This is an experimental option which directs applets about to
+         call 'exec' to try and find an applicable busybox applet before
+         searching the PATH. This is typically done by exec'ing
+         /proc/self/exe.
+         This may affect shell, find -exec, xargs and similar applets.
+         They will use applets even if /bin/<applet> -> busybox link
+         is missing (or is not a link to busybox). However, this causes
+         problems in chroot jails without mounted /proc and with ps/top
+         (command name can be shown as 'exe' for applets started this way).
+

 config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
        string "Path to BusyBox executable"
        default "/proc/self/exe"
 config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
        string "Path to BusyBox executable"
        default "/proc/self/exe"


@@ -240,6 +245,22 @@ config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
          executable.  If you haven't got /proc, set this to wherever you
          want to run BusyBox from.
 
          executable.  If you haven't got /proc, set this to wherever you
          want to run BusyBox from.
 

+# These are auto-selected by other options
+
+config BUSYBOX_CONFIG_FEATURE_SYSLOG
+       bool "Support for logging to syslog"
+       default y
+       help
+         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_FEATURE_HAVE_RPC
+       bool "RPC support"
+       default y
+       help
+         This is automatically selected if any of enabled applets need it.
+         You do not need to select it manually.
+

 endmenu
 
 menu 'Build Options'
 endmenu
 
 menu 'Build Options'


@@ -261,44 +282,83 @@ config BUSYBOX_CONFIG_STATIC
 config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
        bool "Build shared libbusybox"
        default n
 config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
        bool "Build shared libbusybox"
        default n

+       depends on !BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS

        help
        help

-         Build a shared library libbusybox.so which contains all
-         libraries used inside busybox.
-
-         This is an experimental feature intended to support the upcoming
-         "make standalone" mode.  Enabling it against the one big busybox
-         binary serves no purpose (and increases the size).  You should
-         almost certainly say "no" to this right now.
-
-config BUSYBOX_CONFIG_FEATURE_FULL_LIBBUSYBOX
-       bool "Feature-complete libbusybox"
-       default n if !BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
-       depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+         Build a shared library libbusybox.so.N.N.N which contains all
+         busybox code.
+
+         This feature allows every applet to be built as a tiny
+         separate executable.  Enabling it for "one big busybox binary"
+         approach serves no purpose and increases code size.
+         You should almost certainly say "no" to this.
+
+### config FEATURE_FULL_LIBBUSYBOX
+###    bool "Feature-complete libbusybox"
+###    default n if !FEATURE_SHARED_BUSYBOX
+###    depends on BUILD_LIBBUSYBOX
+###    help
+###      Build a libbusybox with the complete feature-set, disregarding
+###      the actually selected config.
+###
+###      Normally, libbusybox will only contain the features which are
+###      used by busybox itself. If you plan to write a separate
+###      standalone application which uses libbusybox say 'Y'.
+###
+###      Note: libbusybox is GPL, not LGPL, and exports no stable API that
+###      might act as a copyright barrier.  We can and will modify the
+###      exported function set between releases (even minor version number
+###      changes), and happily break out-of-tree features.
+###
+###      Say 'N' if in doubt.
+
+config BUSYBOX_CONFIG_FEATURE_INDIVIDUAL
+       bool "Produce a binary for each applet, linked against libbusybox"
+       default n
+       depends on !BUSYBOX_CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX

        help
        help

-         Build a libbusybox with the complete feature-set, disregarding
-         the actually selected config.
+         If your CPU architecture doesn't allow for sharing text/rodata
+         sections of running binaries, but allows for runtime dynamic
+         libraries, this option will allow you to reduce memory footprint
+         when you have many different applets running at once.

 
 

-         Normally, libbusybox will only contain the features which are
-         used by busybox itself. If you plan to write a separate
-         standalone application which uses libbusybox say 'Y'.
+         If your CPU architecture allows for sharing text/rodata,
+         having single binary is more optimal.

 
 

-         Note: libbusybox is GPL, not LGPL, and exports no stable API that
-         might act as a copyright barrier.  We can and will modify the
-         exported function set between releases (even minor version number
-         changes), and happily break out-of-tree features.
+         Each applet will be a tiny program, dynamically linked
+         against libbusybox.so.N.N.N.

 
 

-         Say 'N' if in doubt.
+         You need to have a working dynamic linker.

 
 config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
 
 config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX

-       bool "Use shared libbusybox for busybox"
-       default n if BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+       bool "Produce additional busybox binary linked against libbusybox"
+       default n

        depends on !BUSYBOX_CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
        help
        depends on !BUSYBOX_CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
        help

-         Use libbusybox.so also for busybox itself.
-         You need to have a working dynamic linker to use this variant.
+         Build busybox, dynamically linked against libbusybox.so.N.N.N.
+
+         You need to have a working dynamic linker.
+
+### config BUILD_AT_ONCE
+###    bool "Compile all sources at once"
+###    default n
+###    help
+###      Normally each source-file is compiled with one invocation of
+###      the compiler.
+###      If you set this option, all sources are compiled at once.
+###      This gives the compiler more opportunities to optimize which can
+###      result in smaller and/or faster binaries.
+###
+###      Setting this option will consume alot of memory, e.g. if you
+###      enable all applets with all features, gcc uses more than 300MB
+###      RAM during compilation of busybox.
+###
+###      This option is most likely only beneficial for newer compilers
+###      such as gcc-4.1 and above.
+###
+###      Say 'N' unless you know what you are doing.

 
 config BUSYBOX_CONFIG_LFS
 
 config BUSYBOX_CONFIG_LFS

-       bool "Support large files over 2 GB"
+       bool

        default y
        select BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS
        help
        default y
        select BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS
        help


@@ -309,25 +369,6 @@ config BUSYBOX_CONFIG_LFS
          cp, mount, tar, and many others.  If you want to access files larger
          than 2 Gigabytes, enable this option.  Otherwise, leave it set to 'N'.
 
          cp, mount, tar, and many others.  If you want to access files larger
          than 2 Gigabytes, enable this option.  Otherwise, leave it set to 'N'.
 

-config BUSYBOX_CONFIG_BUILD_AT_ONCE
-       bool "Compile all sources at once"
-       default n
-       help
-         Normally each source-file is compiled with one invocation of
-         the compiler.
-         If you set this option, all sources are compiled at once.
-         This gives the compiler more opportunities to optimize which can
-         result in smaller and/or faster binaries.
-
-         Setting this option will consume alot of memory, e.g. if you
-         enable all applets with all features, gcc uses more than 300MB
-         RAM during compilation of busybox.
-
-         This option is most likely only beneficial for newer compilers
-         such as gcc-4.1 and above.
-
-         Say 'N' unless you know what you are doing.
-

 endmenu
 
 menu 'Debugging Options'
 endmenu
 
 menu 'Debugging Options'


@@ -343,21 +384,29 @@ config BUSYBOX_CONFIG_DEBUG
 
          Most people should answer N.
 
 
          Most people should answer N.
 

-config BUSYBOX_CONFIG_DEBUG_PESSIMIZE
-       bool "Disable compiler optimizations."
+config BUSYBOX_CONFIG_WERROR
+       bool "Abort compilation on any warning"

        default n
        default n

-       depends on BUSYBOX_CONFIG_DEBUG

        help
        help

-         The compiler's optimization of source code can eliminate and reorder
-         code, resulting in an executable that's hard to understand when
-         stepping through it with a debugger.  This switches it off, resulting
-         in a much bigger executable that more closely matches the source
-         code.
+         Selecting this will add -Werror to gcc command line.
+
+         Most people should answer N.
+
+# Seems to be unused
+#config DEBUG_PESSIMIZE
+#      bool "Disable compiler optimizations."
+#      default n
+#      depends on DEBUG
+#      help
+#        The compiler's optimization of source code can eliminate and reorder
+#        code, resulting in an executable that's hard to understand when
+#        stepping through it with a debugger.  This switches it off, resulting
+#        in a much bigger executable that more closely matches the source
+#        code.

 
 choice
        prompt "Additional debugging library"
        default BUSYBOX_CONFIG_NO_DEBUG_LIB
 
 choice
        prompt "Additional debugging library"
        default BUSYBOX_CONFIG_NO_DEBUG_LIB

-       depends on BUSYBOX_CONFIG_DEBUG

        help
          Using an additional debugging library will make BusyBox become
          considerable larger and will cause it to run more slowly.  You
        help
          Using an additional debugging library will make BusyBox become
          considerable larger and will cause it to run more slowly.  You


@@ -417,31 +466,59 @@ config BUSYBOX_CONFIG_INSTALL_NO_USR
          that you really want this behaviour.
 
 choice
          that you really want this behaviour.
 
 choice

-       prompt "Applets links"
-       default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
-       help
-         Choose how you install applets links.
+       prompt "Applets links"
+       default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
+       help
+         Choose how you install applets links.

 
 config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
 
 config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS

-       bool "as soft-links"
-       help
-         Install applets as soft-links to the busybox binary. This needs some
-         free inodes on the filesystem, but might help with filesystem
-         generators that can't cope with hard-links.
+       bool "as soft-links"
+       help
+         Install applets as soft-links to the busybox binary. This needs some
+         free inodes on the filesystem, but might help with filesystem
+         generators that can't cope with hard-links.

 
 config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS
 
 config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS

-       bool "as hard-links"
-       help
-         Install applets as hard-links to the busybox binary. This might count
-         on a filesystem with few inodes.
+       bool "as hard-links"
+       help
+         Install applets as hard-links to the busybox binary. This might count
+         on a filesystem with few inodes.
+
+config BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
+       bool "as script wrappers"
+       help
+         Install applets as script wrappers that call the busybox binary.

 
 config BUSYBOX_CONFIG_INSTALL_APPLET_DONT
 
 config BUSYBOX_CONFIG_INSTALL_APPLET_DONT

-       bool
-       prompt "not installed"
-       depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL
-       help
-         Do not install applet links. Useful when using the -install feature
-         or a standalone shell for rescue pruposes.
+       bool "not installed"
+       depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE || BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS
+       help
+         Do not install applet links. Useful when using the -install feature
+         or a standalone shell for rescue purposes.
+
+endchoice
+
+choice
+       prompt "/bin/sh applet link"
+       default BUSYBOX_CONFIG_INSTALL_SH_APPLET_SYMLINK
+       depends on BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
+       help
+         Choose how you install /bin/sh applet link.
+
+config BUSYBOX_CONFIG_INSTALL_SH_APPLET_SYMLINK
+       bool "as soft-link"
+       help
+         Install /bin/sh applet as soft-link to the busybox binary.
+
+config BUSYBOX_CONFIG_INSTALL_SH_APPLET_HARDLINK
+       bool "as hard-link"
+       help
+         Install /bin/sh applet as hard-link to the busybox binary.
+
+config BUSYBOX_CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER
+       bool "as script wrapper"
+       help
+         Install /bin/sh applet as script wrapper that call the busybox binary.

 
 endchoice
 
 
 endchoice
 


@@ -476,3 +553,5 @@ source package/busybox/config/procps/Config.in
 source package/busybox/config/shell/Config.in
 source package/busybox/config/sysklogd/Config.in
 source package/busybox/config/runit/Config.in
 source package/busybox/config/shell/Config.in
 source package/busybox/config/sysklogd/Config.in
 source package/busybox/config/runit/Config.in

+source package/busybox/config/selinux/Config.in
+source package/busybox/config/ipsvd/Config.in