[adm5120] fix support for 2.6.38 kernel

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

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index abeb472..0045036 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,51 @@ 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_INCLUDE_SUSv2
+       bool "Enable obsolete features removed before SUSv3"
+       default y
+       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
+         affect renice too.)
+
+config BUSYBOX_CONFIG_USE_PORTABLE_CODE
+       bool "Avoid using GCC-specific code constructs"
+       default n
+       help
+         Use this option if you are trying to compile busybox with
+         compiler other than gcc.
+         If you do use gcc, this option may needlessly increase code size.
+
+config BUSYBOX_CONFIG_PLATFORM_LINUX
+       bool "Enable Linux-specific applets and features"
+       default y
+       help
+         For the most part, busybox requires only POSIX compatibility
+         from the target system, but some applets and features use
+         Linux-specific interfaces.
+
+         Answering 'N' here will disable such applets and hide the
+         corresponding configuration options.
+

 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


@@ -73,11 +93,11 @@ config BUSYBOX_CONFIG_SHOW_USAGE
 config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE
        bool "Show verbose applet usage messages"
        default y
 config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE
        bool "Show verbose applet usage messages"
        default y

-       select BUSYBOX_CONFIG_SHOW_USAGE
+       depends on BUSYBOX_CONFIG_SHOW_USAGE

        help
          All BusyBox applets will show more verbose help messages when
        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 +110,26 @@ 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
          applets that are compiled into busybox.
 
          busybox at runtime to create hard links or symlinks for all the
          applets that are compiled into busybox.
 

+config BUSYBOX_CONFIG_INSTALL_NO_USR
+       bool "Don't use /usr"
+       default n
+       help
+         Disable use of /usr. busybox --install and "make install"
+         will install applets only to /bin and /sbin,
+         never to /usr/bin or /usr/sbin.
+

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


@@ -109,8 +137,125 @@ config BUSYBOX_CONFIG_LOCALE_SUPPORT
          Enable this if your system has locale support and you would like
          busybox to support locale settings.
 
          Enable this if your system has locale support and you would like
          busybox to support locale settings.
 

-config BUSYBOX_CONFIG_GETOPT_LONG
-       bool "Enable support for --long-options"
+config BUSYBOX_CONFIG_UNICODE_SUPPORT
+       bool "Support Unicode"
+       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.
+
+config BUSYBOX_CONFIG_UNICODE_USING_LOCALE
+       bool "Use libc routines for Unicode (else uses internal ones)"
+       default n
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT && BUSYBOX_CONFIG_LOCALE_SUPPORT
+       help
+         With this option on, Unicode support is implemented using libc
+         routines. Otherwise, internal implementation is used.
+         Internal implementation is smaller.
+
+config BUSYBOX_CONFIG_FEATURE_CHECK_UNICODE_IN_ENV
+       bool "Check $LANG environment variable"
+       default n
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT && !BUSYBOX_CONFIG_UNICODE_USING_LOCALE
+       help
+         With this option on, Unicode support is activated
+         only if LANG variable has the value of the form "xxxx.utf8"
+
+         Otherwise, Unicode support will be always enabled and active.
+
+config BUSYBOX_CONFIG_SUBST_WCHAR
+       int "Character code to substitute unprintable characters with"
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+       default 63
+       help
+         Typical values are 63 for '?' (works with any output device),
+         30 for ASCII substitute control code,
+         65533 (0xfffd) for Unicode replacement character.
+
+config BUSYBOX_CONFIG_LAST_SUPPORTED_WCHAR
+       int "Range of supported Unicode characters"
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+       default 767
+       help
+         Any character with Unicode value bigger than this is assumed
+         to be non-printable on output device. Many applets replace
+         such chars with substitution character.
+
+         The idea is that many valid printable Unicode chars are
+         nevertheless are not displayed correctly. Think about
+         combining charachers, double-wide hieroglyphs, obscure
+         characters in dozens of ancient scripts...
+         Many terminals, terminal emulators, xterms etc will fail
+         to handle them correctly. Choose the smallest value
+         which suits your needs.
+
+         Typical values are:
+         126 - ASCII only
+         767 (0x2ff) - there are no combining chars in [0..767] range
+                       (the range includes Latin 1, Latin Ext. A and B),
+                       code is ~700 bytes smaller for this case.
+         4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
+                       code is ~300 bytes smaller for this case.
+         12799 (0x31ff) - nearly all non-ideographic characters are
+                       available in [0..12799] range, including
+                       East Asian scripts like katakana, hiragana, hangul,
+                       bopomofo...
+         0 - off, any valid printable Unicode character will be printed.
+
+config BUSYBOX_CONFIG_UNICODE_COMBINING_WCHARS
+       bool "Allow zero-width Unicode characters on output"
+       default n
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+       help
+         With this option off, any Unicode char with width of 0
+         is substituted on output.
+
+config BUSYBOX_CONFIG_UNICODE_WIDE_WCHARS
+       bool "Allow wide Unicode characters on output"
+       default n
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+       help
+         With this option off, any Unicode char with width > 1
+         is substituted on output.
+
+config BUSYBOX_CONFIG_UNICODE_BIDI_SUPPORT
+       bool "Bidirectional character-aware line input"
+       default n
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT && !BUSYBOX_CONFIG_UNICODE_USING_LOCALE
+       help
+         With this option on, right-to-left Unicode characters
+         are treated differently on input (e.g. cursor movement).
+
+config BUSYBOX_CONFIG_UNICODE_NEUTRAL_TABLE
+       bool "In bidi input, support non-ASCII neutral chars too"
+       default n
+       depends on BUSYBOX_CONFIG_UNICODE_BIDI_SUPPORT
+       help
+         In most cases it's enough to treat only ASCII non-letters
+         (i.e. punctuation, numbers and space) as characters
+         with neutral directionality.
+         With this option on, more extensive (and bigger) table
+         of neutral chars will be used.
+
+config BUSYBOX_CONFIG_UNICODE_PRESERVE_BROKEN
+       bool "Make it possible to enter sequences of chars which are not Unicode"
+       default n
+       depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+       help
+         With this option on, on line-editing input (such as used by shells)
+         invalid UTF-8 bytes are not substituted with the selected
+         substitution character.
+         For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
+         at shell prompt will list file named 0xff (single char name
+         with char value 255), not file named '?'.
+
+config BUSYBOX_CONFIG_LONG_OPTS
+       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


@@ -122,23 +267,42 @@ 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_UTMP
+       bool "Support utmp file"
+       default n
+       help
+         The file /var/run/utmp is used to track who is currently logged in.
+         With this option on, certain applets (getty, login, telnetd etc)
+         will create and delete entries there.
+         "who" applet requires this option.
+
+config BUSYBOX_CONFIG_FEATURE_WTMP
+       bool "Support wtmp file"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_UTMP
+       help
+         The file /var/run/wtmp is used to track when users have logged into
+         and logged out of the system.
+         With this option on, certain applets (getty, login, telnetd etc)
+         will append new entries there.
+         "last" applet requires this option.
+

 config BUSYBOX_CONFIG_FEATURE_PIDFILE
        bool "Support writing pidfiles"
        default y
 config BUSYBOX_CONFIG_FEATURE_PIDFILE
        bool "Support writing pidfiles"
        default y


@@ -151,35 +315,62 @@ config BUSYBOX_CONFIG_FEATURE_SUID
        default y
        help
          With this option you can install the busybox binary belonging
        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
-         priviledges for applets that don't need root access.
+         to root with the suid bit set, enabling some applets to perform
+         root-level operations even when run by ordinary users
+         (for example, mounting of user mounts in fstab needs this).
+
+         Busybox will automatically drop 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 which require root rights (need suid bit or
+         to be run by root) and will refuse to execute otherwise:
+         crontab, login, passwd, su, vlock, wall.
+
+         The applets which will use root rights if they have them
+         (via suid bit, or because run by root), but would try to work
+         without root right nevertheless:
+         findfs, ping[6], traceroute[6], mount.
+
+         Note that if you DONT select this option, but DO make busybox
+         suid root, ALL applets will run under root, which is a huge
+         security hole (think "cp /some/file /etc/passwd").

 
 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"

-       default n if BUSYBOX_CONFIG_FEATURE_SUID
+       default n

        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:
 
          The format of this file is as follows:
 

-         <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)
+         APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
+
+         s: USER or GROUP is allowed to execute APPLET.
+            APPLET will run under USER or GROUP
+            (reagardless of who's running it).
+         S: USER or GROUP is NOT allowed to execute APPLET.
+            APPLET will run under USER or GROUP.
+            This option is not very sensical.
+         x: USER/GROUP/others are allowed to execute APPLET.
+            No UID/GID change will be done when it is run.
+         -: USER/GROUP/others are not allowed to execute APPLET.

 
          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 (but not anyone else)
+                               # and runs with euid=0 (egid is not changed)

 
          cp = --- # disable applet cp for everyone
 
 
          cp = --- # disable applet cp for everyone
 


@@ -198,14 +389,16 @@ 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.
+         /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
 
 config BUSYBOX_CONFIG_SELINUX
        bool "Support NSA Security Enhanced Linux"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
        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


@@ -240,26 +433,26 @@ config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
        default "/proc/self/exe"
        help
          When Busybox applets need to run other busybox applets, BusyBox
        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.
 
 # These are auto-selected by other options
 
 config BUSYBOX_CONFIG_FEATURE_SYSLOG
          want to run BusyBox from.
 
 # These are auto-selected by other options
 
 config BUSYBOX_CONFIG_FEATURE_SYSLOG

-       bool "Support for logging to syslog"
+       bool #No description makes it a hidden option

        default y
        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.
+       #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
 
 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.
+       bool #No description makes it a hidden option
+       default n
+       #help
+       #  This is automatically selected if any of enabled applets need it.
+       #  You do not need to select it manually.

 
 endmenu
 
 
 endmenu
 


@@ -279,16 +472,40 @@ config BUSYBOX_CONFIG_STATIC
 
          Most people will leave this set to 'N'.
 
 
          Most people will leave this set to 'N'.
 

+config BUSYBOX_CONFIG_PIE
+       bool "Build BusyBox as a position independent executable"
+       default n
+       depends on !BUSYBOX_CONFIG_STATIC
+       help
+         Hardened code option. PIE binaries are loaded at a different
+         address at each invocation. This has some overhead,
+         particularly on x86-32 which is short on registers.
+
+         Most people will leave this set to 'N'.
+
+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.
+
+         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
 config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
        bool "Build shared libbusybox"
        default n

-       depends on !BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS
+       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
        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"
+         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.
 
          approach serves no purpose and increases code size.
          You should almost certainly say "no" to this.
 


@@ -305,7 +522,7 @@ config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
 ###      standalone application which uses libbusybox say 'Y'.
 ###
 ###      Note: libbusybox is GPL, not LGPL, and exports no stable API that
 ###      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
+###      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.
 ###
 ###      exported function set between releases (even minor version number
 ###      changes), and happily break out-of-tree features.
 ###


@@ -314,7 +531,7 @@ config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
 config BUSYBOX_CONFIG_FEATURE_INDIVIDUAL
        bool "Produce a binary for each applet, linked against libbusybox"
        default n
 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
+       depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX

        help
          If your CPU architecture doesn't allow for sharing text/rodata
          sections of running binaries, but allows for runtime dynamic
        help
          If your CPU architecture doesn't allow for sharing text/rodata
          sections of running binaries, but allows for runtime dynamic


@@ -332,7 +549,7 @@ config BUSYBOX_CONFIG_FEATURE_INDIVIDUAL
 config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
        bool "Produce additional busybox binary linked against libbusybox"
        default n
 config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
        bool "Produce additional busybox binary linked against libbusybox"
        default n

-       depends on !BUSYBOX_CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+       depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX

        help
          Build busybox, dynamically linked against libbusybox.so.N.N.N.
 
        help
          Build busybox, dynamically linked against libbusybox.so.N.N.N.
 


@@ -360,14 +577,32 @@ config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
 config BUSYBOX_CONFIG_LFS
        bool
        default y
 config BUSYBOX_CONFIG_LFS
        bool
        default y

-       select BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS

        help
          If you want to build BusyBox with large file support, then enable
        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_CROSS_COMPILER_PREFIX
+       string "Cross Compiler prefix"
+       default ""
+       help
+         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-".
+
+         Note that CROSS_COMPILE environment variable or
+         "make CROSS_COMPILE=xxx ..." will override this selection.
+
+         Native builds leave this empty.
+
+config BUSYBOX_CONFIG_EXTRA_CFLAGS
+       string "Additional CFLAGS"
+       default ""
+       help
+         Additional CFLAGS to pass to the compiler verbatim.

 
 endmenu
 
 
 endmenu
 


@@ -378,12 +613,23 @@ 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.
 
          development and want to debug BusyBox, answer Y.
 
          Most people should answer N.
 

+config BUSYBOX_CONFIG_DEBUG_PESSIMIZE
+       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
+         stepping through it with a debugger. This switches it off, resulting
+         in a much bigger executable that more closely matches the source
+         code.
+

 config BUSYBOX_CONFIG_WERROR
        bool "Abort compilation on any warning"
        default n
 config BUSYBOX_CONFIG_WERROR
        bool "Abort compilation on any warning"
        default n


@@ -392,44 +638,33 @@ config BUSYBOX_CONFIG_WERROR
 
          Most people should answer N.
 
 
          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
        help
          Using an additional debugging library will make BusyBox become
 choice
        prompt "Additional debugging library"
        default BUSYBOX_CONFIG_NO_DEBUG_LIB
        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.
 


@@ -445,31 +680,15 @@ config BUSYBOX_CONFIG_EFENCE
 
 endchoice
 
 
 endchoice
 

-config BUSYBOX_CONFIG_INCLUDE_SUSv2
-       bool "Enable obsolete features removed before SUSv3?"
-       default y
-       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
-         affect renice too.)
-

 endmenu
 
 endmenu
 

-menu 'Installation Options'
-
-config BUSYBOX_CONFIG_INSTALL_NO_USR
-       bool "Don't use /usr"
-       default n
-       help
-         Disable use of /usr. Don't activate this option if you don't know
-         that you really want this behaviour.
+menu 'Installation Options ("make install" behavior)'

 
 choice
 
 choice

-       prompt "Applets links"
+       prompt "What kind of applet links to install"

        default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
        help
        default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
        help

-         Choose how you install applets links.
+         Choose what kind of links to applets are created by "make install".

 
 config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
        bool "as soft-links"
 
 config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
        bool "as soft-links"


@@ -481,8 +700,8 @@ config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
 config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS
        bool "as hard-links"
        help
 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.
+         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"
 
 config BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
        bool "as script wrappers"


@@ -491,10 +710,10 @@ config BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
 
 config BUSYBOX_CONFIG_INSTALL_APPLET_DONT
        bool "not installed"
 
 config BUSYBOX_CONFIG_INSTALL_APPLET_DONT
        bool "not installed"

-       depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE || BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS

        help
        help

-         Do not install applet links. Useful when using the -install feature
-         or a standalone shell for rescue purposes.
+         Do not install applet links. Useful when you plan to use
+         busybox --install for installing links, or plan to use
+         a standalone shell and thus don't need applet links.

 
 endchoice
 
 
 endchoice
 


@@ -518,7 +737,8 @@ config BUSYBOX_CONFIG_INSTALL_SH_APPLET_HARDLINK
 config BUSYBOX_CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER
        bool "as script wrapper"
        help
 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.
+         Install /bin/sh applet as script wrapper that calls
+         the busybox binary.

 
 endchoice
 
 
 endchoice
 


@@ -549,9 +769,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/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/runit/Config.in
 source package/busybox/config/selinux/Config.in

-source package/busybox/config/ipsvd/Config.in
+source package/busybox/config/shell/Config.in
+source package/busybox/config/sysklogd/Config.in