[au1000] switch to 2.6.30.1

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

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index d288bfb..e8c77bf 100644 (file)
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -12,22 +12,6 @@ menu "Busybox Settings"
 
 menu "General Configuration"
 
 
 menu "General Configuration"
 

-config BUSYBOX_CONFIG_NITPICK
-       bool "See lots more (probably unnecessary) configuration options."
-       default n
-       help
-         Some BusyBox applets have more configuration options than anyone
-         will ever care about.  To avoid drowining people in complexity, most
-         of the applet features that can be set to a sane default value are
-         hidden, unless you hit the above switch.
-
-         This is better than to telling people to edit the busybox source
-         code, but not by much.
-
-         See http://en.wikipedia.org/wiki/Fibber_McGee_and_Molly#The_Closet
-
-         You have been warned.
-

 config BUSYBOX_CONFIG_DESKTOP
        bool "Enable options for full-blown desktop systems"
        default n
 config BUSYBOX_CONFIG_DESKTOP
        bool "Enable options for full-blown desktop systems"
        default n


@@ -36,15 +20,35 @@ config BUSYBOX_CONFIG_DESKTOP
          Select this only if you plan to use busybox on full-blown
          desktop machine with common Linux distro, not on an embedded box.
 
          Select this only if you plan to use busybox on full-blown
          desktop machine with common Linux distro, not on an embedded box.
 

+config BUSYBOX_CONFIG_EXTRA_COMPAT
+       bool "Provide compatible behavior for rare corner cases (bigger code)"
+       default n
+       help
+         This option makes grep, sed etc handle rare corner cases
+         (embedded NUL bytes and such). This makes code bigger and uses
+         some GNU extensions in libc. You probably only need this option
+         if you plan to run busybox on desktop.
+
+config BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE
+       bool "Assume that 1:1 char/glyph correspondence is not true"
+       default n
+       help
+         This makes various applets aware that one byte is not
+         one character on screen.
+
+         Busybox aims to eventually work correctly with Unicode displays.
+         Any older encodings are not guaranteed to work.
+         Probably by the time when busybox will be fully Unicode-clean,
+         other encodings will be mainly of historic interest.
+

 choice
        prompt "Buffer allocation policy"
        default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK
 choice
        prompt "Buffer allocation policy"
        default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK

-       depends on BUSYBOX_CONFIG_NITPICK

        help
          There are 3 ways BusyBox can handle buffer allocations:
          - Use malloc. This costs code size for the call to xmalloc.
          - Put them on stack. For some very small machines with limited stack
        help
          There are 3 ways BusyBox can handle buffer allocations:
          - Use malloc. This costs code size for the call to xmalloc.
          - Put them on stack. For some very small machines with limited stack

-           space, this can be deadly.  For most folks, this works just fine.
+           space, this can be deadly. For most folks, this works just fine.

          - Put them in BSS. This works beautifully for computers with a real
            MMU (and OS support), but wastes runtime RAM for uCLinux. This
            behavior was the only one available for BusyBox versions 0.48 and
          - Put them in BSS. This works beautifully for computers with a real
            MMU (and OS support), but wastes runtime RAM for uCLinux. This
            behavior was the only one available for BusyBox versions 0.48 and


@@ -76,8 +80,8 @@ config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE
        select BUSYBOX_CONFIG_SHOW_USAGE
        help
          All BusyBox applets will show more verbose help messages when
        select BUSYBOX_CONFIG_SHOW_USAGE
        help
          All BusyBox applets will show more verbose help messages when

-         busybox is invoked with --help.  This will add a lot of text to the
-         busybox binary.  In the default configuration, this will add about
+         busybox is invoked with --help. This will add a lot of text to the
+         busybox binary. In the default configuration, this will add about

          13k, but it can add much more depending on your configuration.
 
 config BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE
          13k, but it can add much more depending on your configuration.
 
 config BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE


@@ -90,18 +94,17 @@ config BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE
 
          If you have a really tiny busybox with few applets enabled (and
          bunzip2 isn't one of them), the overhead of the decompressor might
 
          If you have a really tiny busybox with few applets enabled (and
          bunzip2 isn't one of them), the overhead of the decompressor might

-         be noticeable.  Also, if you run executables directly from ROM
-         and have very little memory, this might not be a win.  Otherwise,
+         be noticeable. Also, if you run executables directly from ROM
+         and have very little memory, this might not be a win. Otherwise,

          you probably want this.
 
 config BUSYBOX_CONFIG_FEATURE_INSTALLER
        bool "Support --install [-s] to install applet links at runtime"
        default n
        help
          you probably want this.
 
 config BUSYBOX_CONFIG_FEATURE_INSTALLER
        bool "Support --install [-s] to install applet links at runtime"
        default n
        help

-         Enable 'busybox --install [-s]' support.  This will allow you to use
+         Enable 'busybox --install [-s]' support. This will allow you to use

          busybox at runtime to create hard links or symlinks for all the
          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)"


@@ -111,7 +114,7 @@ config BUSYBOX_CONFIG_LOCALE_SUPPORT
          busybox to support locale settings.
 
 config BUSYBOX_CONFIG_GETOPT_LONG
          busybox to support locale settings.
 
 config BUSYBOX_CONFIG_GETOPT_LONG

-       bool "Enable support for --long-options"
+       bool "Support for --long-options"

        default y
        help
          Enable this if you want busybox applets to use the gnu --long-option
        default y
        help
          Enable this if you want busybox applets to use the gnu --long-option


@@ -123,44 +126,45 @@ config BUSYBOX_CONFIG_FEATURE_DEVPTS
        help
          Enable if you want BusyBox to use Unix98 PTY support. If enabled,
          busybox will use /dev/ptmx for the master side of the pseudoterminal
        help
          Enable if you want BusyBox to use Unix98 PTY support. If enabled,
          busybox will use /dev/ptmx for the master side of the pseudoterminal

-         and /dev/pts/<number> for the slave side.  Otherwise, BSD style
+         and /dev/pts/<number> for the slave side. Otherwise, BSD style

          /dev/ttyp<number> will be used. To use this option, you should have
          devpts mounted.
 
 config BUSYBOX_CONFIG_FEATURE_CLEAN_UP
        bool "Clean up all memory before exiting (usually not needed)"
        default n
          /dev/ttyp<number> will be used. To use this option, you should have
          devpts mounted.
 
 config BUSYBOX_CONFIG_FEATURE_CLEAN_UP
        bool "Clean up all memory before exiting (usually not needed)"
        default n

-       depends on BUSYBOX_CONFIG_NITPICK

        help
          As a size optimization, busybox normally exits without explicitly
        help
          As a size optimization, busybox normally exits without explicitly

-         freeing dynamically allocated memory or closing files.  This saves
+         freeing dynamically allocated memory or closing files. This saves

          space since the OS will clean up for us, but it can confuse debuggers
          like valgrind, which report tons of memory and resource leaks.
 
          Don't enable this unless you have a really good reason to clean
          things up manually.
 
          space since the OS will clean up for us, but it can confuse debuggers
          like valgrind, which report tons of memory and resource leaks.
 
          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
        help
          With this option you can install the busybox binary belonging
 config BUSYBOX_CONFIG_FEATURE_SUID
        bool "Support for SUID/SGID handling"
        default y
        help
          With this option you can install the busybox binary belonging

-         to root with the suid bit set, and it'll and it'll automatically drop
+         to root with the suid bit set, and it will automatically drop

          priviledges for applets that don't need root access.
 
          priviledges for applets that don't need root access.
 

-         If you're really paranoid and don't want to do this, build two
+         If you are really paranoid and don't want to do this, build two

          busybox binaries with different applets in them (and the appropriate
          symlinks pointing to each binary), and only set the suid bit on the
          busybox binaries with different applets in them (and the appropriate
          symlinks pointing to each binary), and only set the suid bit on the

-         one that needs it.  The applets currently marked to need the suid bit
-         are login, passwd, su, ping, traceroute, crontab, dnsd, ipcrm, ipcs,
-         and vlock.
+         one that needs it. The applets currently marked to need the suid bit
+         are:

 
 

-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.
+         crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,
+         traceroute, vlock.

 
 config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
        bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
 
 config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
        bool "Runtime SUID/SGID configuration via /etc/busybox.conf"


@@ -168,7 +172,7 @@ config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
        depends on BUSYBOX_CONFIG_FEATURE_SUID
        help
          Allow the SUID / SGID state of an applet to be determined at runtime
        depends on BUSYBOX_CONFIG_FEATURE_SUID
        help
          Allow the SUID / SGID state of an applet to be determined at runtime

-         by checking /etc/busybox.conf.  (This is sort of a poor man's sudo.)
+         by checking /etc/busybox.conf. (This is sort of a poor man's sudo.)

          The format of this file is as follows:
 
          <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)
          The format of this file is as follows:
 
          <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)


@@ -176,20 +180,21 @@ config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
          An example might help:
 
          [SUID]
          An example might help:
 
          [SUID]

-         su = ssx root.0 # applet su can be run by anyone and runs with euid=0/egid=0
+         su = ssx root.0 # applet su can be run by anyone and runs with
+                         # euid=0/egid=0

          su = ssx        # exactly the same
 
          su = ssx        # exactly the same
 

-         mount = sx- root.disk # applet mount can be run by root and members of group disk
-                               # and runs with euid=0
+         mount = sx- root.disk # applet mount can be run by root and members
+                               # of group disk and runs with euid=0

 
          cp = --- # disable applet cp for everyone
 
          The file has to be owned by user root, group root and has to be
          writeable only by root:
 
          cp = --- # disable applet cp for everyone
 
          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 >.


@@ -199,22 +204,15 @@ config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG_QUIET
        default n
        depends on BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
        help
        default n
        depends on BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
        help

-         /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.
+         /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_SELINUX
        bool "Support NSA Security Enhanced Linux"
        default n
        help
 
 config BUSYBOX_CONFIG_SELINUX
        bool "Support NSA Security Enhanced Linux"
        default n
        help

-         Enable support for SELinux in applets ls, ps, and id.  Also provide
+         Enable support for SELinux in applets ls, ps, and id. Also provide

          the option of compiling in SELinux applets.
 
          If you do not have a complete SELinux userland installed, this stuff
          the option of compiling in SELinux applets.
 
          If you do not have a complete SELinux userland installed, this stuff


@@ -230,16 +228,46 @@ 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"
        help
          When Busybox applets need to run other busybox applets, BusyBox
 config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
        string "Path to BusyBox executable"
        default "/proc/self/exe"
        help
          When Busybox applets need to run other busybox applets, BusyBox

-         sometimes needs to exec() itself.  When the /proc filesystem is
+         sometimes needs to exec() itself. When the /proc filesystem is

          mounted, /proc/self/exe always points to the currently running
          mounted, /proc/self/exe always points to the currently running

-         executable.  If you haven't got /proc, set this to wherever you
+         executable. If you haven't got /proc, set this to wherever you

          want to run BusyBox from.
 
          want to run BusyBox from.
 

+# These are auto-selected by other options
+
+config BUSYBOX_CONFIG_FEATURE_SYSLOG
+       bool #No description makes it a hidden option
+       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 #No description makes it a hidden option
+       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'


@@ -258,44 +286,104 @@ config BUSYBOX_CONFIG_STATIC
 
          Most people will leave this set to 'N'.
 
 
          Most people will leave this set to 'N'.
 

-config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
-       bool "Build shared libbusybox"
+config BUSYBOX_CONFIG_PIE
+       bool "Build BusyBox as a position independent executable"

        default n
        default n

+       depends on !BUSYBOX_CONFIG_STATIC

        help
        help

-         Build a shared library libbusybox.so which contains all
-         libraries used inside busybox.
+         (TODO: what is it and why/when is it useful?)
+         Most people will leave this set to 'N'.

 
 

-         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_NOMMU
+       bool "Force NOMMU build"
+       default n
+       help
+         Busybox tries to detect whether architecture it is being
+         built against supports MMU or not. If this detection fails,
+         or if you want to build NOMMU version of busybox for testing,
+         you may force NOMMU build here.

 
 

-config BUSYBOX_CONFIG_FEATURE_FULL_LIBBUSYBOX
-       bool "Feature-complete libbusybox"
-       default n if !BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
+         Most people will leave this set to 'N'.
+
+# PIE can be made to work with BUILD_LIBBUSYBOX, but currently
+# build system does not support that
+config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+       bool "Build shared libbusybox"
+       default n
+       depends on !BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS && !BUSYBOX_CONFIG_PIE && !BUSYBOX_CONFIG_STATIC
+       help
+         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_BUILD_LIBBUSYBOX
        help
        depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
        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
-       depends on !BUSYBOX_CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+       bool "Produce additional busybox binary linked against libbusybox"
+       default n
+       depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX

        help
        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
        bool
 
 config BUSYBOX_CONFIG_LFS
        bool


@@ -303,30 +391,24 @@ config BUSYBOX_CONFIG_LFS
        select BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS
        help
          If you want to build BusyBox with large file support, then enable
        select BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS
        help
          If you want to build BusyBox with large file support, then enable

-         this option.  This will have no effect if your kernel or your C
-         library lacks large file support for large files.  Some of the
+         this option. This will have no effect if your kernel or your C
+         library lacks large file support for large files. Some of the

          programs that can benefit from large file support include dd, gzip,
          programs that can benefit from large file support include dd, gzip,

-         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
+config BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX
+       string "Cross Compiler prefix"
+       default ""

        help
        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.
+         If you want to build BusyBox with a cross compiler, then you
+         will need to set this to the cross-compiler prefix, for example,
+         "i386-uclibc-".

 
 

-         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.
+         Note that CROSS_COMPILE environment variable or
+         "make CROSS_COMPILE=xxx ..." will override this selection.

 
 

-         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.
+         Native builds leave this empty.

 
 endmenu
 
 
 endmenu
 


@@ -337,50 +419,58 @@ config BUSYBOX_CONFIG_DEBUG
        default n
        help
          Say Y here if you wish to examine BusyBox internals while applets are
        default n
        help
          Say Y here if you wish to examine BusyBox internals while applets are

-         running.  This increases the size of the binary considerably, and
-         should only be used when doing development.  If you are doing
+         running. This increases the size of the binary considerably, and
+         should only be used when doing development. If you are doing

          development and want to debug BusyBox, answer Y.
 
          Most people should answer N.
 
 config BUSYBOX_CONFIG_DEBUG_PESSIMIZE
          development and want to debug BusyBox, answer Y.
 
          Most people should answer N.
 
 config BUSYBOX_CONFIG_DEBUG_PESSIMIZE

-       bool "Disable compiler optimizations."
+       bool "Disable compiler optimizations"

        default n
        depends on BUSYBOX_CONFIG_DEBUG
        help
          The compiler's optimization of source code can eliminate and reorder
          code, resulting in an executable that's hard to understand when
        default n
        depends on BUSYBOX_CONFIG_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
+         stepping through it with a debugger. This switches it off, resulting

          in a much bigger executable that more closely matches the source
          code.
 
          in a much bigger executable that more closely matches the source
          code.
 

+config BUSYBOX_CONFIG_WERROR
+       bool "Abort compilation on any warning"
+       default n
+       help
+         Selecting this will add -Werror to gcc command line.
+
+         Most people should answer N.
+

 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
        help
          Using an additional debugging library will make BusyBox become

-         considerable larger and will cause it to run more slowly.  You
+         considerable larger and will cause it to run more slowly. You

          should always leave this option disabled for production use.
 
          dmalloc support:
          ----------------
          This enables compiling with dmalloc ( http://dmalloc.com/ )
          which is an excellent public domain mem leak and malloc problem
          should always leave this option disabled for production use.
 
          dmalloc support:
          ----------------
          This enables compiling with dmalloc ( http://dmalloc.com/ )
          which is an excellent public domain mem leak and malloc problem

-         detector.  To enable dmalloc, before running busybox you will
+         detector. To enable dmalloc, before running busybox you will

          want to properly set your environment, for example:
            export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
          The 'debug=' value is generated using the following command
          want to properly set your environment, for example:
            export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
          The 'debug=' value is generated using the following command

-           dmalloc -p log-stats -p log-non-free -p log-bad-space -p log-elapsed-time \
-              -p check-fence -p check-heap -p check-lists -p check-blank \
-              -p check-funcs -p realloc-copy -p allow-free-null
+           dmalloc -p log-stats -p log-non-free -p log-bad-space \
+              -p log-elapsed-time -p check-fence -p check-heap \
+              -p check-lists -p check-blank -p check-funcs -p realloc-copy \
+              -p allow-free-null

 
          Electric-fence support:
          -----------------------
 
          Electric-fence support:
          -----------------------

-         This enables compiling with Electric-fence support.  Electric
+         This enables compiling with Electric-fence support. Electric

          fence is another very useful malloc debugging library which uses
          your computer's virtual memory hardware to detect illegal memory
          fence is another very useful malloc debugging library which uses
          your computer's virtual memory hardware to detect illegal memory

-         accesses.  This support will make BusyBox be considerable larger
+         accesses. This support will make BusyBox be considerable larger

          and run slower, so you should leave this option disabled unless
          you are hunting a hard to find memory problem.
 
          and run slower, so you should leave this option disabled unless
          you are hunting a hard to find memory problem.
 


@@ -402,9 +492,12 @@ config BUSYBOX_CONFIG_INCLUDE_SUSv2
        help
          This option will enable backwards compatibility with SuSv2,
          specifically, old-style numeric options ('command -1 <file>')
        help
          This option will enable backwards compatibility with SuSv2,
          specifically, old-style numeric options ('command -1 <file>')

-         will be supported in head, tail, and fold.  (Note: should
+         will be supported in head, tail, and fold. (Note: should

          affect renice too.)
 
          affect renice too.)
 

+### config PARSE
+###    bool "Uniform config file parser debugging applet: parse"
+

 endmenu
 
 menu 'Installation Options'
 endmenu
 
 menu 'Installation Options'


@@ -417,31 +510,60 @@ 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
 


@@ -472,7 +594,10 @@ source package/busybox/config/modutils/Config.in
 source package/busybox/config/util-linux/Config.in
 source package/busybox/config/miscutils/Config.in
 source package/busybox/config/networking/Config.in
 source package/busybox/config/util-linux/Config.in
 source package/busybox/config/miscutils/Config.in
 source package/busybox/config/networking/Config.in

+source package/busybox/config/printutils/Config.in
+source package/busybox/config/mailutils/Config.in

 source package/busybox/config/procps/Config.in
 source package/busybox/config/procps/Config.in

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

 source package/busybox/config/shell/Config.in
 source package/busybox/config/sysklogd/Config.in
 source package/busybox/config/shell/Config.in
 source package/busybox/config/sysklogd/Config.in

-source package/busybox/config/runit/Config.in