From ec07a5b4294f510b5a757c97ec88bbdde2873f13 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sun, 4 Jan 2009 13:40:36 +0000 Subject: * patches/busybox-1.10.4, patches/busybox-1.13.2: ported * rules/*.in: changed busybox config symbol from BB_CONFIG to BUSYBOX * config/busybox/* changed busybox config symbol from BB_CONFIG to BUSYBOX imported from busybox-1.13.2 * rules/busybox.make: version bump to 1.13.2 changed busybox config symbol from BB_CONFIG to BUSYBOX git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9373 33e552b5-05e3-0310-8538-816dae2090ed --- config/busybox/Config.in | 320 +++++++------- config/busybox/archival/Config.in | 254 +++++------ config/busybox/console-tools/Config.in | 62 ++- config/busybox/coreutils/Config.in | 361 ++++++++-------- config/busybox/debianutils/Config.in | 32 +- config/busybox/e2fsprogs/Config.in | 9 +- config/busybox/editors/Config.in | 99 +++-- config/busybox/findutils/Config.in | 149 ++++--- config/busybox/init/Config.in | 59 ++- config/busybox/libbb/Config.in | 56 +-- config/busybox/loginutils/Config.in | 220 +++++----- config/busybox/mailutils/Config.in | 69 +++ config/busybox/miscutils/Config.in | 324 ++++++++------ config/busybox/modutils/Config.in | 249 +++++++---- config/busybox/networking/Config.in | 465 +++++++++++---------- config/busybox/networking/udhcp/Config.in | 95 ++--- config/busybox/printutils/Config.in | 12 +- config/busybox/procps/Config.in | 108 +++-- config/busybox/runit/Config.in | 36 +- config/busybox/selinux/Config.in | 65 ++- config/busybox/shell/Config.in | 199 +++++---- config/busybox/sysklogd/Config.in | 57 ++- config/busybox/util-linux/Config.in | 439 ++++++++++--------- .../generic/busybox-1.10.4-init-extra-quiet.diff | 43 -- patches/busybox-1.10.4/generic/series | 1 - .../generic/busybox-1.10.4-init-extra-quiet.diff | 52 +++ patches/busybox-1.13.2/generic/series | 1 + rules/busybox.in | 2 +- rules/busybox.make | 8 +- rules/coreutils.in | 26 +- rules/diffutils.in | 12 +- rules/dropbear.in | 2 +- rules/findutils.in | 14 +- rules/grep.in | 6 +- rules/hdparm.in | 6 +- rules/inetutils.in | 18 +- rules/ipkg.in | 2 +- rules/less.in | 6 +- rules/module-init-tools.in | 24 +- rules/ntpclient.in | 6 +- rules/oprofile.in | 10 +- rules/procps.in | 12 +- rules/rootfs.in | 2 +- rules/rootfs.make | 4 +- rules/rootfs_configfiles.in | 18 +- rules/rootfs_init_d_files.in | 28 +- rules/samba.in | 2 +- rules/schedutils.in | 4 +- rules/sed.in | 6 +- rules/unzip.in | 6 +- rules/utelnetd.in | 2 +- rules/util-linux-ng.in | 42 +- rules/util-linux.in | 42 +- rules/wget.in | 6 +- 54 files changed, 2253 insertions(+), 1899 deletions(-) create mode 100644 config/busybox/mailutils/Config.in delete mode 100644 patches/busybox-1.10.4/generic/busybox-1.10.4-init-extra-quiet.diff delete mode 100644 patches/busybox-1.10.4/generic/series create mode 100644 patches/busybox-1.13.2/generic/busybox-1.10.4-init-extra-quiet.diff create mode 100644 patches/busybox-1.13.2/generic/series diff --git a/config/busybox/Config.in b/config/busybox/Config.in index 1094a8646..b5a5884f9 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -5,33 +5,15 @@ # mainmenu "BusyBox Configuration" -config BB_CONFIG_HAVE_DOT_CONFIG +config BUSYBOX_HAVE_DOT_CONFIG bool default y menu "Busybox Settings" - depends on BUSYBOX menu "General Configuration" - depends on BUSYBOX -config BB_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 BB_CONFIG_DESKTOP +config BUSYBOX_DESKTOP bool "Enable options for full-blown desktop systems" default n help @@ -39,32 +21,52 @@ config BB_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. +config BUSYBOX_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_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 BB_CONFIG_FEATURE_BUFFERS_USE_MALLOC - depends on BB_CONFIG_NITPICK + default BUSYBOX_FEATURE_BUFFERS_USE_MALLOC 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 earlier. -config BB_CONFIG_FEATURE_BUFFERS_USE_MALLOC +config BUSYBOX_FEATURE_BUFFERS_USE_MALLOC bool "Allocate with Malloc" -config BB_CONFIG_FEATURE_BUFFERS_GO_ON_STACK +config BUSYBOX_FEATURE_BUFFERS_GO_ON_STACK bool "Allocate on the Stack" -config BB_CONFIG_FEATURE_BUFFERS_GO_IN_BSS +config BUSYBOX_FEATURE_BUFFERS_GO_IN_BSS bool "Allocate in the .bss section" endchoice -config BB_CONFIG_SHOW_USAGE +config BUSYBOX_SHOW_USAGE bool "Show terse applet usage messages" default y help @@ -73,104 +75,105 @@ config BB_CONFIG_SHOW_USAGE messages if you say no here. This will save you up to 7k. -config BB_CONFIG_FEATURE_VERBOSE_USAGE +config BUSYBOX_FEATURE_VERBOSE_USAGE bool "Show verbose applet usage messages" default n - select BB_CONFIG_SHOW_USAGE + select BUSYBOX_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 BB_CONFIG_FEATURE_COMPRESS_USAGE +config BUSYBOX_FEATURE_COMPRESS_USAGE bool "Store applet usage messages in compressed form" default y - depends on BB_CONFIG_SHOW_USAGE + depends on BUSYBOX_SHOW_USAGE help Store usage messages in compressed form, uncompress them on-the-fly when --help is called. 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 BB_CONFIG_FEATURE_INSTALLER +config BUSYBOX_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. -config BB_CONFIG_LOCALE_SUPPORT +config BUSYBOX_LOCALE_SUPPORT bool "Enable locale support (system needs locale for this to work)" default n help Enable this if your system has locale support and you would like busybox to support locale settings. -config BB_CONFIG_GETOPT_LONG +config BUSYBOX_GETOPT_LONG bool "Support for --long-options" default y help Enable this if you want busybox applets to use the gnu --long-option style, in addition to single character -a -b -c style options. -config BB_CONFIG_FEATURE_DEVPTS +config BUSYBOX_FEATURE_DEVPTS bool "Use the devpts filesystem for Unix98 PTYs" default y 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/ for the slave side. Otherwise, BSD style + and /dev/pts/ for the slave side. Otherwise, BSD style /dev/ttyp will be used. To use this option, you should have devpts mounted. -config BB_CONFIG_FEATURE_CLEAN_UP +config BUSYBOX_FEATURE_CLEAN_UP bool "Clean up all memory before exiting (usually not needed)" default n - depends on BB_CONFIG_NITPICK 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. -config BB_CONFIG_FEATURE_PIDFILE +config BUSYBOX_FEATURE_PIDFILE bool "Support writing pidfiles" default n help This option makes some applets (e.g. crond, syslogd, inetd) write a pidfile in /var/run. Some applications rely on them. -config BB_CONFIG_FEATURE_SUID +config BUSYBOX_FEATURE_SUID bool "Support for SUID/SGID handling" default n 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. - 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 - 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: + + crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, + traceroute, vlock. -config BB_CONFIG_FEATURE_SUID_CONFIG +config BUSYBOX_FEATURE_SUID_CONFIG bool "Runtime SUID/SGID configuration via /etc/busybox.conf" - default n if BB_CONFIG_FEATURE_SUID - depends on BB_CONFIG_FEATURE_SUID + default n if BUSYBOX_FEATURE_SUID + depends on BUSYBOX_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: = [Ssx-][Ssx-][x-] (|).(|) @@ -178,11 +181,12 @@ config BB_CONFIG_FEATURE_SUID_CONFIG 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 - 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 @@ -196,19 +200,20 @@ config BB_CONFIG_FEATURE_SUID_CONFIG Robert 'sandman' Griebl has more information here: . -config BB_CONFIG_FEATURE_SUID_CONFIG_QUIET +config BUSYBOX_FEATURE_SUID_CONFIG_QUIET bool "Suppress warning message if /etc/busybox.conf is not readable" default y - depends on BB_CONFIG_FEATURE_SUID_CONFIG + depends on BUSYBOX_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 BB_CONFIG_SELINUX +config BUSYBOX_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 @@ -224,7 +229,7 @@ config BB_CONFIG_SELINUX Most people will leave this set to 'N'. -config BB_CONFIG_FEATURE_PREFER_APPLETS +config BUSYBOX_FEATURE_PREFER_APPLETS bool "exec prefers applets" default n help @@ -238,38 +243,37 @@ config BB_CONFIG_FEATURE_PREFER_APPLETS problems in chroot jails without mounted /proc and with ps/top (command name can be shown as 'exe' for applets started this way). -config BB_CONFIG_BUSYBOX_EXEC_PATH +config BUSYBOX_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 - 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 BB_CONFIG_FEATURE_SYSLOG - bool "Support for logging to syslog" +config BUSYBOX_FEATURE_SYSLOG + bool #No description makes it a hidden option default n - 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 BB_CONFIG_FEATURE_HAVE_RPC - bool "RPC support" +config BUSYBOX_FEATURE_HAVE_RPC + 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. + #help + # This is automatically selected if any of enabled applets need it. + # You do not need to select it manually. endmenu menu 'Build Options' - depends on BUSYBOX -config BB_CONFIG_STATIC +config BUSYBOX_STATIC bool "Build BusyBox as a static binary (no shared libs)" default n help @@ -283,7 +287,15 @@ config BB_CONFIG_STATIC Most people will leave this set to 'N'. -config BB_CONFIG_NOMMU +config BUSYBOX_PIE + bool "Build BusyBox as a position independent executable" + default n + depends on !BUSYBOX_STATIC + help + (TODO: what is it and why/when is it useful?) + Most people will leave this set to 'N'. + +config BUSYBOX_NOMMU bool "Force NOMMU build" default n help @@ -294,16 +306,18 @@ config BB_CONFIG_NOMMU Most people will leave this set to 'N'. -config BB_CONFIG_BUILD_LIBBUSYBOX +# PIE can be made to work with BUILD_LIBBUSYBOX, but currently +# build system does not support that +config BUSYBOX_BUILD_LIBBUSYBOX bool "Build shared libbusybox" default n - depends on !BB_CONFIG_FEATURE_PREFER_APPLETS + depends on !BUSYBOX_FEATURE_PREFER_APPLETS && !BUSYBOX_PIE && !BUSYBOX_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" + 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. @@ -320,16 +334,16 @@ config BB_CONFIG_BUILD_LIBBUSYBOX ### 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. ### ### Say 'N' if in doubt. -config BB_CONFIG_FEATURE_INDIVIDUAL +config BUSYBOX_FEATURE_INDIVIDUAL bool "Produce a binary for each applet, linked against libbusybox" default y - depends on !BB_CONFIG_STATIC && BB_CONFIG_BUILD_LIBBUSYBOX + depends on BUSYBOX_BUILD_LIBBUSYBOX help If your CPU architecture doesn't allow for sharing text/rodata sections of running binaries, but allows for runtime dynamic @@ -344,10 +358,10 @@ config BB_CONFIG_FEATURE_INDIVIDUAL You need to have a working dynamic linker. -config BB_CONFIG_FEATURE_SHARED_BUSYBOX +config BUSYBOX_FEATURE_SHARED_BUSYBOX bool "Produce additional busybox binary linked against libbusybox" default y - depends on !BB_CONFIG_STATIC && BB_CONFIG_BUILD_LIBBUSYBOX + depends on BUSYBOX_BUILD_LIBBUSYBOX help Build busybox, dynamically linked against libbusybox.so.N.N.N. @@ -372,35 +386,58 @@ config BB_CONFIG_FEATURE_SHARED_BUSYBOX ### ### Say 'N' unless you know what you are doing. -config BB_CONFIG_LFS +config BUSYBOX_LFS bool "Build with Large File Support (for accessing files > 2 GB)" default n - select BB_CONFIG_FDISK_SUPPORT_LARGE_DISKS + select BUSYBOX_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, - 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_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. endmenu menu 'Debugging Options' - depends on BUSYBOX -config BB_CONFIG_DEBUG +config BUSYBOX_DEBUG bool "Build BusyBox with extra Debugging symbols" 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 BB_CONFIG_WERROR +config BUSYBOX_DEBUG_PESSIMIZE + bool "Disable compiler optimizations" + default n + depends on BUSYBOX_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_WERROR bool "Abort compilation on any warning" default n help @@ -408,74 +445,65 @@ config BB_CONFIG_WERROR 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 BB_CONFIG_NO_DEBUG_LIB + default BUSYBOX_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 - 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 - 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: ----------------------- - 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 - 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. -config BB_CONFIG_NO_DEBUG_LIB +config BUSYBOX_NO_DEBUG_LIB bool "None" -config BB_CONFIG_DMALLOC +config BUSYBOX_DMALLOC bool "Dmalloc" -config BB_CONFIG_EFENCE +config BUSYBOX_EFENCE bool "Electric-fence" endchoice -config BB_CONFIG_INCLUDE_SUSv2 +config BUSYBOX_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 ') - will be supported in head, tail, and fold. (Note: should + will be supported in head, tail, and fold. (Note: should affect renice too.) +### config PARSE +### bool "Uniform config file parser debugging applet: parse" + endmenu menu 'Installation Options' - depends on BUSYBOX -config BB_CONFIG_INSTALL_NO_USR +config BUSYBOX_INSTALL_NO_USR bool "Don't use /usr" default n help @@ -484,31 +512,31 @@ config BB_CONFIG_INSTALL_NO_USR choice prompt "Applets links" - default BB_CONFIG_INSTALL_APPLET_SYMLINKS + default BUSYBOX_INSTALL_APPLET_SYMLINKS help Choose how you install applets links. -config BB_CONFIG_INSTALL_APPLET_SYMLINKS +config BUSYBOX_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. -config BB_CONFIG_INSTALL_APPLET_HARDLINKS +config BUSYBOX_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 BB_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS +config BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS bool "as script wrappers" help Install applets as script wrappers that call the busybox binary. -config BB_CONFIG_INSTALL_APPLET_DONT +config BUSYBOX_INSTALL_APPLET_DONT bool "not installed" - depends on BB_CONFIG_FEATURE_INSTALLER || BB_CONFIG_FEATURE_SH_STANDALONE || BB_CONFIG_FEATURE_PREFER_APPLETS + depends on BUSYBOX_FEATURE_INSTALLER || BUSYBOX_FEATURE_SH_STANDALONE || BUSYBOX_FEATURE_PREFER_APPLETS help Do not install applet links. Useful when using the -install feature or a standalone shell for rescue purposes. @@ -517,29 +545,30 @@ endchoice choice prompt "/bin/sh applet link" - default BB_CONFIG_INSTALL_SH_APPLET_SYMLINK - depends on BB_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS + default BUSYBOX_INSTALL_SH_APPLET_SYMLINK + depends on BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS help Choose how you install /bin/sh applet link. -config BB_CONFIG_INSTALL_SH_APPLET_SYMLINK +config BUSYBOX_INSTALL_SH_APPLET_SYMLINK bool "as soft-link" help Install /bin/sh applet as soft-link to the busybox binary. -config BB_CONFIG_INSTALL_SH_APPLET_HARDLINK +config BUSYBOX_INSTALL_SH_APPLET_HARDLINK bool "as hard-link" help Install /bin/sh applet as hard-link to the busybox binary. -config BB_CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER +config BUSYBOX_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 call the busybox + binary. endchoice -config BB_CONFIG_PREFIX +config BUSYBOX_PREFIX string "BusyBox installation prefix" default "./_install" help @@ -566,9 +595,10 @@ source config/busybox/modutils/Config.in source config/busybox/util-linux/Config.in source config/busybox/miscutils/Config.in source config/busybox/networking/Config.in +source config/busybox/printutils/Config.in +source config/busybox/mailutils/Config.in source config/busybox/procps/Config.in -source config/busybox/shell/Config.in -source config/busybox/sysklogd/Config.in source config/busybox/runit/Config.in source config/busybox/selinux/Config.in -source config/busybox/printutils/Config.in +source config/busybox/shell/Config.in +source config/busybox/sysklogd/Config.in diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in index c01773834..7bb13e3ac 100644 --- a/config/busybox/archival/Config.in +++ b/config/busybox/archival/Config.in @@ -4,14 +4,37 @@ # menu "Archival Utilities" - depends on BUSYBOX -config BB_CONFIG_AR +config BUSYBOX_FEATURE_SEAMLESS_LZMA + bool "Make tar, rpm, modprobe etc understand .lzma data" + default n + help + Make tar, rpm, modprobe etc understand .lzma data. + +config BUSYBOX_FEATURE_SEAMLESS_BZ2 + bool "Make tar, rpm, modprobe etc understand .bz2 data" + default n + help + Make tar, rpm, modprobe etc understand .bz2 data. + +config BUSYBOX_FEATURE_SEAMLESS_GZ + bool "Make tar, rpm, modprobe etc understand .gz data" + default n + help + Make tar, rpm, modprobe etc understand .gz data. + +config BUSYBOX_FEATURE_SEAMLESS_Z + bool "Make tar and gunzip understand .Z data" + default n + help + Make tar and gunzip understand .Z data. + +config BUSYBOX_AR bool "ar" default n help ar is an archival utility program used to create, modify, and - extract contents from archives. An archive is a single file holding + extract contents from archives. An archive is a single file holding a collection of other files in a structure that makes it possible to retrieve the original individual files (called archive members). The original files' contents, mode (permissions), timestamp, owner, @@ -29,22 +52,22 @@ config BB_CONFIG_AR Unless you have a specific application which requires ar, you should probably say N here. -config BB_CONFIG_FEATURE_AR_LONG_FILENAMES +config BUSYBOX_FEATURE_AR_LONG_FILENAMES bool "Support for long filenames (not need for debs)" default n - depends on BB_CONFIG_AR + depends on BUSYBOX_AR help - By default the ar format can only store the first 15 characters of the - filename, this option removes that limitation. + By default the ar format can only store the first 15 characters of + the filename, this option removes that limitation. It supports the GNU ar long filename method which moves multiple long filenames into a the data section of a new ar entry. -config BB_CONFIG_BUNZIP2 +config BUSYBOX_BUNZIP2 bool "bunzip2" default n help bunzip2 is a compression utility using the Burrows-Wheeler block - sorting text compression algorithm, and Huffman coding. Compression + sorting text compression algorithm, and Huffman coding. Compression is generally considerably better than that achieved by more conventional LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors. @@ -52,12 +75,12 @@ config BB_CONFIG_BUNZIP2 Unless you have a specific application which requires bunzip2, you should probably say N here. -config BB_CONFIG_BZIP2 +config BUSYBOX_BZIP2 bool "bzip2" default n help bzip2 is a compression utility using the Burrows-Wheeler block - sorting text compression algorithm, and Huffman coding. Compression + sorting text compression algorithm, and Huffman coding. Compression is generally considerably better than that achieved by more conventional LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors. @@ -65,50 +88,62 @@ config BB_CONFIG_BZIP2 Unless you have a specific application which requires bzip2, you should probably say N here. -config BB_CONFIG_CPIO +config BUSYBOX_CPIO bool "cpio" default n help - cpio is an archival utility program used to create, modify, and extract - contents from archives. + cpio is an archival utility program used to create, modify, and + extract contents from archives. cpio has 110 bytes of overheads for every stored file. This implementation of cpio can extract cpio archives created in the "newc" or "crc" format, it cannot create or modify them. - Unless you have a specific application which requires cpio, you should - probably say N here. + Unless you have a specific application which requires cpio, you + should probably say N here. -config BB_CONFIG_DPKG +config BUSYBOX_FEATURE_CPIO_O + bool "Support for archive creation" + default n + depends on BUSYBOX_CPIO + help + This implementation of cpio can create cpio archives in the "newc" + format only. + +config BUSYBOX_DPKG bool "dpkg" default n + select BUSYBOX_FEATURE_SEAMLESS_GZ help - dpkg is a medium-level tool to install, build, remove and manage Debian packages. + dpkg is a medium-level tool to install, build, remove and manage + Debian packages. - This implementation of dpkg has a number of limitations, you should use the - official dpkg if possible. + This implementation of dpkg has a number of limitations, + you should use the official dpkg if possible. -config BB_CONFIG_DPKG_DEB +config BUSYBOX_DPKG_DEB bool "dpkg_deb" default n + select BUSYBOX_FEATURE_SEAMLESS_GZ help - dpkg-deb packs, unpacks and provides information about Debian archives. + dpkg-deb unpacks and provides information about Debian archives. This implementation of dpkg-deb cannot pack archives. - Unless you have a specific application which requires dpkg-deb, you should - probably say N here. + Unless you have a specific application which requires dpkg-deb, + say N here. -config BB_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY +config BUSYBOX_FEATURE_DPKG_DEB_EXTRACT_ONLY bool "Extract only (-x)" default n - depends on BB_CONFIG_DPKG_DEB + depends on BUSYBOX_DPKG_DEB help - This reduces dpkg-deb to the equivalent of "ar -p data.tar.gz | tar -zx". - However it saves space as none of the extra dpkg-deb, ar or tar options are - needed, they are linked to internally. + This reduces dpkg-deb to the equivalent of + "ar -p data.tar.gz | tar -zx". However it saves space as none + of the extra dpkg-deb, ar or tar options are needed, they are linked + to internally. -config BB_CONFIG_GUNZIP +config BUSYBOX_GUNZIP bool "gunzip" default n help @@ -116,42 +151,26 @@ config BB_CONFIG_GUNZIP You can use the `-t' option to test the integrity of an archive, without decompressing it. -config BB_CONFIG_FEATURE_GUNZIP_UNCOMPRESS - bool "Uncompress support" - default n - depends on BB_CONFIG_GUNZIP - help - Enable if you want gunzip to have the ability to decompress - archives created by the program compress (not much - used anymore). - -config BB_CONFIG_GZIP +config BUSYBOX_GZIP bool "gzip" default n help gzip is used to compress files. It's probably the most widely used UNIX compression program. -config BB_CONFIG_RPM2CPIO +config BUSYBOX_RPM2CPIO bool "rpm2cpio" default n help Converts an RPM file into a CPIO archive. -config BB_CONFIG_RPM +config BUSYBOX_RPM bool "rpm" default n help Mini RPM applet - queries and extracts RPM packages. -config BB_CONFIG_FEATURE_RPM_BZ2 - bool "Enable handling of rpms with bzip2-compressed data inside" - default n - depends on BB_CONFIG_RPM - help - Enable handling of rpms with bzip2-compressed data inside. - -config BB_CONFIG_TAR +config BUSYBOX_TAR bool "tar" default n help @@ -159,117 +178,90 @@ config BB_CONFIG_TAR create compressed archives. It's probably the most widely used UNIX archive program. -config BB_CONFIG_FEATURE_TAR_CREATE +if BUSYBOX_TAR + +config BUSYBOX_FEATURE_TAR_CREATE bool "Enable archive creation" default y - depends on BB_CONFIG_TAR + depends on BUSYBOX_TAR help If you enable this option you'll be able to create tar archives using the `-c' option. -config BB_CONFIG_FEATURE_TAR_GZIP - bool "Enable -z option" - default y - depends on BB_CONFIG_TAR - help - If you enable this option tar will be able to call gzip, - when creating or extracting tar gziped archives. - -config BB_CONFIG_FEATURE_TAR_BZIP2 - bool "Enable -j option to handle .tar.bz2 files" - default n - depends on BB_CONFIG_TAR - help - If you enable this option you'll be able to extract - archives compressed with bzip2. - -config BB_CONFIG_FEATURE_TAR_LZMA - bool "Enable -a option to handle .tar.lzma files" - default n - depends on BB_CONFIG_TAR - help - If you enable this option you'll be able to extract - archives compressed with lzma. - -config BB_CONFIG_FEATURE_TAR_COMPRESS - bool "Enable -Z option" +config BUSYBOX_FEATURE_TAR_AUTODETECT + bool "Autodetect gz/bz2 compressed tarballs" default n - depends on BB_CONFIG_TAR - help - If you enable this option tar will be able to call uncompress, - when extracting .tar.Z archives. - -config BB_CONFIG_FEATURE_TAR_AUTODETECT - bool "Let tar autodetect gz/bz2 compresses tarballs" - default n - depends on BB_CONFIG_FEATURE_TAR_GZIP || BB_CONFIG_FEATURE_TAR_BZIP2 + depends on BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA help With this option tar can automatically detect gzip/bzip2 compressed - tarballs. Currently it works only on seekable streams. + tarballs. Currently it works only on files (not pipes etc). -config BB_CONFIG_FEATURE_TAR_FROM +config BUSYBOX_FEATURE_TAR_FROM bool "Enable -X (exclude from) and -T (include from) options)" default n - depends on BB_CONFIG_TAR + depends on BUSYBOX_TAR help If you enable this option you'll be able to specify a list of files to include or exclude from an archive. -config BB_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY +config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY bool "Support for old tar header format" default N - depends on BB_CONFIG_TAR + depends on BUSYBOX_TAR help This option is required to unpack archives created in the old GNU format; help to kill this old format by repacking your ancient archives with the new format. -config BB_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY +config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY bool "Enable untarring of tarballs with checksums produced by buggy Sun tar" default N - depends on BB_CONFIG_TAR + depends on BUSYBOX_TAR help This option is required to unpack archives created by some old - version of Sun's tar (it was calculating checksum using signed arithmetic). - It is said to be fixed in newer Sun tar, but "old" tarballs still exist. + version of Sun's tar (it was calculating checksum using signed + arithmetic). It is said to be fixed in newer Sun tar, but "old" + tarballs still exist. -config BB_CONFIG_FEATURE_TAR_GNU_EXTENSIONS +config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS bool "Support for GNU tar extensions (long filenames)" default y - depends on BB_CONFIG_TAR + depends on BUSYBOX_TAR help With this option busybox supports GNU long filenames and linknames. -config BB_CONFIG_FEATURE_TAR_LONG_OPTIONS +config BUSYBOX_FEATURE_TAR_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_TAR && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_TAR && BUSYBOX_GETOPT_LONG help Enable use of long options, increases size by about 400 Bytes -config BB_CONFIG_FEATURE_TAR_UNAME_GNAME +config BUSYBOX_FEATURE_TAR_UNAME_GNAME bool "Enable use of user and group names" default n - depends on BB_CONFIG_TAR + depends on BUSYBOX_TAR help Enables use of user and group names in tar. This affects contents listings (-t) and preserving permissions when unpacking (-p). +200 bytes. -config BB_CONFIG_UNCOMPRESS +endif #tar + +config BUSYBOX_UNCOMPRESS bool "uncompress" default n help uncompress is used to decompress archives created by compress. Not much used anymore, replaced by gzip/gunzip. -config BB_CONFIG_UNLZMA +config BUSYBOX_UNLZMA bool "unlzma" default n help unlzma is a compression utility using the Lempel-Ziv-Markov chain - compression algorithm, and range coding. Compression + compression algorithm, and range coding. Compression is generally considerably better than that achieved by the bzip2 compressors. @@ -279,15 +271,15 @@ config BB_CONFIG_UNLZMA Unless you have a specific application which requires unlzma, you should probably say N here. -config BB_CONFIG_FEATURE_LZMA_FAST - bool "Optimze unlzma for speed" +config BUSYBOX_FEATURE_LZMA_FAST + bool "Optimize unlzma for speed" default n - depends on BB_CONFIG_UNLZMA + depends on BUSYBOX_UNLZMA help This option reduces decompression time by about 33% at the cost of a 2K bigger binary. -config BB_CONFIG_UNZIP +config BUSYBOX_UNZIP bool "unzip" default n help @@ -297,48 +289,4 @@ config BB_CONFIG_UNZIP current directory. Use the `-d' option to extract to a directory of your choice. -comment "Common options for cpio and tar" - depends on BB_CONFIG_CPIO || BB_CONFIG_TAR - -config BB_CONFIG_FEATURE_UNARCHIVE_TAPE - bool "Enable tape drive support" - default n - depends on BB_CONFIG_CPIO || BB_CONFIG_TAR - help - I don't think this is needed anymore. - -comment "Common options for dpkg and dpkg_deb" - depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB - -config BB_CONFIG_FEATURE_DEB_TAR_GZ - bool "gzip debian packages (normal)" - default y if BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB - depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB - help - This is the default compression method inside the debian ar file. - - If you want compatibility with standard .deb's you should say yes here. - -config BB_CONFIG_FEATURE_DEB_TAR_BZ2 - bool "bzip2 debian packages" - default n - depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB - help - This allows dpkg and dpkg-deb to extract deb's that are compressed internally - with bzip2 instead of gzip. - - You only want this if you are creating your own custom debian packages that - use an internal control.tar.bz2 or data.tar.bz2. - -config BB_CONFIG_FEATURE_DEB_TAR_LZMA - bool "lzma debian packages" - default n - depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB - help - This allows dpkg and dpkg-deb to extract deb's that are compressed - internally with lzma instead of gzip. - - You only want this if you are creating your own custom debian - packages that use an internal control.tar.lzma or data.tar.lzma. - endmenu diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in index 0b40a0595..10cfcd4a5 100644 --- a/config/busybox/console-tools/Config.in +++ b/config/busybox/console-tools/Config.in @@ -4,109 +4,135 @@ # menu "Console Utilities" - depends on BUSYBOX -config BB_CONFIG_CHVT +config BUSYBOX_CHVT bool "chvt" default n help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) -config BB_CONFIG_CLEAR +config BUSYBOX_CLEAR bool "clear" default n help This program clears the terminal screen. -config BB_CONFIG_DEALLOCVT +config BUSYBOX_DEALLOCVT bool "deallocvt" default n help This program deallocates unused virtual consoles. -config BB_CONFIG_DUMPKMAP +config BUSYBOX_DUMPKMAP bool "dumpkmap" default n help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. -config BB_CONFIG_KBD_MODE +config BUSYBOX_KBD_MODE bool "kbd_mode" default n help This program reports and sets keyboard mode. -config BB_CONFIG_LOADFONT +config BUSYBOX_LOADFONT bool "loadfont" default n help This program loads a console font from standard input. -config BB_CONFIG_LOADKMAP +config BUSYBOX_LOADKMAP bool "loadkmap" default n help This program loads a keyboard translation table from standard input. -config BB_CONFIG_OPENVT +config BUSYBOX_OPENVT bool "openvt" default n help This program is used to start a command on an unused virtual terminal. -config BB_CONFIG_RESET +config BUSYBOX_RESET bool "reset" default n help This program is used to reset the terminal screen, if it gets messed up. -config BB_CONFIG_RESIZE +config BUSYBOX_RESIZE bool "resize" default n help This program is used to (re)set the width and height of your current terminal. -config BB_CONFIG_FEATURE_RESIZE_PRINT +config BUSYBOX_FEATURE_RESIZE_PRINT bool "Print environment variables" default n - depends on BB_CONFIG_RESIZE + depends on BUSYBOX_RESIZE help Prints the newly set size (number of columns and rows) of the terminal. E.g.: COLUMNS=80;LINES=44;export COLUMNS LINES; -config BB_CONFIG_SETCONSOLE +config BUSYBOX_SETCONSOLE bool "setconsole" default n help This program redirects the system console to another device, like the current tty while logged in via telnet. -config BB_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS +config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_SETCONSOLE && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_SETCONSOLE && BUSYBOX_GETOPT_LONG help Support long options for the setconsole applet. -config BB_CONFIG_SETKEYCODES +config BUSYBOX_SETFONT + bool "setfont" + default n + help + Allows to load console screen map. Useful for i18n. + +config BUSYBOX_FEATURE_SETFONT_TEXTUAL_MAP + bool "Support reading textual screen maps" + default n + depends on BUSYBOX_SETFONT + help + Support reading textual screen maps. + +config BUSYBOX_DEFAULT_SETFONT_DIR + string "Default directory for console-tools files" + default "" + depends on BUSYBOX_SETFONT + help + Directory to use if setfont's params are simple filenames + (not /path/to/file or ./file). Default is "" (no default directory). + +config BUSYBOX_SETKEYCODES bool "setkeycodes" default n help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. -config BB_CONFIG_SETLOGCONS +config BUSYBOX_SETLOGCONS bool "setlogcons" default n help This program redirects the output console of kernel messages. +config BUSYBOX_SHOWKEY + bool "showkey" + default n + help + Shows keys pressed. + endmenu diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index e60b713fc..9fb613b55 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -4,104 +4,103 @@ # menu "Coreutils" - depends on BUSYBOX -config BB_CONFIG_BASENAME +config BUSYBOX_BASENAME bool "basename" default n help basename is used to strip the directory and suffix from filenames, - leaving just the filename itself. Enable this option if you wish + leaving just the filename itself. Enable this option if you wish to enable the 'basename' utility. -config BB_CONFIG_CAL +config BUSYBOX_CAL bool "cal" default n help cal is used to display a monthly calender. -config BB_CONFIG_CAT +config BUSYBOX_CAT bool "cat" default n help cat is used to concatenate files and print them to the standard - output. Enable this option if you wish to enable the 'cat' utility. + output. Enable this option if you wish to enable the 'cat' utility. -config BB_CONFIG_CATV +config BUSYBOX_CATV bool "catv" default n help Display nonprinting characters as escape sequences (like some implementations' cat -v option). -config BB_CONFIG_CHGRP +config BUSYBOX_CHGRP bool "chgrp" default n help chgrp is used to change the group ownership of files. -config BB_CONFIG_CHMOD +config BUSYBOX_CHMOD bool "chmod" default n help chmod is used to change the access permission of files. -config BB_CONFIG_CHOWN +config BUSYBOX_CHOWN bool "chown" default n help chown is used to change the user and/or group ownership of files. -config BB_CONFIG_CHROOT +config BUSYBOX_CHROOT bool "chroot" default n help chroot is used to change the root directory and run a command. The default command is `/bin/sh'. -config BB_CONFIG_CKSUM +config BUSYBOX_CKSUM bool "cksum" default n help cksum is used to calculate the CRC32 checksum of a file. -config BB_CONFIG_COMM +config BUSYBOX_COMM bool "comm" default n help comm is used to compare two files line by line and return a three-column output. -config BB_CONFIG_CP +config BUSYBOX_CP bool "cp" default n help cp is used to copy files and directories. -config BB_CONFIG_CUT +config BUSYBOX_CUT bool "cut" default n help cut is used to print selected parts of lines from each file to stdout. -config BB_CONFIG_DATE +config BUSYBOX_DATE bool "date" default n help date is used to set the system date or display the current time in the given format. -config BB_CONFIG_FEATURE_DATE_ISOFMT +config BUSYBOX_FEATURE_DATE_ISOFMT bool "Enable ISO date format output (-I)" default y - depends on BB_CONFIG_DATE + depends on BUSYBOX_DATE help Enable option (-I) to output an ISO-8601 compliant date/time string. -config BB_CONFIG_DD +config BUSYBOX_DD bool "dd" default n help @@ -109,91 +108,92 @@ config BB_CONFIG_DD by default) using specific input and output blocksizes, while optionally performing conversions on it. -config BB_CONFIG_FEATURE_DD_SIGNAL_HANDLING +config BUSYBOX_FEATURE_DD_SIGNAL_HANDLING bool "Enable DD signal handling for status reporting" default y - depends on BB_CONFIG_DD + depends on BUSYBOX_DD help sending a SIGUSR1 signal to a running `dd' process makes it print to standard error the number of records read and written so far, then to resume copying. - $ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid + $ dd if=/dev/zero of=/dev/null& + $ pid=$! kill -USR1 $pid; sleep 1; kill $pid 10899206+0 records in 10899206+0 records out -config BB_CONFIG_FEATURE_DD_IBS_OBS +config BUSYBOX_FEATURE_DD_IBS_OBS bool "Enable ibs, obs and conv options" default n - depends on BB_CONFIG_DD + depends on BUSYBOX_DD help Enables support for writing a certain number of bytes in and out, at a time, and performing conversions on the data stream. -config BB_CONFIG_DF +config BUSYBOX_DF bool "df" default n help df reports the amount of disk space used and available on filesystems. -config BB_CONFIG_FEATURE_DF_INODE - bool "Enable -i (inode information)" +config BUSYBOX_FEATURE_DF_FANCY + bool "Enable -a, -i, -B" default n - depends on BB_CONFIG_DF + depends on BUSYBOX_DF help - This option enables support for df -i. + This option enables -a, -i and -B. -config BB_CONFIG_DIRNAME +config BUSYBOX_DIRNAME bool "dirname" default n help dirname is used to strip a non-directory suffix from a file name. -config BB_CONFIG_DOS2UNIX +config BUSYBOX_DOS2UNIX bool "dos2unix/unix2dos" default n help dos2unix is used to convert a text file from DOS format to UNIX format, and vice versa. -config BB_CONFIG_UNIX2DOS +config BUSYBOX_UNIX2DOS bool default y - depends on BB_CONFIG_DOS2UNIX + depends on BUSYBOX_DOS2UNIX help unix2dos is used to convert a text file from UNIX format to DOS format, and vice versa. -config BB_CONFIG_DU +config BUSYBOX_DU bool "du (default blocksize of 512 bytes)" default n help du is used to report the amount of disk space used for specified files. -config BB_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K +config BUSYBOX_FEATURE_DU_DEFAULT_BLOCKSIZE_1K bool "Use a default blocksize of 1024 bytes (1K)" default y - depends on BB_CONFIG_DU + depends on BUSYBOX_DU help Use a blocksize of (1K) instead of the default 512b. -config BB_CONFIG_ECHO +config BUSYBOX_ECHO bool "echo (basic SuSv3 version taking no options)" default n help echo is used to print a specified string to stdout. # this entry also appears in shell/Config.in, next to the echo builtin -config BB_CONFIG_FEATURE_FANCY_ECHO +config BUSYBOX_FEATURE_FANCY_ECHO bool "Enable echo options (-n and -e)" default y - depends on BB_CONFIG_ECHO + depends on BUSYBOX_ECHO || BUSYBOX_ASH_BUILTIN_ECHO help This adds options (-n and -e) to echo. -config BB_CONFIG_ENV +config BUSYBOX_ENV bool "env" default n help @@ -201,171 +201,171 @@ config BB_CONFIG_ENV a command; without options it displays the current environment. -config BB_CONFIG_FEATURE_ENV_LONG_OPTIONS +config BUSYBOX_FEATURE_ENV_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_ENV && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_ENV && BUSYBOX_GETOPT_LONG help Support long options for the env applet. -config BB_CONFIG_EXPAND +config BUSYBOX_EXPAND bool "expand" default n help By default, convert all tabs to spaces. -config BB_CONFIG_FEATURE_EXPAND_LONG_OPTIONS +config BUSYBOX_FEATURE_EXPAND_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_EXPAND && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_EXPAND && BUSYBOX_GETOPT_LONG help Support long options for the expand applet. -config BB_CONFIG_EXPR +config BUSYBOX_EXPR bool "expr" default n help expr is used to calculate numbers and print the result to standard output. -config BB_CONFIG_EXPR_MATH_SUPPORT_64 +config BUSYBOX_EXPR_MATH_SUPPORT_64 bool "Extend Posix numbers support to 64 bit" default n - depends on BB_CONFIG_EXPR + depends on BUSYBOX_EXPR help - Enable 64-bit math support in the expr applet. This will make + Enable 64-bit math support in the expr applet. This will make the applet slightly larger, but will allow computation with very large numbers. -config BB_CONFIG_FALSE +config BUSYBOX_FALSE bool "false" default n help false returns an exit code of FALSE (1). -config BB_CONFIG_FOLD +config BUSYBOX_FOLD bool "fold" default n help Wrap text to fit a specific width. -config BB_CONFIG_HEAD +config BUSYBOX_HEAD bool "head" default n help head is used to print the first specified number of lines from files. -config BB_CONFIG_FEATURE_FANCY_HEAD +config BUSYBOX_FEATURE_FANCY_HEAD bool "Enable head options (-c, -q, and -v)" default n - depends on BB_CONFIG_HEAD + depends on BUSYBOX_HEAD help This enables the head options (-c, -q, and -v). -config BB_CONFIG_HOSTID +config BUSYBOX_HOSTID bool "hostid" default n help hostid prints the numeric identifier (in hexadecimal) for the current host. -config BB_CONFIG_ID +config BUSYBOX_ID bool "id" default n help id displays the current user and group ID names. -config BB_CONFIG_INSTALL +config BUSYBOX_INSTALL bool "install" default n help Copy files and set attributes. -config BB_CONFIG_FEATURE_INSTALL_LONG_OPTIONS +config BUSYBOX_FEATURE_INSTALL_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_INSTALL && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_INSTALL && BUSYBOX_GETOPT_LONG help Support long options for the install applet. -config BB_CONFIG_LENGTH +config BUSYBOX_LENGTH bool "length" default n help length is used to print out the length of a specified string. -config BB_CONFIG_LN +config BUSYBOX_LN bool "ln" default n help ln is used to create hard or soft links between files. -config BB_CONFIG_LOGNAME +config BUSYBOX_LOGNAME bool "logname" default n help logname is used to print the current user's login name. -config BB_CONFIG_LS +config BUSYBOX_LS bool "ls" default n help ls is used to list the contents of directories. -config BB_CONFIG_FEATURE_LS_FILETYPES +config BUSYBOX_FEATURE_LS_FILETYPES bool "Enable filetyping options (-p and -F)" default y - depends on BB_CONFIG_LS + depends on BUSYBOX_LS help Enable the ls options (-p and -F). -config BB_CONFIG_FEATURE_LS_FOLLOWLINKS +config BUSYBOX_FEATURE_LS_FOLLOWLINKS bool "Enable symlinks dereferencing (-L)" default y - depends on BB_CONFIG_LS + depends on BUSYBOX_LS help Enable the ls option (-L). -config BB_CONFIG_FEATURE_LS_RECURSIVE +config BUSYBOX_FEATURE_LS_RECURSIVE bool "Enable recursion (-R)" default y - depends on BB_CONFIG_LS + depends on BUSYBOX_LS help Enable the ls option (-R). -config BB_CONFIG_FEATURE_LS_SORTFILES +config BUSYBOX_FEATURE_LS_SORTFILES bool "Sort the file names" default y - depends on BB_CONFIG_LS + depends on BUSYBOX_LS help Allow ls to sort file names alphabetically. -config BB_CONFIG_FEATURE_LS_TIMESTAMPS +config BUSYBOX_FEATURE_LS_TIMESTAMPS bool "Show file timestamps" default y - depends on BB_CONFIG_LS + depends on BUSYBOX_LS help Allow ls to display timestamps for files. -config BB_CONFIG_FEATURE_LS_USERNAME +config BUSYBOX_FEATURE_LS_USERNAME bool "Show username/groupnames" default y - depends on BB_CONFIG_LS + depends on BUSYBOX_LS help Allow ls to display username/groupname for files. -config BB_CONFIG_FEATURE_LS_COLOR +config BUSYBOX_FEATURE_LS_COLOR bool "Allow use of color to identify file types" default y - depends on BB_CONFIG_LS && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_LS && BUSYBOX_GETOPT_LONG help This enables the --color option to ls. -config BB_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT +config BUSYBOX_FEATURE_LS_COLOR_IS_DEFAULT bool "Produce colored ls output by default" default n - depends on BB_CONFIG_FEATURE_LS_COLOR + depends on BUSYBOX_FEATURE_LS_COLOR help Saying yes here will turn coloring on by default, even if no "--color" option is given to the ls command. @@ -373,297 +373,312 @@ config BB_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT configurable, and the output may not be legible on many output screens. -config BB_CONFIG_MD5SUM +config BUSYBOX_MD5SUM bool "md5sum" default n help md5sum is used to print or check MD5 checksums. -config BB_CONFIG_MKDIR +config BUSYBOX_MKDIR bool "mkdir" default n help mkdir is used to create directories with the specified names. -config BB_CONFIG_FEATURE_MKDIR_LONG_OPTIONS +config BUSYBOX_FEATURE_MKDIR_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_MKDIR && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_MKDIR && BUSYBOX_GETOPT_LONG help Support long options for the mkdir applet. -config BB_CONFIG_MKFIFO +config BUSYBOX_MKFIFO bool "mkfifo" default n help mkfifo is used to create FIFOs (named pipes). The `mknod' program can also create FIFOs. -config BB_CONFIG_MKNOD +config BUSYBOX_MKNOD bool "mknod" default n help mknod is used to create FIFOs or block/character special files with the specified names. -config BB_CONFIG_MV +config BUSYBOX_MV bool "mv" default n help mv is used to move or rename files or directories. -config BB_CONFIG_FEATURE_MV_LONG_OPTIONS +config BUSYBOX_FEATURE_MV_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_MV && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_MV && BUSYBOX_GETOPT_LONG help Support long options for the mv applet. -config BB_CONFIG_NICE +config BUSYBOX_NICE bool "nice" default n help nice runs a program with modified scheduling priority. -config BB_CONFIG_NOHUP +config BUSYBOX_NOHUP bool "nohup" default n help run a command immune to hangups, with output to a non-tty. -config BB_CONFIG_OD +config BUSYBOX_OD bool "od" default n help od is used to dump binary files in octal and other formats. -config BB_CONFIG_PRINTENV +config BUSYBOX_PRINTENV bool "printenv" default n help printenv is used to print all or part of environment. -config BB_CONFIG_PRINTF +config BUSYBOX_PRINTF bool "printf" default n help printf is used to format and print specified strings. It's similar to `echo' except it has more options. -config BB_CONFIG_PWD +config BUSYBOX_PWD bool "pwd" default n help pwd is used to print the current directory. -config BB_CONFIG_READLINK +config BUSYBOX_READLINK bool "readlink" default n help This program reads a symbolic link and returns the name of the file it points to -config BB_CONFIG_FEATURE_READLINK_FOLLOW +config BUSYBOX_FEATURE_READLINK_FOLLOW bool "Enable canonicalization by following all symlinks (-f)" default n - depends on BB_CONFIG_READLINK + depends on BUSYBOX_READLINK help Enable the readlink option (-f). -config BB_CONFIG_REALPATH +config BUSYBOX_REALPATH bool "realpath" default n help Return the canonicalized absolute pathname. This isn't provided by GNU shellutils, but where else does it belong. -config BB_CONFIG_RM +config BUSYBOX_RM bool "rm" default n help rm is used to remove files or directories. -config BB_CONFIG_RMDIR +config BUSYBOX_RMDIR bool "rmdir" default n help rmdir is used to remove empty directories. -config BB_CONFIG_FEATURE_RMDIR_LONG_OPTIONS +config BUSYBOX_FEATURE_RMDIR_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_RMDIR && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_RMDIR && BUSYBOX_GETOPT_LONG help Support long options for the rmdir applet, including --ignore-fail-on-non-empty for compatibility with GNU rmdir. -config BB_CONFIG_SEQ +config BUSYBOX_SEQ bool "seq" default n help print a sequence of numbers -config BB_CONFIG_SHA1SUM +config BUSYBOX_SHA1SUM bool "sha1sum" default n help Compute and check SHA1 message digest -config BB_CONFIG_SLEEP - bool "sleep (single integer arg with no suffix)" +config BUSYBOX_SLEEP + bool "sleep" default n help - sleep is used to pause for a specified number of seconds, + sleep is used to pause for a specified number of seconds. + It comes in 3 versions: + - small: takes one integer parameter + - fancy: takes multiple integer arguments with suffixes: + sleep 1d 2h 3m 15s + - fancy with fractional numbers: + sleep 2.3s 4.5h sleeps for 16202.3 seconds + Last one is "the most compatible" with coreutils sleep, + but it adds around 1k of code. -config BB_CONFIG_FEATURE_FANCY_SLEEP - bool "Enable multiple integer args and optional time suffixes" +config BUSYBOX_FEATURE_FANCY_SLEEP + bool "Enable multiple arguments and s/m/h/d suffixes" default n - depends on BB_CONFIG_SLEEP + depends on BUSYBOX_SLEEP help Allow sleep to pause for specified minutes, hours, and days. -config BB_CONFIG_SORT +config BUSYBOX_FEATURE_FLOAT_SLEEP + bool "Enable fractional arguments" + default n + depends on BUSYBOX_FEATURE_FANCY_SLEEP + help + Allow for fractional numeric parameters. + +config BUSYBOX_SORT bool "sort" default n help sort is used to sort lines of text in specified files. -config BB_CONFIG_FEATURE_SORT_BIG +config BUSYBOX_FEATURE_SORT_BIG bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)" default y - depends on BB_CONFIG_SORT + depends on BUSYBOX_SORT help - Without this, sort only supports -r, -u, and an integer version - of -n. Selecting this adds sort keys, floating point support, and - more. This adds a little over 3k to a nonstatic build on x86. + Without this, sort only supports -r, -u, and an integer version + of -n. Selecting this adds sort keys, floating point support, and + more. This adds a little over 3k to a nonstatic build on x86. The SuSv3 sort standard is available at: http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html -config BB_CONFIG_SPLIT +config BUSYBOX_SPLIT bool "split" default n help split a file into pieces. -config BB_CONFIG_FEATURE_SPLIT_FANCY +config BUSYBOX_FEATURE_SPLIT_FANCY bool "Fancy extensions" default n - depends on BB_CONFIG_SPLIT + depends on BUSYBOX_SPLIT help Add support for features not required by SUSv3. Supports additional suffixes 'b' for 512 bytes, 'g' for 1GiB for the -b option. -config BB_CONFIG_STAT +config BUSYBOX_STAT bool "stat" default n help display file or filesystem status. -config BB_CONFIG_FEATURE_STAT_FORMAT +config BUSYBOX_FEATURE_STAT_FORMAT bool "Enable custom formats (-c)" default n - depends on BB_CONFIG_STAT + depends on BUSYBOX_STAT help Without this, stat will not support the '-c format' option where - users can pass a custom format string for output. This adds about + users can pass a custom format string for output. This adds about 7k to a nonstatic build on amd64. -config BB_CONFIG_STTY +config BUSYBOX_STTY bool "stty" default n help stty is used to change and print terminal line settings. -config BB_CONFIG_SUM +config BUSYBOX_SUM bool "sum" default n help checksum and count the blocks in a file -config BB_CONFIG_SYNC +config BUSYBOX_SYNC bool "sync" default n help sync is used to flush filesystem buffers. -config BB_CONFIG_TAC +config BUSYBOX_TAC bool "tac" default n help tac is used to concatenate and print files in reverse. -config BB_CONFIG_TAIL +config BUSYBOX_TAIL bool "tail" default n help tail is used to print the last specified number of lines from files. -config BB_CONFIG_FEATURE_FANCY_TAIL +config BUSYBOX_FEATURE_FANCY_TAIL bool "Enable extra tail options (-q, -s, and -v)" default y - depends on BB_CONFIG_TAIL + depends on BUSYBOX_TAIL help The options (-q, -s, and -v) are provided by GNU tail, but are not specific in the SUSv3 standard. -config BB_CONFIG_TEE +config BUSYBOX_TEE bool "tee" default n help tee is used to read from standard input and write to standard output and files. -config BB_CONFIG_FEATURE_TEE_USE_BLOCK_IO +config BUSYBOX_FEATURE_TEE_USE_BLOCK_IO bool "Enable block I/O (larger/faster) instead of byte I/O" default n - depends on BB_CONFIG_TEE + depends on BUSYBOX_TEE help Enable this option for a faster tee, at expense of size. -config BB_CONFIG_TEST +config BUSYBOX_TEST bool "test" default n help test is used to check file types and compare values, - returning an appropriate exit code. The bash shell + returning an appropriate exit code. The bash shell has test built in, ash can build it in optionally. -config BB_CONFIG_FEATURE_TEST_64 +config BUSYBOX_FEATURE_TEST_64 bool "Extend test to 64 bit" default n - depends on BB_CONFIG_TEST + depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST help Enable 64-bit support in test. -config BB_CONFIG_TOUCH +config BUSYBOX_TOUCH bool "touch" default n help touch is used to create or change the access and/or modification timestamp of specified files. -config BB_CONFIG_TR +config BUSYBOX_TR bool "tr" default n help tr is used to squeeze, and/or delete characters from standard input, writing to standard output. -config BB_CONFIG_FEATURE_TR_CLASSES +config BUSYBOX_FEATURE_TR_CLASSES bool "Enable character classes (such as [:upper:])" default n - depends on BB_CONFIG_TR + depends on BUSYBOX_TR help Enable character classes, enabling commands such as: tr [:upper:] [:lower:] to convert input into lowercase. -config BB_CONFIG_FEATURE_TR_EQUIV +config BUSYBOX_FEATURE_TR_EQUIV bool "Enable equivalence classes" default n - depends on BB_CONFIG_TR + depends on BUSYBOX_TR help Enable equivalence classes, which essentially add the enclosed character to the current set. For instance, tr [=a=] xyz would @@ -671,91 +686,91 @@ config BB_CONFIG_FEATURE_TR_EQUIV useful for cases when no other way of expressing a character is possible. -config BB_CONFIG_TRUE +config BUSYBOX_TRUE bool "true" default n help true returns an exit code of TRUE (0). -config BB_CONFIG_TTY +config BUSYBOX_TTY bool "tty" default n help tty is used to print the name of the current terminal to standard output. -config BB_CONFIG_UNAME +config BUSYBOX_UNAME bool "uname" default n help uname is used to print system information. -config BB_CONFIG_UNEXPAND +config BUSYBOX_UNEXPAND bool "unexpand" default n help By default, convert only leading sequences of blanks to tabs. -config BB_CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS +config BUSYBOX_FEATURE_UNEXPAND_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_UNEXPAND && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_UNEXPAND && BUSYBOX_GETOPT_LONG help Support long options for the unexpand applet. -config BB_CONFIG_UNIQ +config BUSYBOX_UNIQ bool "uniq" default n help uniq is used to remove duplicate lines from a sorted file. -config BB_CONFIG_USLEEP +config BUSYBOX_USLEEP bool "usleep" default n help usleep is used to pause for a specified number of microseconds. -config BB_CONFIG_UUDECODE +config BUSYBOX_UUDECODE bool "uudecode" default n help uudecode is used to decode a uuencoded file. -config BB_CONFIG_UUENCODE +config BUSYBOX_UUENCODE bool "uuencode" default n help uuencode is used to uuencode a file. -config BB_CONFIG_WC +config BUSYBOX_WC bool "wc" default n help wc is used to print the number of bytes, words, and lines, in specified files. -config BB_CONFIG_FEATURE_WC_LARGE +config BUSYBOX_FEATURE_WC_LARGE bool "Support very large files in wc" default n - depends on BB_CONFIG_WC + depends on BUSYBOX_WC help - Use "unsigned long long" in wc for count variables + Use "unsigned long long" in wc for count variables. -config BB_CONFIG_WHO +config BUSYBOX_WHO bool "who" default n - select BB_CONFIG_FEATURE_UTMP + select BUSYBOX_FEATURE_UTMP help who is used to show who is logged on. -config BB_CONFIG_WHOAMI +config BUSYBOX_WHOAMI bool "whoami" default n help whoami is used to print the username of the current user id (same as id -un). -config BB_CONFIG_YES +config BUSYBOX_YES bool "yes" default n help @@ -763,22 +778,22 @@ config BB_CONFIG_YES the default string `y'. comment "Common options for cp and mv" - depends on BB_CONFIG_CP || BB_CONFIG_MV + depends on BUSYBOX_CP || BUSYBOX_MV -config BB_CONFIG_FEATURE_PRESERVE_HARDLINKS +config BUSYBOX_FEATURE_PRESERVE_HARDLINKS bool "Preserve hard links" default n - depends on BB_CONFIG_CP || BB_CONFIG_MV + depends on BUSYBOX_CP || BUSYBOX_MV help Allow cp and mv to preserve hard links. comment "Common options for ls, more and telnet" - depends on BB_CONFIG_LS || BB_CONFIG_MORE || BB_CONFIG_TELNET + depends on BUSYBOX_LS || BUSYBOX_MORE || BUSYBOX_TELNET -config BB_CONFIG_FEATURE_AUTOWIDTH +config BUSYBOX_FEATURE_AUTOWIDTH bool "Calculate terminal & column widths" default y - depends on BB_CONFIG_LS || BB_CONFIG_MORE || BB_CONFIG_TELNET + depends on BUSYBOX_LS || BUSYBOX_MORE || BUSYBOX_TELNET help This option allows utilities such as 'ls', 'more' and 'telnet' to determine the width of the screen, which can allow them to @@ -787,22 +802,22 @@ config BB_CONFIG_FEATURE_AUTOWIDTH primitive and will be unable to determine the current screen width. comment "Common options for df, du, ls" - depends on BB_CONFIG_DF || BB_CONFIG_DU || BB_CONFIG_LS + depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS -config BB_CONFIG_FEATURE_HUMAN_READABLE +config BUSYBOX_FEATURE_HUMAN_READABLE bool "Support for human readable output (example 13k, 23M, 235G)" default n - depends on BB_CONFIG_DF || BB_CONFIG_DU || BB_CONFIG_LS + depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS help Allow df, du, and ls to have human readable output. comment "Common options for md5sum, sha1sum" - depends on BB_CONFIG_MD5SUM || BB_CONFIG_SHA1SUM + depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM -config BB_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK +config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK bool "Enable -c, -s and -w options" default n - depends on BB_CONFIG_MD5SUM || BB_CONFIG_SHA1SUM + depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM help Enabling the -c options allows files to be checked against pre-calculated hash values. diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in index eaa971f37..711142973 100644 --- a/config/busybox/debianutils/Config.in +++ b/config/busybox/debianutils/Config.in @@ -4,21 +4,20 @@ # menu "Debian Utilities" - depends on BUSYBOX -config BB_CONFIG_MKTEMP +config BUSYBOX_MKTEMP bool "mktemp" default n help mktemp is used to create unique temporary files -config BB_CONFIG_PIPE_PROGRESS +config BUSYBOX_PIPE_PROGRESS bool "pipe_progress" default n help Display a dot to indicate pipe activity. -config BB_CONFIG_RUN_PARTS +config BUSYBOX_RUN_PARTS bool "run-parts" default n help @@ -27,29 +26,29 @@ config BB_CONFIG_RUN_PARTS It is useful to set up a directory like cron.daily, where you need to execute all the scripts in that directory. - In this implementation of run-parts some features (such as report mode) - are not implemented. + In this implementation of run-parts some features (such as report + mode) are not implemented. Unless you know that run-parts is used in some of your scripts you can safely say N here. -config BB_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS +config BUSYBOX_FEATURE_RUN_PARTS_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_RUN_PARTS && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_RUN_PARTS && BUSYBOX_GETOPT_LONG help Support long options for the run-parts applet. -config BB_CONFIG_FEATURE_RUN_PARTS_FANCY +config BUSYBOX_FEATURE_RUN_PARTS_FANCY bool "Support additional arguments" default n - depends on BB_CONFIG_RUN_PARTS + depends on BUSYBOX_RUN_PARTS help Support additional options: -l --list print the names of the all matching files (not limited to executables), but don't actually run them. -config BB_CONFIG_START_STOP_DAEMON +config BUSYBOX_START_STOP_DAEMON bool "start-stop-daemon" default n help @@ -57,23 +56,24 @@ config BB_CONFIG_START_STOP_DAEMON termination of system-level processes, usually the ones started during the startup of the system. -config BB_CONFIG_FEATURE_START_STOP_DAEMON_FANCY +config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY bool "Support additional arguments" default n - depends on BB_CONFIG_START_STOP_DAEMON + depends on BUSYBOX_START_STOP_DAEMON help Support additional arguments. -o|--oknodo ignored since we exit with 0 anyway -v|--verbose + -N|--nicelevel N -config BB_CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS +config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_START_STOP_DAEMON && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_START_STOP_DAEMON && BUSYBOX_GETOPT_LONG help Support long options for the start-stop-daemon applet. -config BB_CONFIG_WHICH +config BUSYBOX_WHICH bool "which" default n help diff --git a/config/busybox/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in index dc5be1ea7..6a6af1e72 100644 --- a/config/busybox/e2fsprogs/Config.in +++ b/config/busybox/e2fsprogs/Config.in @@ -4,9 +4,8 @@ # menu "Linux Ext2 FS Progs" - depends on BUSYBOX -config BB_CONFIG_CHATTR +config BUSYBOX_CHATTR bool "chattr" default n help @@ -21,7 +20,7 @@ config BB_CONFIG_CHATTR ### The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also ### provided. -config BB_CONFIG_FSCK +config BUSYBOX_FSCK bool "fsck" default n help @@ -29,7 +28,7 @@ config BB_CONFIG_FSCK In actuality, fsck is simply a front-end for the various file system checkers (fsck.fstype) available under Linux. -config BB_CONFIG_LSATTR +config BUSYBOX_LSATTR bool "lsattr" default n help @@ -39,7 +38,7 @@ config BB_CONFIG_LSATTR ### bool "mke2fs" ### default n ### help -### mke2fs is used to create an ext2/ext3 filesystem. The normal compat +### mke2fs is used to create an ext2/ext3 filesystem. The normal compat ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. ### config TUNE2FS diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in index 592b66fb0..2e690cf89 100644 --- a/config/busybox/editors/Config.in +++ b/config/busybox/editors/Config.in @@ -4,31 +4,30 @@ # menu "Editors" - depends on BUSYBOX -config BB_CONFIG_AWK +config BUSYBOX_AWK bool "awk" default n help - Awk is used as a pattern scanning and processing language. This is + Awk is used as a pattern scanning and processing language. This is the BusyBox implementation of that programming language. -config BB_CONFIG_FEATURE_AWK_MATH +config BUSYBOX_FEATURE_AWK_LIBM bool "Enable math functions (requires libm)" - default y - depends on BB_CONFIG_AWK + default n + depends on BUSYBOX_AWK help Enable math functions of the Awk programming language. NOTE: This will require libm to be present for linking. -config BB_CONFIG_CMP +config BUSYBOX_CMP bool "cmp" default n help cmp is used to compare two files and returns the result to standard output. -config BB_CONFIG_DIFF +config BUSYBOX_DIFF bool "diff" default n help @@ -36,160 +35,160 @@ config BB_CONFIG_DIFF differences between them in a form that can be given to the patch command. -config BB_CONFIG_FEATURE_DIFF_BINARY +config BUSYBOX_FEATURE_DIFF_BINARY bool "Enable checks for binary files" default y - depends on BB_CONFIG_DIFF + depends on BUSYBOX_DIFF help This option enables support for checking for binary files before a comparison is carried out. -config BB_CONFIG_FEATURE_DIFF_DIR +config BUSYBOX_FEATURE_DIFF_DIR bool "Enable directory support" default y - depends on BB_CONFIG_DIFF + depends on BUSYBOX_DIFF help This option enables support for directory and subdirectory comparison. -config BB_CONFIG_FEATURE_DIFF_MINIMAL +config BUSYBOX_FEATURE_DIFF_MINIMAL bool "Enable -d option to find smaller sets of changes" default n - depends on BB_CONFIG_DIFF + depends on BUSYBOX_DIFF help Enabling this option allows the use of -d to make diff try hard to find the smallest possible set of changes. -config BB_CONFIG_ED +config BUSYBOX_ED bool "ed" default n help The original 1970's Unix text editor, from the days of teletypes. - Small, simple, evil. Part of SUSv3. If you're not already using + Small, simple, evil. Part of SUSv3. If you're not already using this, you don't need it. -config BB_CONFIG_PATCH +config BUSYBOX_PATCH bool "patch" default n help Apply a unified diff formatted patch. -config BB_CONFIG_SED +config BUSYBOX_SED bool "sed" default n help sed is used to perform text transformations on a file or input from a pipeline. -config BB_CONFIG_VI +config BUSYBOX_VI bool "vi" default n help - 'vi' is a text editor. More specifically, it is the One True - text editor . It does, however, have a rather steep - learning curve. If you are not already comfortable with 'vi' + 'vi' is a text editor. More specifically, it is the One True + text editor . It does, however, have a rather steep + learning curve. If you are not already comfortable with 'vi' you may wish to use something else. -config BB_CONFIG_FEATURE_VI_MAX_LEN +config BUSYBOX_FEATURE_VI_MAX_LEN int "Maximum screen width in vi" range 256 16384 default 4096 - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help Contrary to what you may think, this is not eating much. Make it smaller than 4k only if you are very limited on memory. -config BB_CONFIG_FEATURE_VI_8BIT +config BUSYBOX_FEATURE_VI_8BIT bool "Allow vi to display 8-bit chars (otherwise shows dots)" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help If your terminal can display characters with high bit set, you may want to enable this. Note: vi is not Unicode-capable. If your terminal combines several 8-bit bytes into one character (as in Unicode mode), this will not work properly. -config BB_CONFIG_FEATURE_VI_COLON +config BUSYBOX_FEATURE_VI_COLON bool "Enable \":\" colon commands (no \"ex\" mode)" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help - Enable a limited set of colon commands for vi. This does not + Enable a limited set of colon commands for vi. This does not provide an "ex" mode. -config BB_CONFIG_FEATURE_VI_YANKMARK +config BUSYBOX_FEATURE_VI_YANKMARK bool "Enable yank/put commands and mark cmds" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help This will enable you to use yank and put, as well as mark in busybox vi. -config BB_CONFIG_FEATURE_VI_SEARCH +config BUSYBOX_FEATURE_VI_SEARCH bool "Enable search and replace cmds" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help Select this if you wish to be able to do search and replace in busybox vi. -config BB_CONFIG_FEATURE_VI_USE_SIGNALS +config BUSYBOX_FEATURE_VI_USE_SIGNALS bool "Catch signals" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help - Selecting this option will make busybox vi signal aware. This will + Selecting this option will make busybox vi signal aware. This will make busybox vi support SIGWINCH to deal with Window Changes, catch Ctrl-Z and Ctrl-C and alarms. -config BB_CONFIG_FEATURE_VI_DOT_CMD +config BUSYBOX_FEATURE_VI_DOT_CMD bool "Remember previous cmd and \".\" cmd" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help Make busybox vi remember the last command and be able to repeat it. -config BB_CONFIG_FEATURE_VI_READONLY +config BUSYBOX_FEATURE_VI_READONLY bool "Enable -R option and \"view\" mode" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help Enable the read-only command line option, which allows the user to open a file in read-only mode. -config BB_CONFIG_FEATURE_VI_SETOPTS +config BUSYBOX_FEATURE_VI_SETOPTS bool "Enable set-able options, ai ic showmatch" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help Enable the editor to set some (ai, ic, showmatch) options. -config BB_CONFIG_FEATURE_VI_SET +config BUSYBOX_FEATURE_VI_SET bool "Support for :set" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help Support for ":set". -config BB_CONFIG_FEATURE_VI_WIN_RESIZE +config BUSYBOX_FEATURE_VI_WIN_RESIZE bool "Handle window resize" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help Make busybox vi behave nicely with terminals that get resized. -config BB_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR +config BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR bool "Optimize cursor movement" default y - depends on BB_CONFIG_VI + depends on BUSYBOX_VI help This will make the cursor movement faster, but requires more memory and it makes the applet a tiny bit larger. -config BB_CONFIG_FEATURE_ALLOW_EXEC +config BUSYBOX_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" default y - depends on BB_CONFIG_VI || BB_CONFIG_AWK + depends on BUSYBOX_VI || BUSYBOX_AWK help Enables vi and awk features which allows user to execute shell commands (using system() C call). diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in index 64fedce76..7d9494a81 100644 --- a/config/busybox/findutils/Config.in +++ b/config/busybox/findutils/Config.in @@ -4,242 +4,241 @@ # menu "Finding Utilities" - depends on BUSYBOX -config BB_CONFIG_FIND +config BUSYBOX_FIND bool "find" default n help find is used to search your system to find specified files. -config BB_CONFIG_FEATURE_FIND_PRINT0 +config BUSYBOX_FEATURE_FIND_PRINT0 bool "Enable -print0 option" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Causes output names to be separated by a null character - rather than a newline. This allows names that contain + rather than a newline. This allows names that contain newlines and other whitespace to be more easily interpreted by other programs. -config BB_CONFIG_FEATURE_FIND_MTIME - bool "Enable modified time matching (-mtime) option" +config BUSYBOX_FEATURE_FIND_MTIME + bool "Enable modified time matching (-mtime option)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Allow searching based on the modification time of files, in days. -config BB_CONFIG_FEATURE_FIND_MMIN - bool "Enable modified time matching (-mmin) option" +config BUSYBOX_FEATURE_FIND_MMIN + bool "Enable modified time matching (-mmin option)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Allow searching based on the modification time of files, in minutes. -config BB_CONFIG_FEATURE_FIND_PERM - bool "Enable permissions matching (-perm) option" +config BUSYBOX_FEATURE_FIND_PERM + bool "Enable permissions matching (-perm option)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Enable searching based on file permissions. -config BB_CONFIG_FEATURE_FIND_TYPE - bool "Enable filetype matching (-type) option" +config BUSYBOX_FEATURE_FIND_TYPE + bool "Enable filetype matching (-type option)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Enable searching based on file type (file, directory, socket, device, etc.). -config BB_CONFIG_FEATURE_FIND_XDEV - bool "Enable stay in filesystem (-xdev) option" +config BUSYBOX_FEATURE_FIND_XDEV + bool "Enable 'stay in filesystem' option (-xdev)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help This option allows find to restrict searches to a single filesystem. -config BB_CONFIG_FEATURE_FIND_MAXDEPTH +config BUSYBOX_FEATURE_FIND_MAXDEPTH bool "Enable -maxdepth N option" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help This option enables -maxdepth N option. -config BB_CONFIG_FEATURE_FIND_NEWER +config BUSYBOX_FEATURE_FIND_NEWER bool "Enable -newer option for comparing file mtimes" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Support the 'find -newer' option for finding any files which have a modified time that is more recent than the specified FILE. -config BB_CONFIG_FEATURE_FIND_INUM - bool "Enable inode number matching (-inum) option" +config BUSYBOX_FEATURE_FIND_INUM + bool "Enable inode number matching (-inum option)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Support the 'find -inum' option for searching by inode number. -config BB_CONFIG_FEATURE_FIND_EXEC - bool "Enable (-exec) option allowing execution of commands" +config BUSYBOX_FEATURE_FIND_EXEC + bool "Enable -exec option allowing execution of commands" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Support the 'find -exec' option for executing commands based upon the files matched. -config BB_CONFIG_FEATURE_FIND_USER - bool "Enable username/uid matching (-user) option" +config BUSYBOX_FEATURE_FIND_USER + bool "Enable username/uid matching (-user option)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Support the 'find -user' option for searching by username or uid. -config BB_CONFIG_FEATURE_FIND_GROUP - bool "Enable group/gid matching (-group) option" +config BUSYBOX_FEATURE_FIND_GROUP + bool "Enable group/gid matching (-group option)" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Support the 'find -group' option for searching by group name or gid. -config BB_CONFIG_FEATURE_FIND_NOT +config BUSYBOX_FEATURE_FIND_NOT bool "Enable the 'not' (!) operator" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Support the '!' operator to invert the test results. If 'Enable full-blown desktop' is enabled, then will also support the non-POSIX notation '-not'. -config BB_CONFIG_FEATURE_FIND_DEPTH +config BUSYBOX_FEATURE_FIND_DEPTH bool "Enable the -depth option" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Process each directory's contents before the directory itself. -config BB_CONFIG_FEATURE_FIND_PAREN +config BUSYBOX_FEATURE_FIND_PAREN bool "Enable parens in options" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Enable usage of parens '(' to specify logical order of arguments. -config BB_CONFIG_FEATURE_FIND_SIZE - bool "Enable (-size) option allowing matching for file size" +config BUSYBOX_FEATURE_FIND_SIZE + bool "Enable -size option allowing matching for file size" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help Support the 'find -size' option for searching by file size. -config BB_CONFIG_FEATURE_FIND_PRUNE - bool "Enable (-prune) option allowing to exclude subdirectories" +config BUSYBOX_FEATURE_FIND_PRUNE + bool "Enable -prune option allowing to exclude subdirectories" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help If the file is a directory, dont descend into it. Useful for exclusion .svn and CVS directories. -config BB_CONFIG_FEATURE_FIND_DELETE +config BUSYBOX_FEATURE_FIND_DELETE bool "Enable -delete option allowing to delete files" default n - depends on BB_CONFIG_FIND && BB_CONFIG_FEATURE_FIND_DEPTH + depends on BUSYBOX_FIND && BUSYBOX_FEATURE_FIND_DEPTH help - Support the 'find -delete' option for deleting files and direcotries. + Support the 'find -delete' option for deleting files and directories. WARNING: This option can do much harm if used wrong. Busybox will not try to protect the user from doing stupid things. Use with care. -config BB_CONFIG_FEATURE_FIND_PATH +config BUSYBOX_FEATURE_FIND_PATH bool "Enable -path option allowing to match pathname patterns" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help The -path option matches whole pathname instead of just filename. -config BB_CONFIG_FEATURE_FIND_REGEX +config BUSYBOX_FEATURE_FIND_REGEX bool "Enable -regex: match pathname to regex" default y - depends on BB_CONFIG_FIND + depends on BUSYBOX_FIND help The -regex option matches whole pathname against regular expression. -config BB_CONFIG_FEATURE_FIND_CONTEXT - bool "Enable (-context) option for matching security context" +config BUSYBOX_FEATURE_FIND_CONTEXT + bool "Enable -context option for matching security context" default n - depends on BB_CONFIG_FIND && BB_CONFIG_SELINUX + depends on BUSYBOX_FIND && BUSYBOX_SELINUX help Support the 'find -context' option for matching security context. -config BB_CONFIG_GREP +config BUSYBOX_GREP bool "grep" default n help grep is used to search files for a specified pattern. -config BB_CONFIG_FEATURE_GREP_EGREP_ALIAS +config BUSYBOX_FEATURE_GREP_EGREP_ALIAS bool "Support extended regular expressions (egrep & grep -E)" default y - depends on BB_CONFIG_GREP + depends on BUSYBOX_GREP help - Enabled support for extended regular expressions. Extended + Enabled support for extended regular expressions. Extended regular expressions allow for alternation (foo|bar), grouping, and various repetition operators. -config BB_CONFIG_FEATURE_GREP_FGREP_ALIAS +config BUSYBOX_FEATURE_GREP_FGREP_ALIAS bool "Alias fgrep to grep -F" default y - depends on BB_CONFIG_GREP + depends on BUSYBOX_GREP help fgrep sees the search pattern as a normal string rather than regular expressions. grep -F is always builtin, this just creates the fgrep alias. -config BB_CONFIG_FEATURE_GREP_CONTEXT +config BUSYBOX_FEATURE_GREP_CONTEXT bool "Enable before and after context flags (-A, -B and -C)" default y - depends on BB_CONFIG_GREP + depends on BUSYBOX_GREP help Print the specified number of leading (-B) and/or trailing (-A) context surrounding our matching lines. Print the specified number of context lines (-C). -config BB_CONFIG_XARGS +config BUSYBOX_XARGS bool "xargs" default n help xargs is used to execute a specified command on every item from standard input. -config BB_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION +config BUSYBOX_FEATURE_XARGS_SUPPORT_CONFIRMATION bool "Enable prompt and confirmation option -p" default n - depends on BB_CONFIG_XARGS + depends on BUSYBOX_XARGS help Support prompt the user about whether to run each command line and read a line from the terminal. -config BB_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES +config BUSYBOX_FEATURE_XARGS_SUPPORT_QUOTES bool "Enable support single and double quotes and backslash" default n - depends on BB_CONFIG_XARGS + depends on BUSYBOX_XARGS help Default xargs unsupport single and double quotes and backslash for can use aruments with spaces. -config BB_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT +config BUSYBOX_FEATURE_XARGS_SUPPORT_TERMOPT bool "Enable support options -x" default n - depends on BB_CONFIG_XARGS + depends on BUSYBOX_XARGS help Enable support exit if the size (see the -s or -n option) is exceeded. -config BB_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM +config BUSYBOX_FEATURE_XARGS_SUPPORT_ZERO_TERM bool "Enable null terminated option -0" default n - depends on BB_CONFIG_XARGS + depends on BUSYBOX_XARGS help Enable input filenames are terminated by a null character instead of by whitespace, and the quotes and backslash diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in index 85fd8b9ba..c5c9a5a9d 100644 --- a/config/busybox/init/Config.in +++ b/config/busybox/init/Config.in @@ -4,40 +4,31 @@ # menu "Init Utilities" - depends on BUSYBOX -config BB_CONFIG_INIT +config BUSYBOX_INIT bool "init" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help init is the first program run when the system boots. -config BB_CONFIG_DEBUG_INIT - bool "Debugging aid" - default n - depends on BB_CONFIG_INIT - help - Turn this on to disable all the dangerous - rebooting stuff when debugging. - -config BB_CONFIG_FEATURE_USE_INITTAB +config BUSYBOX_FEATURE_USE_INITTAB bool "Support reading an inittab file" default y - depends on BB_CONFIG_INIT + depends on BUSYBOX_INIT help Allow init to read an inittab file when the system boot. -config BB_CONFIG_FEATURE_KILL_REMOVED +config BUSYBOX_FEATURE_KILL_REMOVED bool "Support killing processes that have been removed from inittab" default y - depends on BB_CONFIG_FEATURE_USE_INITTAB + depends on BUSYBOX_FEATURE_USE_INITTAB help When respawn entries are removed from inittab and a SIGHUP is sent to init, this feature will kill the processes that have been removed. -config BB_CONFIG_FEATURE_KILL_DELAY +config BUSYBOX_FEATURE_KILL_DELAY int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED range 0 1024 default 0 @@ -47,10 +38,10 @@ config BB_CONFIG_FEATURE_KILL_DELAY (child will hang around for too long and can actually kill wrong process!) -config BB_CONFIG_FEATURE_INIT_SCTTY +config BUSYBOX_FEATURE_INIT_SCTTY bool "Run commands with leading dash with controlling tty" default n - depends on BB_CONFIG_INIT + depends on BUSYBOX_INIT help If this option is enabled, init will try to give a controlling tty to any command which has leading hyphen (often it's "-/bin/sh"). @@ -62,52 +53,50 @@ config BB_CONFIG_FEATURE_INIT_SCTTY development or for maintenance. NB: using cttyhack applet may work better. -config BB_CONFIG_FEATURE_INIT_SYSLOG +config BUSYBOX_FEATURE_INIT_SYSLOG bool "Enable init to write to syslog" default n - depends on BB_CONFIG_INIT + depends on BUSYBOX_INIT -config BB_CONFIG_FEATURE_EXTRA_QUIET +config BUSYBOX_FEATURE_EXTRA_QUIET bool "Be _extra_ quiet on boot" default y - depends on BB_CONFIG_INIT + depends on BUSYBOX_INIT help Prevent init from logging some messages to the console during boot. -config BB_CONFIG_FEATURE_INIT_COREDUMPS +config BUSYBOX_FEATURE_INIT_COREDUMPS bool "Support dumping core for child processes (debugging only)" default n - depends on BB_CONFIG_INIT + depends on BUSYBOX_INIT help If this option is enabled and the file /.init_enable_core exists, then init will call setrlimit() to allow unlimited - core file sizes. If this option is disabled, processes + core file sizes. If this option is disabled, processes will not generate any core files. - - -config BB_CONFIG_FEATURE_INITRD +config BUSYBOX_FEATURE_INITRD bool "Support running init from within an initrd (not initramfs)" default y - depends on BB_CONFIG_INIT + depends on BUSYBOX_INIT help - Legacy support for running init under the old-style initrd. Allows + Legacy support for running init under the old-style initrd. Allows the name linuxrc to act as init, and it doesn't assume init is PID 1. This does not apply to initramfs, which runs /init as PID 1 and requires no special support. -config BB_CONFIG_HALT +config BUSYBOX_HALT bool "poweroff, halt, and reboot" - default y + default n help Stop all processes and either halt, reboot, or power off the system. -config BB_CONFIG_MESG +config BUSYBOX_MESG bool "mesg" - default y + default n help - Mesg controls access to your terminal by others. It is typically + Mesg controls access to your terminal by others. It is typically used to allow or disallow other users to write to your terminal endmenu diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in index 3b1933e77..16639c106 100644 --- a/config/busybox/libbb/Config.in +++ b/config/busybox/libbb/Config.in @@ -4,16 +4,15 @@ # menu "Busybox Library Tuning" - depends on BUSYBOX -config BB_CONFIG_PASSWORD_MINLEN +config BUSYBOX_PASSWORD_MINLEN int "Minimum password length" default 6 range 5 32 help Minimum allowable password length. -config BB_CONFIG_MD5_SIZE_VS_SPEED +config BUSYBOX_MD5_SIZE_VS_SPEED int "MD5: Trade Bytes for Speed" default 2 range 0 3 @@ -27,14 +26,14 @@ config BB_CONFIG_MD5_SIZE_VS_SPEED 2 3.0 5088 3 (smallest) 5.1 4912 -config BB_CONFIG_FEATURE_FAST_TOP +config BUSYBOX_FEATURE_FAST_TOP bool "Faster /proc scanning code (+100 bytes)" default n help This option makes top (and ps) ~20% faster (or 20% less CPU hungry), but code size is slightly bigger. -config BB_CONFIG_FEATURE_ETC_NETWORKS +config BUSYBOX_FEATURE_ETC_NETWORKS bool "Support for /etc/networks" default n help @@ -42,68 +41,68 @@ config BB_CONFIG_FEATURE_ETC_NETWORKS a rarely used feature which allows you to use names instead of IP/mask pairs in route command. -config BB_CONFIG_FEATURE_EDITING +config BUSYBOX_FEATURE_EDITING bool "Command line editing" default n help Enable line editing (mainly for shell command line). -config BB_CONFIG_FEATURE_EDITING_MAX_LEN +config BUSYBOX_FEATURE_EDITING_MAX_LEN int "Maximum length of input" range 128 8192 default 1024 - depends on BB_CONFIG_FEATURE_EDITING + depends on BUSYBOX_FEATURE_EDITING help Line editing code uses on-stack buffers for storage. You may want to decrease this parameter if your target machine benefits from smaller stack usage. -config BB_CONFIG_FEATURE_EDITING_VI +config BUSYBOX_FEATURE_EDITING_VI bool "vi-style line editing commands" default n - depends on BB_CONFIG_FEATURE_EDITING + depends on BUSYBOX_FEATURE_EDITING help - Enable vi-style line editing. In shells, this mode can be + Enable vi-style line editing. In shells, this mode can be turned on and off with "set -o vi" and "set +o vi". -config BB_CONFIG_FEATURE_EDITING_HISTORY +config BUSYBOX_FEATURE_EDITING_HISTORY int "History size" range 0 99999 default 15 - depends on BB_CONFIG_FEATURE_EDITING + depends on BUSYBOX_FEATURE_EDITING help Specify command history size. -config BB_CONFIG_FEATURE_EDITING_SAVEHISTORY +config BUSYBOX_FEATURE_EDITING_SAVEHISTORY bool "History saving" default n - depends on BB_CONFIG_ASH && BB_CONFIG_FEATURE_EDITING + depends on BUSYBOX_ASH && BUSYBOX_FEATURE_EDITING help Enable history saving in ash shell. -config BB_CONFIG_FEATURE_TAB_COMPLETION +config BUSYBOX_FEATURE_TAB_COMPLETION bool "Tab completion" default n - depends on BB_CONFIG_FEATURE_EDITING + depends on BUSYBOX_FEATURE_EDITING help Enable tab completion. -config BB_CONFIG_FEATURE_USERNAME_COMPLETION +config BUSYBOX_FEATURE_USERNAME_COMPLETION bool "Username completion" default n - depends on BB_CONFIG_FEATURE_TAB_COMPLETION + depends on BUSYBOX_FEATURE_TAB_COMPLETION help Enable username completion. -config BB_CONFIG_FEATURE_EDITING_FANCY_PROMPT +config BUSYBOX_FEATURE_EDITING_FANCY_PROMPT bool "Fancy shell prompts" default n - depends on BB_CONFIG_FEATURE_EDITING + depends on BUSYBOX_FEATURE_EDITING help Setting this option allows for prompts to use things like \w and \$ and escape codes. -config BB_CONFIG_FEATURE_VERBOSE_CP_MESSAGE +config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE bool "Give more precise messages when copy fails (cp, mv etc)" default n help @@ -118,7 +117,7 @@ config BB_CONFIG_FEATURE_VERBOSE_CP_MESSAGE respectively. This will cost you ~60 bytes. -config BB_CONFIG_FEATURE_COPYBUF_KB +config BUSYBOX_FEATURE_COPYBUF_KB int "Copy buffer size, in kilobytes" range 1 1024 default 4 @@ -128,7 +127,7 @@ config BB_CONFIG_FEATURE_COPYBUF_KB Bigger buffers will be allocated with mmap, with fallback to 4 kb stack buffer if mmap fails. -config BB_CONFIG_MONOTONIC_SYSCALL +config BUSYBOX_MONOTONIC_SYSCALL bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" default y help @@ -138,11 +137,18 @@ config BB_CONFIG_MONOTONIC_SYSCALL will be used instead (which gives wrong results if date/time is reset). -config BB_CONFIG_IOCTL_HEX2STR_ERROR +config BUSYBOX_IOCTL_HEX2STR_ERROR bool "Use ioctl names rather than hex values in error messages" default y help Use ioctl names rather than hex values in error messages (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this saves about 1400 bytes. + +config BUSYBOX_FEATURE_HWIB + bool "Support infiniband HW" + default y + help + Support for printing infiniband addresses in + network applets. endmenu diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in index f83dae0ea..e0ac29b2f 100644 --- a/config/busybox/loginutils/Config.in +++ b/config/busybox/loginutils/Config.in @@ -4,89 +4,114 @@ # menu "Login/Password Management Utilities" - depends on BUSYBOX -config BB_CONFIG_FEATURE_SHADOWPASSWDS +config BUSYBOX_FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" default n help - Build support for shadow password in /etc/shadow. This file is only + Build support for shadow password in /etc/shadow. This file is only readable by root and thus the encrypted passwords are no longer publicly readable. -config BB_CONFIG_USE_BB_SHADOW - bool "Use busybox shadow password functions" - default y - depends on BB_CONFIG_USE_BB_PWD_GRP && BB_CONFIG_FEATURE_SHADOWPASSWDS - help - If you leave this disabled, busybox will use the system's shadow - password handling functions. And if you are using the GNU C library - (glibc), you will then need to install the /etc/nsswitch.conf - configuration file and the required /lib/libnss_* libraries in - order for the shadow password functions to work. This generally - makes your embedded system quite a bit larger. - - Enabling this option will cause busybox to directly access the - system's /etc/shadow file when handling shadow passwords. This - makes your system smaller and I will get fewer emails asking about - how glibc NSS works). When this option is enabled, you will not be - able to use PAM to access shadow passwords from remote LDAP - password servers and whatnot. - -config BB_CONFIG_USE_BB_PWD_GRP +config BUSYBOX_USE_BB_PWD_GRP bool "Use internal password and group functions rather than system functions" default n help - If you leave this disabled, busybox will use the system's password - and group functions. And if you are using the GNU C library - (glibc), you will then need to install the /etc/nsswitch.conf - configuration file and the required /lib/libnss_* libraries in - order for the password and group functions to work. This generally - makes your embedded system quite a bit larger. - - Enabling this option will cause busybox to directly access the - system's /etc/password, /etc/group files (and your system will be - smaller, and I will get fewer emails asking about how glibc NSS - works). When this option is enabled, you will not be able to use - PAM to access remote LDAP password servers and whatnot. And if you - want hostname resolution to work with glibc, you still need the - /lib/libnss_* libraries. - - If you enable this option, it will add about 1.5k to busybox. - -config BB_CONFIG_ADDGROUP + If you leave this disabled, busybox will use the system's password + and group functions. And if you are using the GNU C library + (glibc), you will then need to install the /etc/nsswitch.conf + configuration file and the required /lib/libnss_* libraries in + order for the password and group functions to work. This generally + makes your embedded system quite a bit larger. + + Enabling this option will cause busybox to directly access the + system's /etc/password, /etc/group files (and your system will be + smaller, and I will get fewer emails asking about how glibc NSS + works). When this option is enabled, you will not be able to use + PAM to access remote LDAP password servers and whatnot. And if you + want hostname resolution to work with glibc, you still need the + /lib/libnss_* libraries. + + If you need to use glibc's nsswitch.conf mechanism + (e.g. if user/group database is NOT stored in /etc/passwd etc), + you must NOT use this option. + + If you enable this option, it will add about 1.5k. + +config BUSYBOX_USE_BB_SHADOW + bool "Use internal shadow password functions" + default y + depends on BUSYBOX_USE_BB_PWD_GRP && BUSYBOX_FEATURE_SHADOWPASSWDS + help + If you leave this disabled, busybox will use the system's shadow + password handling functions. And if you are using the GNU C library + (glibc), you will then need to install the /etc/nsswitch.conf + configuration file and the required /lib/libnss_* libraries in + order for the shadow password functions to work. This generally + makes your embedded system quite a bit larger. + + Enabling this option will cause busybox to directly access the + system's /etc/shadow file when handling shadow passwords. This + makes your system smaller (and I will get fewer emails asking about + how glibc NSS works). When this option is enabled, you will not be + able to use PAM to access shadow passwords from remote LDAP + password servers and whatnot. + +config BUSYBOX_USE_BB_CRYPT + bool "Use internal DES and MD5 crypt functions" + default y + help + Busybox has internal DES and MD5 crypt functions. + They produce results which are identical to corresponding + standard C library functions. + + If you leave this disabled, busybox will use the system's + crypt functions. Most C libraries use large (~70k) + static buffers there, and also combine them with more general + DES encryption/decryption. + + For busybox, having large static buffers is undesirable, + especially on NOMMU machines. Busybox also doesn't need + DES encryption/decryption and can do with smaller code. + + If you enable this option, it will add about 4.8k of code + if you are building dynamically linked executable. + In static build, it makes code _smaller_ by about 1.2k, + and likely many kilobytes less of bss. + +config BUSYBOX_ADDGROUP bool "addgroup" default n help Utility for creating a new group account. -config BB_CONFIG_FEATURE_ADDUSER_TO_GROUP +config BUSYBOX_FEATURE_ADDUSER_TO_GROUP bool "Support for adding users to groups" default n - depends on BB_CONFIG_ADDGROUP + depends on BUSYBOX_ADDGROUP help If called with two non-option arguments, addgroup will add an existing user to an existing group. -config BB_CONFIG_DELGROUP +config BUSYBOX_DELGROUP bool "delgroup" default n help Utility for deleting a group account. -config BB_CONFIG_FEATURE_DEL_USER_FROM_GROUP - bool "Support for removing users from groups." +config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP + bool "Support for removing users from groups" default n - depends on BB_CONFIG_DELGROUP + depends on BUSYBOX_DELGROUP help If called with two non-option arguments, deluser or delgroup will remove an user from a specified group. -config BB_CONFIG_FEATURE_CHECK_NAMES +config BUSYBOX_FEATURE_CHECK_NAMES bool "Enable sanity check on user/group names in adduser and addgroup" default n - depends on BB_CONFIG_ADDUSER || BB_CONFIG_ADDGROUP + depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP help Enable sanity check on user and group names in adduser and addgroup. To avoid problems, the user or group name should consist only of @@ -95,131 +120,131 @@ config BB_CONFIG_FEATURE_CHECK_NAMES For compatibility with Samba machine accounts "$" is also supported at the end of the user or group name. -config BB_CONFIG_ADDUSER +config BUSYBOX_ADDUSER bool "adduser" default n help Utility for creating a new user account. -config BB_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS +config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_ADDUSER && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_ADDUSER && BUSYBOX_GETOPT_LONG help Support long options for the adduser applet. -config BB_CONFIG_DELUSER +config BUSYBOX_DELUSER bool "deluser" default n help Utility for deleting a user account. -config BB_CONFIG_GETTY +config BUSYBOX_GETTY bool "getty" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help getty lets you log in on a tty, it is normally invoked by init. -config BB_CONFIG_FEATURE_UTMP +config BUSYBOX_FEATURE_UTMP bool "Support utmp file" - depends on BB_CONFIG_GETTY || BB_CONFIG_LOGIN || BB_CONFIG_SU || BB_CONFIG_WHO + depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_WHO default n help The file /var/run/utmp is used to track who is currently logged in. -config BB_CONFIG_FEATURE_WTMP +config BUSYBOX_FEATURE_WTMP bool "Support wtmp file" - depends on BB_CONFIG_GETTY || BB_CONFIG_LOGIN || BB_CONFIG_SU || BB_CONFIG_LAST + depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_LAST default n - select BB_CONFIG_FEATURE_UTMP + select BUSYBOX_FEATURE_UTMP help The file /var/run/wtmp is used to track when user's have logged into and logged out of the system. -config BB_CONFIG_LOGIN +config BUSYBOX_LOGIN bool "login" default n - select BB_CONFIG_FEATURE_SUID - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SUID + select BUSYBOX_FEATURE_SYSLOG help login is used when signing onto a system. Note that Busybox binary must be setuid root for this applet to work properly. -config BB_CONFIG_PAM +config BUSYBOX_PAM bool "Support for PAM (Pluggable Authentication Modules)" default n - depends on BB_CONFIG_LOGIN + depends on BUSYBOX_LOGIN help Use PAM in login(1) instead of direct access to password database. -config BB_CONFIG_LOGIN_SCRIPTS +config BUSYBOX_LOGIN_SCRIPTS bool "Support for login scripts" - depends on BB_CONFIG_LOGIN + depends on BUSYBOX_LOGIN default n help Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT just prior to switching from root to logged-in user. -config BB_CONFIG_FEATURE_NOLOGIN +config BUSYBOX_FEATURE_NOLOGIN bool "Support for /etc/nologin" default y - depends on BB_CONFIG_LOGIN + depends on BUSYBOX_LOGIN help The file /etc/nologin is used by (some versions of) login(1). If it exists, non-root logins are prohibited. -config BB_CONFIG_FEATURE_SECURETTY +config BUSYBOX_FEATURE_SECURETTY bool "Support for /etc/securetty" default y - depends on BB_CONFIG_LOGIN + depends on BUSYBOX_LOGIN help The file /etc/securetty is used by (some versions of) login(1). The file contains the device names of tty lines (one per line, without leading /dev/) on which root is allowed to login. -config BB_CONFIG_PASSWD +config BUSYBOX_PASSWD bool "passwd" default n - select BB_CONFIG_FEATURE_SUID - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SUID + select BUSYBOX_FEATURE_SYSLOG help - passwd changes passwords for user and group accounts. A normal user + passwd changes passwords for user and group accounts. A normal user may only change the password for his/her own account, the super user - may change the password for any account. The administrator of a group + may change the password for any account. The administrator of a group may change the password for the group. Note that Busybox binary must be setuid root for this applet to work properly. -config BB_CONFIG_FEATURE_PASSWD_WEAK_CHECK +config BUSYBOX_FEATURE_PASSWD_WEAK_CHECK bool "Check new passwords for weakness" default y - depends on BB_CONFIG_PASSWD + depends on BUSYBOX_PASSWD help With this option passwd will refuse new passwords which are "weak". -config BB_CONFIG_CRYPTPW +config BUSYBOX_CRYPTPW bool "cryptpw" default n help Applet for crypting a string. -config BB_CONFIG_CHPASSWD - bool "chpasswd" - default n - help - chpasswd reads a file of user name and password pairs from - standard input and uses this information to update a group of - existing users. +config BUSYBOX_CHPASSWD + bool "chpasswd" + default n + help + chpasswd reads a file of user name and password pairs from + standard input and uses this information to update a group of + existing users. -config BB_CONFIG_SU +config BUSYBOX_SU bool "su" default n - select BB_CONFIG_FEATURE_SUID - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SUID + select BUSYBOX_FEATURE_SYSLOG help su is used to become another user during a login session. Invoked without a username, su defaults to becoming the super user. @@ -227,28 +252,28 @@ config BB_CONFIG_SU Note that Busybox binary must be setuid root for this applet to work properly. -config BB_CONFIG_FEATURE_SU_SYSLOG +config BUSYBOX_FEATURE_SU_SYSLOG bool "Enable su to write to syslog" default y - depends on BB_CONFIG_SU + depends on BUSYBOX_SU -config BB_CONFIG_FEATURE_SU_CHECKS_SHELLS +config BUSYBOX_FEATURE_SU_CHECKS_SHELLS bool "Enable su to check user's shell to be listed in /etc/shells" - depends on BB_CONFIG_SU + depends on BUSYBOX_SU default y -config BB_CONFIG_SULOGIN +config BUSYBOX_SULOGIN bool "sulogin" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help sulogin is invoked when the system goes into single user mode (this is done through an entry in inittab). -config BB_CONFIG_VLOCK +config BUSYBOX_VLOCK bool "vlock" default n - select BB_CONFIG_FEATURE_SUID + select BUSYBOX_FEATURE_SUID help Build the "vlock" applet which allows you to lock (virtual) terminals. @@ -256,4 +281,3 @@ config BB_CONFIG_VLOCK work properly. endmenu - diff --git a/config/busybox/mailutils/Config.in b/config/busybox/mailutils/Config.in new file mode 100644 index 000000000..3dc52ed14 --- /dev/null +++ b/config/busybox/mailutils/Config.in @@ -0,0 +1,69 @@ +menu "Mail Utilities" + +config BUSYBOX_MAKEMIME + bool "makemime" + default n + help + Create MIME-formatted messages. + +config BUSYBOX_FEATURE_MIME_CHARSET + string "Default charset" + default "us-ascii" + depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL + help + Default charset of the message. + +config BUSYBOX_POPMAILDIR + bool "popmaildir" + default n + help + Simple yet powerful POP3 mail popper. Delivers content + of remote mailboxes to local Maildir. + +config BUSYBOX_FEATURE_POPMAILDIR_DELIVERY + bool "Allow message filters and custom delivery program" + default n + depends on BUSYBOX_POPMAILDIR + help + Allow to use a custom program to filter the content + of the message before actual delivery (-F "prog [args...]"). + Allow to use a custom program for message actual delivery + (-M "prog [args...]"). + +config BUSYBOX_REFORMIME + bool "reformime" + default n + help + Parse MIME-formatted messages. + +config BUSYBOX_FEATURE_REFORMIME_COMPAT + bool "Accept and ignore options other than -x and -X" + default y + depends on BUSYBOX_REFORMIME + help + Accept (for compatibility only) and ignore options + other than -x and -X. + +config BUSYBOX_SENDMAIL + bool "sendmail" + default n + help + Barebones sendmail. + +config BUSYBOX_FEATURE_SENDMAIL_MAILX + bool "Allow to specify subject, attachments, their charset etc" + default y + depends on BUSYBOX_SENDMAIL + help + Allow to specify subject, attachments and their charset. + Allow to use custom connection helper. + +config BUSYBOX_FEATURE_SENDMAIL_MAILXX + bool "Allow to specify Cc: addresses and some additional headers" + default n + depends on BUSYBOX_FEATURE_SENDMAIL_MAILX + help + Allow to specify Cc: addresses and some additional headers: + Errors-To: + +endmenu diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in index 25fb71981..483e05af5 100644 --- a/config/busybox/miscutils/Config.in +++ b/config/busybox/miscutils/Config.in @@ -4,31 +4,30 @@ # menu "Miscellaneous Utilities" - depends on BUSYBOX -config BB_CONFIG_ADJTIMEX +config BUSYBOX_ADJTIMEX bool "adjtimex" default n help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. -config BB_CONFIG_BBCONFIG +config BUSYBOX_BBCONFIG bool "bbconfig" default n help The bbconfig applet will print the config file with which busybox was built. -config BB_CONFIG_CHAT +config BUSYBOX_CHAT bool "chat" default n help Simple chat utility. -config BB_CONFIG_FEATURE_CHAT_NOFAIL +config BUSYBOX_FEATURE_CHAT_NOFAIL bool "Enable NOFAIL expect strings" - depends on BB_CONFIG_CHAT + depends on BUSYBOX_CHAT default y help When enabled expect strings which are started with a dash trigger @@ -37,34 +36,34 @@ config BB_CONFIG_FEATURE_CHAT_NOFAIL for next EXPECT string. This allows to compose far more flexible scripts. -config BB_CONFIG_FEATURE_CHAT_TTY_HIFI +config BUSYBOX_FEATURE_CHAT_TTY_HIFI bool "Force STDIN to be a TTY" - depends on BB_CONFIG_CHAT + depends on BUSYBOX_CHAT default n help Original chat always treats STDIN as a TTY device and sets for it so-called raw mode. This option turns on such behaviour. -config BB_CONFIG_FEATURE_CHAT_IMPLICIT_CR +config BUSYBOX_FEATURE_CHAT_IMPLICIT_CR bool "Enable implicit Carriage Return" - depends on BB_CONFIG_CHAT + depends on BUSYBOX_CHAT default y help When enabled make chat to terminate all SEND strings with a "\r" unless "\c" is met anywhere in the string. -config BB_CONFIG_FEATURE_CHAT_SWALLOW_OPTS +config BUSYBOX_FEATURE_CHAT_SWALLOW_OPTS bool "Swallow options" - depends on BB_CONFIG_CHAT + depends on BUSYBOX_CHAT default n help Busybox chat require no options. To make it not fail when used in place of original chat (which has a bunch of options) turn this on. -config BB_CONFIG_FEATURE_CHAT_SEND_ESCAPES +config BUSYBOX_FEATURE_CHAT_SEND_ESCAPES bool "Support weird SEND escapes" - depends on BB_CONFIG_CHAT + depends on BUSYBOX_CHAT default n help Original chat uses some escape sequences in SEND arguments which @@ -73,76 +72,84 @@ config BB_CONFIG_FEATURE_CHAT_SEND_ESCAPES "\d" delays execution for a second, "\p" -- for a 1/100 of second. Before turning this option on think twice: do you really need them? -config BB_CONFIG_FEATURE_CHAT_VAR_ABORT_LEN +config BUSYBOX_FEATURE_CHAT_VAR_ABORT_LEN bool "Support variable-length ABORT conditions" - depends on BB_CONFIG_CHAT + depends on BUSYBOX_CHAT default n help Original chat uses fixed 50-bytes length ABORT conditions. Say N here. -config BB_CONFIG_FEATURE_CHAT_CLR_ABORT +config BUSYBOX_FEATURE_CHAT_CLR_ABORT bool "Support revoking of ABORT conditions" - depends on BB_CONFIG_CHAT + depends on BUSYBOX_CHAT default n help Support CLR_ABORT directive. -config BB_CONFIG_CHRT +config BUSYBOX_CHRT bool "chrt" default n help manipulate real-time attributes of a process. This requires sched_{g,s}etparam support in your libc. -config BB_CONFIG_CROND +config BUSYBOX_CROND bool "crond" default n - select BB_CONFIG_FEATURE_SUID - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SUID + select BUSYBOX_FEATURE_SYSLOG help Crond is a background daemon that parses individual crontab files and executes commands on behalf of the users in question. - This is a port of dcron from slackware. It uses files of the + This is a port of dcron from slackware. It uses files of the format /var/spool/cron/crontabs/ files, for example: $ cat /var/spool/cron/crontabs/root # Run daily cron jobs at 4:40 every day: 40 4 * * * /etc/cron/daily > /dev/null 2>&1 -config BB_CONFIG_DEBUG_CROND_OPTION +config BUSYBOX_FEATURE_CROND_D bool "Support option -d to redirect output to stderr" - depends on BB_CONFIG_CROND + depends on BUSYBOX_CROND default n help -d sets loglevel to 0 (most verbose) and directs all output to stderr. -config BB_CONFIG_FEATURE_CROND_CALL_SENDMAIL +config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL bool "Using /usr/sbin/sendmail?" default n - depends on BB_CONFIG_CROND + depends on BUSYBOX_CROND help Support calling /usr/sbin/sendmail for send cmd outputs. -config BB_CONFIG_CRONTAB +config BUSYBOX_CRONTAB bool "crontab" default n - select BB_CONFIG_FEATURE_SUID + select BUSYBOX_FEATURE_SUID help - Crontab manipulates the crontab for a particular user. Only + Crontab manipulates the crontab for a particular user. Only the superuser may specify a different user and/or crontab directory. Note that Busybox binary must be setuid root for this applet to work properly. -config BB_CONFIG_DC +config BUSYBOX_DC bool "dc" default n help Dc is a reverse-polish desk calculator which supports unlimited precision arithmetic. -config BB_CONFIG_DEVFSD +config BUSYBOX_FEATURE_DC_LIBM + bool "Enable power and exp functions (requires libm)" + default n + depends on BUSYBOX_DC + help + Enable power and exp functions. + NOTE: This will require libm to be present for linking. + +config BUSYBOX_DEVFSD bool "devfsd (obsolete)" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help This is deprecated, and will be removed at the end of 2008. @@ -155,172 +162,240 @@ config BB_CONFIG_DEVFSD But only if they are written UPPERCASE!!!!!!!! -config BB_CONFIG_DEVFSD_MODLOAD +config BUSYBOX_DEVFSD_MODLOAD bool "Adds support for MODLOAD keyword in devsfd.conf" default n - depends on BB_CONFIG_DEVFSD + depends on BUSYBOX_DEVFSD help This actually doesn't work with busybox modutils but needs the external modutils. -config BB_CONFIG_DEVFSD_FG_NP +config BUSYBOX_DEVFSD_FG_NP bool "Enables the -fg and -np options" default n - depends on BB_CONFIG_DEVFSD + depends on BUSYBOX_DEVFSD help - -fg Run the daemon in the foreground. - -np Exit after parsing the configuration file. Do not poll for events. + -fg Run the daemon in the foreground. + -np Exit after parsing the configuration file. + Do not poll for events. -config BB_CONFIG_DEVFSD_VERBOSE +config BUSYBOX_DEVFSD_VERBOSE bool "Increases logging (and size)" default n - depends on BB_CONFIG_DEVFSD + depends on BUSYBOX_DEVFSD help Increases logging to stderr or syslog. -config BB_CONFIG_FEATURE_DEVFS +config BUSYBOX_FEATURE_DEVFS bool "Use devfs names for all devices (obsolete)" default n help This is obsolete and will be going away at the end of 2008.. This tells busybox to look for names like /dev/loop/0 instead of - /dev/loop0. If your /dev directory has normal names instead of + /dev/loop0. If your /dev directory has normal names instead of devfs names, you don't want this. -config BB_CONFIG_EJECT +config BUSYBOX_DEVMEM + bool "devmem" + default n + help + devmem is a small program that reads and writes from physical + memory using /dev/mem. + +config BUSYBOX_EJECT bool "eject" default n help - Used to eject cdroms. (defaults to /dev/cdrom) + Used to eject cdroms. (defaults to /dev/cdrom) -config BB_CONFIG_FEATURE_EJECT_SCSI - bool "SCSI support" - default n - depends on BB_CONFIG_EJECT - help - Add the -s option to eject, this allows to eject SCSI-Devices and - usb-storage devices. +config BUSYBOX_FEATURE_EJECT_SCSI + bool "SCSI support" + default n + depends on BUSYBOX_EJECT + help + Add the -s option to eject, this allows to eject SCSI-Devices and + usb-storage devices. -config BB_CONFIG_LAST +config BUSYBOX_FBSPLASH + bool "fbsplash" + default n + help + Shows splash image and progress bar on framebuffer device. + Can be used during boot phase of an embedded device. ~2kb. + Usage: + - use kernel option 'vga=xxx' or otherwise enable fb device. + - put somewhere fbsplash.cfg file and an image in .ppm format. + - $ setsid fbsplash [params] & + -c: hide cursor + -d /dev/fbN: framebuffer device (if not /dev/fb0) + -s path_to_image_file (can be "-" for stdin) + -i path_to_cfg_file (can be "-" for stdin) + -f path_to_fifo (can be "-" for stdin) + - if you want to run it only in presence of kernel parameter: + grep -q "fbsplash=on" = 2.6.13 + +config BUSYBOX_LAST bool "last" default n - select BB_CONFIG_FEATURE_WTMP + select BUSYBOX_FEATURE_WTMP help 'last' displays a list of the last users that logged into the system. -config BB_CONFIG_LESS +choice + prompt "Choose last implementation" + depends on BUSYBOX_LAST + default BUSYBOX_FEATURE_LAST_SMALL + +config BUSYBOX_FEATURE_LAST_SMALL + bool "small" + help + This is a small version of last with just the basic set of + features. + +config BUSYBOX_FEATURE_LAST_FANCY + bool "huge" + help + 'last' displays detailed information about the last users that + logged into the system (mimics sysvinit last). +900 bytes. +endchoice + +config BUSYBOX_LESS bool "less" default n help 'less' is a pager, meaning that it displays text files. It possesses a wide array of features, and is an improvement over 'more'. -config BB_CONFIG_FEATURE_LESS_MAXLINES +config BUSYBOX_FEATURE_LESS_MAXLINES int "Max number of input lines less will try to eat" default 9999999 - depends on BB_CONFIG_LESS + depends on BUSYBOX_LESS -config BB_CONFIG_FEATURE_LESS_BRACKETS +config BUSYBOX_FEATURE_LESS_BRACKETS bool "Enable bracket searching" default y - depends on BB_CONFIG_LESS + depends on BUSYBOX_LESS help This option adds the capability to search for matching left and right brackets, facilitating programming. -config BB_CONFIG_FEATURE_LESS_FLAGS +config BUSYBOX_FEATURE_LESS_FLAGS bool "Enable extra flags" default y - depends on BB_CONFIG_LESS + depends on BUSYBOX_LESS help The extra flags provided do the following: The -M flag enables a more sophisticated status line. The -m flag enables a simpler status line with a percentage. -config BB_CONFIG_FEATURE_LESS_FLAGCS - bool "Enable flag changes" +config BUSYBOX_FEATURE_LESS_DASHCMD + bool "Enable flag changes ('-' command)" default n - depends on BB_CONFIG_LESS + depends on BUSYBOX_LESS help This enables the ability to change command-line flags within - less itself. + less itself ('-' keyboard command). -config BB_CONFIG_FEATURE_LESS_MARKS +config BUSYBOX_FEATURE_LESS_MARKS bool "Enable marks" default n - depends on BB_CONFIG_LESS + depends on BUSYBOX_LESS help Marks enable positions in a file to be stored for easy reference. -config BB_CONFIG_FEATURE_LESS_REGEXP +config BUSYBOX_FEATURE_LESS_REGEXP bool "Enable regular expressions" default n - depends on BB_CONFIG_LESS + depends on BUSYBOX_LESS help Enable regular expressions, allowing complex file searches. -config BB_CONFIG_HDPARM +config BUSYBOX_FEATURE_LESS_LINENUMS + bool "Enable dynamic switching of line numbers" + default n + depends on BUSYBOX_FEATURE_LESS_DASHCMD + help + Enable "-N" command. + +config BUSYBOX_FEATURE_LESS_WINCH + bool "Enable automatic resizing on window size changes" + default n + depends on BUSYBOX_LESS + help + Makes less track window size changes. + +config BUSYBOX_HDPARM bool "hdparm" default n help - Get/Set hard drive parameters. Primarily intended for ATA - drives. Adds about 13k (or around 30k if you enable the + Get/Set hard drive parameters. Primarily intended for ATA + drives. Adds about 13k (or around 30k if you enable the FEATURE_HDPARM_GET_IDENTITY option).... -config BB_CONFIG_FEATURE_HDPARM_GET_IDENTITY +config BUSYBOX_FEATURE_HDPARM_GET_IDENTITY bool "Support obtaining detailed information directly from drives" default y - depends on BB_CONFIG_HDPARM + depends on BUSYBOX_HDPARM help Enables the -I and -i options to obtain detailed information directly from drives about their capabilities and supported ATA feature set. If no device name is specified, hdparm will read identify data from stdin. Enabling this option will add about 16k... -config BB_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF +config BUSYBOX_FEATURE_HDPARM_HDIO_SCAN_HWIF bool "Register an IDE interface (DANGEROUS)" default n - depends on BB_CONFIG_HDPARM + depends on BUSYBOX_HDPARM help Enables the 'hdparm -R' option to register an IDE interface. This is dangerous stuff, so you should probably say N. -config BB_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF +config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF bool "Un-register an IDE interface (DANGEROUS)" default n - depends on BB_CONFIG_HDPARM + depends on BUSYBOX_HDPARM help Enables the 'hdparm -U' option to un-register an IDE interface. This is dangerous stuff, so you should probably say N. -config BB_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET - bool "perform device reset (DANGEROUS)" +config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET + bool "Perform device reset (DANGEROUS)" default n - depends on BB_CONFIG_HDPARM + depends on BUSYBOX_HDPARM help Enables the 'hdparm -w' option to perform a device reset. This is dangerous stuff, so you should probably say N. -config BB_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF - bool "tristate device for hotswap (DANGEROUS)" +config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF + bool "Tristate device for hotswap (DANGEROUS)" default n - depends on BB_CONFIG_HDPARM + depends on BUSYBOX_HDPARM help Enables the 'hdparm -x' option to tristate device for hotswap, - and the '-b' option to get/set bus state. This is dangerous + and the '-b' option to get/set bus state. This is dangerous stuff, so you should probably say N. -config BB_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA - bool "get/set using_dma flag (DANGEROUS)" +config BUSYBOX_FEATURE_HDPARM_HDIO_GETSET_DMA + bool "Get/set using_dma flag (DANGEROUS)" default n - depends on BB_CONFIG_HDPARM + depends on BUSYBOX_HDPARM help Enables the 'hdparm -d' option to get/set using_dma flag. This is dangerous stuff, so you should probably say N. -config BB_CONFIG_MAKEDEVS +config BUSYBOX_MAKEDEVS bool "makedevs" default n help @@ -341,62 +416,68 @@ config BB_CONFIG_MAKEDEVS choice prompt "Choose makedevs behaviour" - depends on BB_CONFIG_MAKEDEVS - default BB_CONFIG_FEATURE_MAKEDEVS_TABLE + depends on BUSYBOX_MAKEDEVS + default BUSYBOX_FEATURE_MAKEDEVS_TABLE -config BB_CONFIG_FEATURE_MAKEDEVS_LEAF +config BUSYBOX_FEATURE_MAKEDEVS_LEAF bool "leaf" -config BB_CONFIG_FEATURE_MAKEDEVS_TABLE +config BUSYBOX_FEATURE_MAKEDEVS_TABLE bool "table" endchoice -config BB_CONFIG_MICROCOM +config BUSYBOX_MAN + bool "man" + default n + help + Format and display manual pages. + +config BUSYBOX_MICROCOM bool "microcom" default n help The poor man's minicom utility for chatting with serial port devices. -config BB_CONFIG_MOUNTPOINT +config BUSYBOX_MOUNTPOINT bool "mountpoint" default n help mountpoint checks if the directory is a mountpoint. -config BB_CONFIG_MT +config BUSYBOX_MT bool "mt" default n help - mt is used to control tape devices. You can use the mt utility + mt is used to control tape devices. You can use the mt utility to advance or rewind a tape past a specified number of archive files on the tape. -config BB_CONFIG_RAIDAUTORUN +config BUSYBOX_RAIDAUTORUN bool "raidautorun" default n help raidautorun tells the kernel md driver to search and start RAID arrays. -config BB_CONFIG_READAHEAD +config BUSYBOX_READAHEAD bool "readahead" default n - depends on BB_CONFIG_LFS + depends on BUSYBOX_LFS help Preload the files listed on the command line into RAM cache so that subsequent reads on these files will not block on disk I/O. This applet just calls the readahead(2) system call on each file. It is mainly useful in system startup scripts to preload files - or executables before they are used. When used at the right time - (in particular when a CPU boundprocess is running) it can + or executables before they are used. When used at the right time + (in particular when a CPU bound process is running) it can significantly speed up system startup. As readahead(2) blocks until each file has been read, it is best to run this applet as a background job. -config BB_CONFIG_RUNLEVEL +config BUSYBOX_RUNLEVEL bool "runlevel" default n help @@ -405,48 +486,42 @@ config BB_CONFIG_RUNLEVEL This applet uses utmp but does not rely on busybox supporing utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc. -config BB_CONFIG_RX +config BUSYBOX_RX bool "rx" default n help Receive files using the Xmodem protocol. -config BB_CONFIG_SCRIPT - bool "script" +config BUSYBOX_SETSID + bool "setsid" default n help - The script makes typescript of terminal session. + setsid runs a program in a new session -config BB_CONFIG_STRINGS +config BUSYBOX_STRINGS bool "strings" default n help strings prints the printable character sequences for each file specified. -config BB_CONFIG_SETSID - bool "setsid" - default n - help - setsid runs a program in a new session - -config BB_CONFIG_TASKSET +config BUSYBOX_TASKSET bool "taskset" default n help Retrieve or set a processes's CPU affinity. This requires sched_{g,s}etaffinity support in your libc. -config BB_CONFIG_FEATURE_TASKSET_FANCY +config BUSYBOX_FEATURE_TASKSET_FANCY bool "Fancy output" default y - depends on BB_CONFIG_TASKSET + depends on BUSYBOX_TASKSET help Add code for fancy output. This merely silences a compiler-warning and adds about 135 Bytes. May be needed for machines with alot of CPUs. -config BB_CONFIG_TIME +config BUSYBOX_TIME bool "time" default n help @@ -454,21 +529,22 @@ config BB_CONFIG_TIME When the command finishes, time writes a message to standard output giving timing statistics about this program run. -config BB_CONFIG_TTYSIZE +config BUSYBOX_TTYSIZE bool "ttysize" default n help A replacement for "stty size". Unlike stty, can report only width, - only height, or both, in any order. It also does not complain on error, - but returns default 80x24. Usage in shell scripts: width=`ttysize w`. + only height, or both, in any order. It also does not complain on + error, but returns default 80x24. + Usage in shell scripts: width=`ttysize w`. -config BB_CONFIG_WATCHDOG +config BUSYBOX_WATCHDOG bool "watchdog" default n help The watchdog utility is used with hardware or software watchdog - device drivers. It opens the specified watchdog device special file - and periodically writes a magic character to the device. If the + device drivers. It opens the specified watchdog device special file + and periodically writes a magic character to the device. If the watchdog applet ever fails to write the magic character within a certain amount of time, the watchdog device assumes the system has hung, and will cause the hardware to reboot. diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in index 60348e722..c6d2ebeda 100644 --- a/config/busybox/modutils/Config.in +++ b/config/busybox/modutils/Config.in @@ -4,86 +4,104 @@ # menu "Linux Module Utilities" - depends on BUSYBOX -config BB_CONFIG_INSMOD - bool "insmod" - default n +config BUSYBOX_DEFAULT_MODULES_DIR + string "Default directory containing modules" + default "/lib/modules" help - insmod is used to load specified modules in the running kernel. + Directory that contains kernel modules. + Defaults to "/lib/modules" -config BB_CONFIG_FEATURE_INSMOD_VERSION_CHECKING - bool "Module version checking" - default n - depends on BB_CONFIG_INSMOD && BB_CONFIG_FEATURE_2_4_MODULES +config BUSYBOX_DEFAULT_DEPMOD_FILE + string "Default name of modules.dep" + default "modules.dep" help - Support checking of versions for modules. This is used to - ensure that the kernel and module are made for each other. + Filename that contains kernel modules dependencies. + Defaults to "modules.dep" -config BB_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS - bool "Add module symbols to kernel symbol table" +config BUSYBOX_MODPROBE_SMALL + bool "Simplified modutils" default n - depends on BB_CONFIG_INSMOD && BB_CONFIG_FEATURE_2_4_MODULES help - By adding module symbols to the kernel symbol table, Oops messages - occuring within kernel modules can be properly debugged. By enabling - this feature, module symbols will always be added to the kernel symbol - table for properly debugging support. If you are not interested in - Oops messages from kernel modules, say N. + Simplified modutils. -config BB_CONFIG_FEATURE_INSMOD_LOADINKMEM - bool "In kernel memory optimization (uClinux only)" + With this option modprobe does not require modules.dep file + and does not use /etc/modules.conf file. + It scans module files in /lib/modules/`uname -r` and + determines dependencies and module alias names on the fly. + This may make module loading slower, most notably + when one needs to load module by alias (this requires + scanning through module _bodies_). + + At the first attempt to load a module by alias modprobe + will try to generate modules.dep.bb file in order to speed up + future loads by alias. Failure to do so (read-only /lib/modules, + etc) is not reported, and future modprobes will be slow too. + + NB: modules.dep.bb file format is not compatible + with modules.dep file as created/used by standard module tools. + + Additional module parameters can be stored in + /etc/modules/$module_name files. + + Apart from modprobe, other utilities are also provided: + - insmod is an alias to modprobe + - rmmod is an alias to modprobe -r + - depmod generates modules.dep.bb + + As of 2008-07, this code is experimental. It is 14kb smaller + than "non-small" modutils. + +config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE + bool "Accept module options on modprobe command line" default n - depends on BB_CONFIG_INSMOD && BB_CONFIG_FEATURE_2_4_MODULES + depends on BUSYBOX_MODPROBE_SMALL help - This is a special uClinux only memory optimization that lets insmod - load the specified kernel module directly into kernel space, reducing - memory usage by preventing the need for two copies of the module - being loaded into memory. + Allow insmod and modprobe take module options from command line. + N.B. Very bloaty. -config BB_CONFIG_FEATURE_INSMOD_LOAD_MAP - bool "Enable load map (-m) option" +config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED + bool "Skip loading of already loaded modules" default n - depends on BB_CONFIG_INSMOD && ( BB_CONFIG_FEATURE_2_4_MODULES || BB_CONFIG_FEATURE_2_6_MODULES ) + depends on BUSYBOX_MODPROBE_SMALL help - Enabling this, one would be able to get a load map - output on stdout. This makes kernel module debugging - easier. - If you don't plan to debug kernel modules, you - don't need this option. + Check if the module is already loaded. + N.B. It's racy. -config BB_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL - bool "Symbols in load map" - default y - depends on BB_CONFIG_FEATURE_INSMOD_LOAD_MAP +config BUSYBOX_INSMOD + bool "insmod" + default n + depends on !BUSYBOX_MODPROBE_SMALL help - Without this option, -m will only output section - load map. With this option, -m will also output - symbols load map. + insmod is used to load specified modules in the running kernel. -config BB_CONFIG_RMMOD +config BUSYBOX_RMMOD bool "rmmod" default n + depends on !BUSYBOX_MODPROBE_SMALL help rmmod is used to unload specified modules from the kernel. -config BB_CONFIG_LSMOD +config BUSYBOX_LSMOD bool "lsmod" default n + depends on !BUSYBOX_MODPROBE_SMALL help lsmod is used to display a list of loaded modules. -config BB_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT - bool "Pretty output for 2.6.x Linux kernels" +config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT + bool "Pretty output" default n - depends on BB_CONFIG_LSMOD + depends on BUSYBOX_LSMOD help This option makes output format of lsmod adjusted to the format of module-init-tools for Linux kernel 2.6. + Increases size somewhat. -config BB_CONFIG_MODPROBE +config BUSYBOX_MODPROBE bool "modprobe" default n + depends on !BUSYBOX_MODPROBE_SMALL help Handle the loading of modules, and their dependencies on a high level. @@ -91,69 +109,122 @@ config BB_CONFIG_MODPROBE Note that in the state, modprobe does not understand multiple module options from the configuration file. See option below. -config BB_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS +config BUSYBOX_FEATURE_MODPROBE_BLACKLIST bool - prompt "Multiple options parsing" if NITPICK - default y - depends on BB_CONFIG_MODPROBE + prompt "Blacklist support" + default n + depends on BUSYBOX_MODPROBE + help + Say 'y' here to enable support for the 'blacklist' command in + modprobe.conf. This prevents the alias resolver to resolve + blacklisted modules. This is useful if you want to prevent your + hardware autodetection scripts to load modules like evdev, frame + buffer drivers etc. + +config BUSYBOX_DEPMOD + bool "depmod" + default n + depends on !BUSYBOX_MODPROBE_SMALL help - Allow modprobe to understand more than one option to pass to - modules. + depmod generates modules.dep (and potentially modules.alias + and modules.symbols) that contain dependency information + for modprobe. - This is a WIP, while waiting for a common argument parsing - common amongst all BB applets (shell, modprobe, etc...) and - adds around 600 bytes on x86, 700 bytes on ARM. The code is - biggish and uggly, but just works. +comment "Options common to multiple modutils" - Saying Y here is not a bad idea if you're not that short - on storage capacity. +config BUSYBOX_FEATURE_2_4_MODULES + bool "Support version 2.2/2.4 Linux kernels" + default n + depends on BUSYBOX_INSMOD || BUSYBOX_RMMOD || BUSYBOX_LSMOD + help + Support module loading for 2.2.x and 2.4.x Linux kernels. + This increases size considerably. Say N unless you plan + to run ancient kernels. -config BB_CONFIG_FEATURE_MODPROBE_FANCY_ALIAS - bool - prompt "Fancy alias parsing" if NITPICK - default y - depends on BB_CONFIG_MODPROBE && BB_CONFIG_FEATURE_2_6_MODULES +config BUSYBOX_FEATURE_INSMOD_VERSION_CHECKING + bool "Enable module version checking" + default n + depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) help - Say 'y' here to enable parsing of aliases with underscore/dash - mismatch between module name and file name, along with bus-specific - aliases (such as pci:... or usb:... aliases). + Support checking of versions for modules. This is used to + ensure that the kernel and module are made for each other. -comment "Options common to multiple modutils" - depends on BB_CONFIG_INSMOD || BB_CONFIG_RMMOD || BB_CONFIG_MODPROBE || BB_CONFIG_LSMOD +config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS + bool "Add module symbols to kernel symbol table" + default n + depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) + help + By adding module symbols to the kernel symbol table, Oops messages + occuring within kernel modules can be properly debugged. By enabling + this feature, module symbols will always be added to the kernel symbol + table for properly debugging support. If you are not interested in + Oops messages from kernel modules, say N. + +config BUSYBOX_FEATURE_INSMOD_LOADINKMEM + bool "In kernel memory optimization (uClinux only)" + default n + depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) + help + This is a special uClinux only memory optimization that lets insmod + load the specified kernel module directly into kernel space, reducing + memory usage by preventing the need for two copies of the module + being loaded into memory. -config BB_CONFIG_FEATURE_CHECK_TAINTED_MODULE - # Simulate indentation +config BUSYBOX_FEATURE_INSMOD_LOAD_MAP + bool "Enable insmod load map (-m) option" + default n + depends on BUSYBOX_FEATURE_2_4_MODULES && BUSYBOX_INSMOD + help + Enabling this, one would be able to get a load map + output on stdout. This makes kernel module debugging + easier. + If you don't plan to debug kernel modules, you + don't need this option. + +config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL + bool "Symbols in load map" + default y + depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_MODPROBE_SMALL + help + Without this option, -m will only output section + load map. With this option, -m will also output + symbols load map. + +config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y - depends on BB_CONFIG_INSMOD || BB_CONFIG_LSMOD + depends on !BUSYBOX_MODPROBE_SMALL help - Support checking for tainted modules. These are usually binary + Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your support request. This option is required to support GPLONLY modules. -config BB_CONFIG_FEATURE_2_4_MODULES - # Simulate indentation - bool "Support version 2.2.x to 2.4.x Linux kernels" +config BUSYBOX_FEATURE_MODUTILS_ALIAS + bool "Support for module.aliases file" default y - depends on BB_CONFIG_INSMOD || BB_CONFIG_RMMOD || BB_CONFIG_MODPROBE + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE help - Support module loading for 2.2.x and 2.4.x Linux kernels. + Generate and parse modules.alias containing aliases for bus + identifiers: + alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs -config BB_CONFIG_FEATURE_2_6_MODULES - # Simulate indentation - bool "Support version 2.6.x Linux kernels" - default y - depends on BB_CONFIG_INSMOD || BB_CONFIG_RMMOD || BB_CONFIG_MODPROBE - help - Support module loading for newer 2.6.x Linux kernels. + and aliases for logical modules names e.g.: + alias padlock_aes aes + alias aes_i586 aes + alias aes_generic aes + Say Y if unsure. -config BB_CONFIG_FEATURE_QUERY_MODULE_INTERFACE - bool +config BUSYBOX_FEATURE_MODUTILS_SYMBOLS + bool "Support for module.symbols file" default y - depends on BB_CONFIG_FEATURE_2_4_MODULES && !BB_CONFIG_FEATURE_2_6_MODULES + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE + help + Generate and parse modules.symbols containing aliases for + symbol_request() kernel calls, such as: + alias symbol:usb_sg_init usbcore + Say Y if unsure. endmenu - diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in index dba833bff..f17dc8b35 100644 --- a/config/busybox/networking/Config.in +++ b/config/busybox/networking/Config.in @@ -4,19 +4,18 @@ # menu "Networking Utilities" - depends on BUSYBOX -config BB_CONFIG_FEATURE_IPV6 +config BUSYBOX_FEATURE_IPV6 bool "Enable IPv6 support" default n help Enable IPv6 support in busybox. This adds IPv6 support in the networking applets. -config BB_CONFIG_FEATURE_PREFER_IPV4_ADDRESS +config BUSYBOX_FEATURE_PREFER_IPV4_ADDRESS bool "Preferentially use IPv4 addresses from DNS queries" default y - depends on BB_CONFIG_FEATURE_IPV6 + depends on BUSYBOX_FEATURE_IPV6 help Use IPv4 address of network host if it has one. @@ -28,7 +27,7 @@ config BB_CONFIG_FEATURE_PREFER_IPV4_ADDRESS or network applets will fail to connect to the host using IPv6 address. -config BB_CONFIG_VERBOSE_RESOLUTION_ERRORS +config BUSYBOX_VERBOSE_RESOLUTION_ERRORS bool "Verbose resolution errors" default n help @@ -36,37 +35,29 @@ config BB_CONFIG_VERBOSE_RESOLUTION_ERRORS "can't resolve 'hostname.com'" and want to know more. This may increase size of your executable a bit. -config BB_CONFIG_ARP +config BUSYBOX_ARP bool "arp" default n help Manipulate the system ARP cache. -config BB_CONFIG_ARPING +config BUSYBOX_ARPING bool "arping" default n help Ping hosts by ARP packets. -config BB_CONFIG_BRCTL +config BUSYBOX_BRCTL bool "brctl" default n help Manage ethernet bridges. Supports addbr/delbr and addif/delif. -#config FEATURE_BRCTL_SHOW -# bool "Support show, showmac and showstp" -# default n -# depends on BRCTL -# help -# Add support for option which print the current config: -# showmacs, showstp, show - -config BB_CONFIG_FEATURE_BRCTL_FANCY +config BUSYBOX_FEATURE_BRCTL_FANCY bool "Fancy options" default n - depends on BB_CONFIG_BRCTL + depends on BUSYBOX_BRCTL help Add support for extended option like: setageing, setfd, sethello, setmaxage, @@ -74,128 +65,136 @@ config BB_CONFIG_FEATURE_BRCTL_FANCY stp This adds about 600 bytes. -config BB_CONFIG_DNSD +config BUSYBOX_FEATURE_BRCTL_SHOW + bool "Support show, showmac and showstp" + default n + depends on BUSYBOX_BRCTL && BUSYBOX_FEATURE_BRCTL_FANCY + help + Add support for option which prints the current config: + showmacs, showstp, show + +config BUSYBOX_DNSD bool "dnsd" default n help Small and static DNS server daemon. -config BB_CONFIG_ETHER_WAKE +config BUSYBOX_ETHER_WAKE bool "ether-wake" default n help Send a magic packet to wake up sleeping machines. -config BB_CONFIG_FAKEIDENTD +config BUSYBOX_FAKEIDENTD bool "fakeidentd" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help fakeidentd listens on the ident port and returns a predefined fake value on any query. -config BB_CONFIG_FTPGET +config BUSYBOX_FTPGET bool "ftpget" default n help Retrieve a remote file via FTP. -config BB_CONFIG_FTPPUT +config BUSYBOX_FTPPUT bool "ftpput" default n help Store a remote file via FTP. -config BB_CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS +config BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS bool "Enable long options in ftpget/ftpput" default n - depends on BB_CONFIG_GETOPT_LONG && (BB_CONFIG_FTPGET || BB_CONFIG_FTPPUT) + depends on BUSYBOX_GETOPT_LONG && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT) help Support long options for the ftpget/ftpput applet. -config BB_CONFIG_HOSTNAME +config BUSYBOX_HOSTNAME bool "hostname" default n help Show or set the system's host name. -config BB_CONFIG_HTTPD +config BUSYBOX_HTTPD bool "httpd" default n help Serve web pages via an HTTP server. -config BB_CONFIG_FEATURE_HTTPD_RANGES +config BUSYBOX_FEATURE_HTTPD_RANGES bool "Support 'Ranges:' header" default n - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help Makes httpd emit "Accept-Ranges: bytes" header and understand "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted downloads, seeking in multimedia players etc. -config BB_CONFIG_FEATURE_HTTPD_USE_SENDFILE +config BUSYBOX_FEATURE_HTTPD_USE_SENDFILE bool "Use sendfile system call" default n - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help When enabled, httpd will use the kernel sendfile() function instead of read/write loop. -config BB_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP +config BUSYBOX_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP bool "Support reloading of global config file on HUP signal" default n - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help This option enables processing of SIGHUP to reload cached configuration settings. -config BB_CONFIG_FEATURE_HTTPD_SETUID +config BUSYBOX_FEATURE_HTTPD_SETUID bool "Enable -u option" default n - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help This option allows the server to run as a specific user rather than defaulting to the user that starts the server. Use of this option requires special privileges to change to a different user. -config BB_CONFIG_FEATURE_HTTPD_BASIC_AUTH +config BUSYBOX_FEATURE_HTTPD_BASIC_AUTH bool "Enable Basic http Authentication" default y - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help Utilizes password settings from /etc/httpd.conf for basic authentication on a per url basis. -config BB_CONFIG_FEATURE_HTTPD_AUTH_MD5 +config BUSYBOX_FEATURE_HTTPD_AUTH_MD5 bool "Support MD5 crypted passwords for http Authentication" default n - depends on BB_CONFIG_FEATURE_HTTPD_BASIC_AUTH + depends on BUSYBOX_FEATURE_HTTPD_BASIC_AUTH help Enables basic per URL authentication from /etc/httpd.conf using md5 passwords. -config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES +config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES bool "Support loading additional MIME types at run-time" default n - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help This option enables support for additional MIME types at run-time to be specified in the configuration file. -config BB_CONFIG_FEATURE_HTTPD_CGI +config BUSYBOX_FEATURE_HTTPD_CGI bool "Support Common Gateway Interface (CGI)" default y - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help This option allows scripts and executables to be invoked when specific URLs are requested. -config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR +config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR bool "Support for running scripts through an interpreter" default n - depends on BB_CONFIG_FEATURE_HTTPD_CGI + depends on BUSYBOX_FEATURE_HTTPD_CGI help This option enables support for running scripts through an interpreter. Turn this on if you want PHP scripts to work @@ -203,28 +202,28 @@ config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR config file: *.php:/path/to/your/php -config BB_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV +config BUSYBOX_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV bool "Set REMOTE_PORT environment variable for CGI" default n - depends on BB_CONFIG_FEATURE_HTTPD_CGI + depends on BUSYBOX_FEATURE_HTTPD_CGI help Use of this option can assist scripts in generating references that contain a unique port number. -config BB_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR +config BUSYBOX_FEATURE_HTTPD_ENCODE_URL_STR bool "Enable -e option (useful for CGIs written as shell scripts)" default y - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help This option allows html encoding of arbitrary strings for display - by the browser. Output goes to stdout. + by the browser. Output goes to stdout. For example, httpd -e "" produces "<Hello World>". -config BB_CONFIG_FEATURE_HTTPD_ERROR_PAGES +config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES bool "Support for custom error pages" default n - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help This option allows you to define custom error pages in the configuration file instead of the default HTTP status @@ -234,10 +233,10 @@ config BB_CONFIG_FEATURE_HTTPD_ERROR_PAGES '/path/e404.html' file instead of the terse '404 NOT FOUND' message. -config BB_CONFIG_FEATURE_HTTPD_PROXY +config BUSYBOX_FEATURE_HTTPD_PROXY bool "Support for reverse proxy" default n - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD help This option allows you to define URLs that will be forwarded to another HTTP server. To setup add the following line to the @@ -246,80 +245,80 @@ config BB_CONFIG_FEATURE_HTTPD_PROXY Then a request to /url/myfile will be forwarded to http://hostname[:port]/new/path/myfile. -config BB_CONFIG_IFCONFIG +config BUSYBOX_IFCONFIG bool "ifconfig" default n help Ifconfig is used to configure the kernel-resident network interfaces. -config BB_CONFIG_FEATURE_IFCONFIG_STATUS +config BUSYBOX_FEATURE_IFCONFIG_STATUS bool "Enable status reporting output (+7k)" default y - depends on BB_CONFIG_IFCONFIG + depends on BUSYBOX_IFCONFIG help If ifconfig is called with no arguments it will display the status of the currently active interfaces. -config BB_CONFIG_FEATURE_IFCONFIG_SLIP +config BUSYBOX_FEATURE_IFCONFIG_SLIP bool "Enable slip-specific options \"keepalive\" and \"outfill\"" default n - depends on BB_CONFIG_IFCONFIG + depends on BUSYBOX_IFCONFIG help - Allow "keepalive" and "outfill" support for SLIP. If you're not + Allow "keepalive" and "outfill" support for SLIP. If you're not planning on using serial lines, leave this unchecked. -config BB_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ +config BUSYBOX_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ bool "Enable options \"mem_start\", \"io_addr\", and \"irq\"" default n - depends on BB_CONFIG_IFCONFIG + depends on BUSYBOX_IFCONFIG help Allow the start address for shared memory, start address for I/O, and/or the interrupt line used by the specified device. -config BB_CONFIG_FEATURE_IFCONFIG_HW +config BUSYBOX_FEATURE_IFCONFIG_HW bool "Enable option \"hw\" (ether only)" default y - depends on BB_CONFIG_IFCONFIG + depends on BUSYBOX_IFCONFIG help Set the hardware address of this interface, if the device driver - supports this operation. Currently, we only support the 'ether' + supports this operation. Currently, we only support the 'ether' class. -config BB_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS +config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS bool "Set the broadcast automatically" default n - depends on BB_CONFIG_IFCONFIG + depends on BUSYBOX_IFCONFIG help Setting this will make ifconfig attempt to find the broadcast automatically if the value '+' is used. -config BB_CONFIG_IFENSLAVE +config BUSYBOX_IFENSLAVE bool "ifenslave" default n help Userspace application to bind several interfaces to a logical interface (use with kernel bonding driver). -config BB_CONFIG_IFUPDOWN +config BUSYBOX_IFUPDOWN bool "ifupdown" default n help - Activate or deactivate the specified interfaces. This applet makes + Activate or deactivate the specified interfaces. This applet makes use of either "ifconfig" and "route" or the "ip" command to actually - configure network interfaces. Therefore, you will probably also want + configure network interfaces. Therefore, you will probably also want to enable either IFCONFIG and ROUTE, or enable - FEATURE_IFUPDOWN_IP and the various IP options. Of + FEATURE_IFUPDOWN_IP and the various IP options. Of course you could use non-busybox versions of these programs, so against my better judgement (since this will surely result in plenty of support questions on the mailing list), I do not force you to - enable these additional options. It is up to you to supply either + enable these additional options. It is up to you to supply either "ifconfig", "route" and "run-parts" or the "ip" command, either via busybox or via standalone utilities. -config BB_CONFIG_IFUPDOWN_IFSTATE_PATH +config BUSYBOX_IFUPDOWN_IFSTATE_PATH string "Absolute path to ifstate file" default "/var/run/ifstate" - depends on BB_CONFIG_IFUPDOWN + depends on BUSYBOX_IFUPDOWN help ifupdown keeps state information in a file called ifstate. Typically it is located in /var/run/ifstate, however @@ -327,34 +326,34 @@ config BB_CONFIG_IFUPDOWN_IFSTATE_PATH (debian, for example, uses /etc/network/run/ifstate). This config option defines location of ifstate. -config BB_CONFIG_FEATURE_IFUPDOWN_IP +config BUSYBOX_FEATURE_IFUPDOWN_IP bool "Use ip applet" default n - depends on BB_CONFIG_IFUPDOWN + depends on BUSYBOX_IFUPDOWN help Use the iproute "ip" command to implement "ifup" and "ifdown", rather than the default of using the older 'ifconfig' and 'route' utilities. -config BB_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN +config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN bool "Use busybox ip applet" default y - depends on BB_CONFIG_FEATURE_IFUPDOWN_IP - select BB_CONFIG_IP - select BB_CONFIG_FEATURE_IP_ADDRESS - select BB_CONFIG_FEATURE_IP_LINK - select BB_CONFIG_FEATURE_IP_ROUTE + depends on BUSYBOX_FEATURE_IFUPDOWN_IP + select BUSYBOX_IP + select BUSYBOX_FEATURE_IP_ADDRESS + select BUSYBOX_FEATURE_IP_LINK + select BUSYBOX_FEATURE_IP_ROUTE help Use the busybox iproute "ip" applet to implement "ifupdown". If left disabled, you must install the full-blown iproute2 utility or the "ifup" and "ifdown" applets will not work. -config BB_CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN +config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN bool "Use busybox ifconfig and route applets" default y - depends on BB_CONFIG_IFUPDOWN && !BB_CONFIG_FEATURE_IFUPDOWN_IP - select BB_CONFIG_IFCONFIG - select BB_CONFIG_ROUTE + depends on BUSYBOX_IFUPDOWN && !BUSYBOX_FEATURE_IFUPDOWN_IP + select BUSYBOX_IFCONFIG + select BUSYBOX_ROUTE help Use the busybox iproute "ifconfig" and "route" applets to implement the "ifup" and "ifdown" utilities. @@ -363,17 +362,17 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN and route utilities, or the "ifup" and "ifdown" applets will not work. -config BB_CONFIG_FEATURE_IFUPDOWN_IPV4 +config BUSYBOX_FEATURE_IFUPDOWN_IPV4 bool "Support for IPv4" default y - depends on BB_CONFIG_IFUPDOWN + depends on BUSYBOX_IFUPDOWN help If you want ifup/ifdown to talk IPv4, leave this on. -config BB_CONFIG_FEATURE_IFUPDOWN_IPV6 +config BUSYBOX_FEATURE_IFUPDOWN_IPV6 bool "Support for IPv6" default n - depends on BB_CONFIG_IFUPDOWN && BB_CONFIG_FEATURE_IPV6 + depends on BUSYBOX_IFUPDOWN && BUSYBOX_FEATURE_IPV6 help If you need support for IPv6, turn this option on. @@ -386,121 +385,121 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IPV6 ### If this option is selected you can use busybox to work with IPX ### networks. -config BB_CONFIG_FEATURE_IFUPDOWN_MAPPING +config BUSYBOX_FEATURE_IFUPDOWN_MAPPING bool "Enable mapping support" default n - depends on BB_CONFIG_IFUPDOWN + depends on BUSYBOX_IFUPDOWN help This enables support for the "mapping" stanza, unless you have a weird network setup you don't need it. -config BB_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP +config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP bool "Support for external dhcp clients" default n - depends on BB_CONFIG_IFUPDOWN + depends on BUSYBOX_IFUPDOWN help This enables support for the external dhcp clients. Clients are tried in the following order: dhcpcd, dhclient, pump and udhcpc. Otherwise, if udhcpc applet is enabled, it is used. Otherwise, ifup/ifdown will have no support for DHCP. -config BB_CONFIG_INETD +config BUSYBOX_INETD bool "inetd" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help Internet superserver daemon -config BB_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO +config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_ECHO bool "Support echo service" default y - depends on BB_CONFIG_INETD + depends on BUSYBOX_INETD help Echo received data internal inetd service -config BB_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD +config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD bool "Support discard service" default y - depends on BB_CONFIG_INETD + depends on BUSYBOX_INETD help Internet /dev/null internal inetd service -config BB_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME +config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_TIME bool "Support time service" default y - depends on BB_CONFIG_INETD + depends on BUSYBOX_INETD help Return 32 bit time since 1900 internal inetd service -config BB_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME +config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME bool "Support daytime service" default y - depends on BB_CONFIG_INETD + depends on BUSYBOX_INETD help Return human-readable time internal inetd service -config BB_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN +config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN bool "Support chargen service" default y - depends on BB_CONFIG_INETD + depends on BUSYBOX_INETD help Familiar character generator internal inetd service -config BB_CONFIG_FEATURE_INETD_RPC +config BUSYBOX_FEATURE_INETD_RPC bool "Support RPC services" default n - depends on BB_CONFIG_INETD - select BB_CONFIG_FEATURE_HAVE_RPC + depends on BUSYBOX_INETD + select BUSYBOX_FEATURE_HAVE_RPC help Support Sun-RPC based services -config BB_CONFIG_IP +config BUSYBOX_IP bool "ip" default n help The "ip" applet is a TCP/IP interface configuration and routing - utility. You generally don't need "ip" to use busybox with + utility. You generally don't need "ip" to use busybox with TCP/IP. -config BB_CONFIG_FEATURE_IP_ADDRESS +config BUSYBOX_FEATURE_IP_ADDRESS bool "ip address" default y - depends on BB_CONFIG_IP + depends on BUSYBOX_IP help Address manipulation support for the "ip" applet. -config BB_CONFIG_FEATURE_IP_LINK +config BUSYBOX_FEATURE_IP_LINK bool "ip link" default y - depends on BB_CONFIG_IP + depends on BUSYBOX_IP help Configure network devices with "ip". -config BB_CONFIG_FEATURE_IP_ROUTE +config BUSYBOX_FEATURE_IP_ROUTE bool "ip route" default y - depends on BB_CONFIG_IP + depends on BUSYBOX_IP help Add support for routing table management to "ip". -config BB_CONFIG_FEATURE_IP_TUNNEL +config BUSYBOX_FEATURE_IP_TUNNEL bool "ip tunnel" default n - depends on BB_CONFIG_IP + depends on BUSYBOX_IP help Add support for tunneling commands to "ip". -config BB_CONFIG_FEATURE_IP_RULE +config BUSYBOX_FEATURE_IP_RULE bool "ip rule" default n - depends on BB_CONFIG_IP + depends on BUSYBOX_IP help Add support for rule commands to "ip". -config BB_CONFIG_FEATURE_IP_SHORT_FORMS +config BUSYBOX_FEATURE_IP_SHORT_FORMS bool "Support short forms of ip commands" default n - depends on BB_CONFIG_IP + depends on BUSYBOX_IP help Also support short-form of ip commands: ip addr -> ipaddr @@ -512,81 +511,82 @@ config BB_CONFIG_FEATURE_IP_SHORT_FORMS Say N unless you desparately need the short form of the ip object commands. -config BB_CONFIG_FEATURE_IP_RARE_PROTOCOLS +config BUSYBOX_FEATURE_IP_RARE_PROTOCOLS bool "Support displaying rarely used link types" default n - depends on BB_CONFIG_IP + depends on BUSYBOX_IP help If you are not going to use links of type "frad", "econet", "bif" etc, you probably don't need to enable this. Ethernet, wireless, infrared, ppp/slip, ip tunnelling link types are supported without this option selected. -config BB_CONFIG_IPADDR +config BUSYBOX_IPADDR bool default y - depends on BB_CONFIG_FEATURE_IP_SHORT_FORMS && BB_CONFIG_FEATURE_IP_ADDRESS + depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_ADDRESS -config BB_CONFIG_IPLINK +config BUSYBOX_IPLINK bool default y - depends on BB_CONFIG_FEATURE_IP_SHORT_FORMS && BB_CONFIG_FEATURE_IP_LINK + depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_LINK -config BB_CONFIG_IPROUTE +config BUSYBOX_IPROUTE bool default y - depends on BB_CONFIG_FEATURE_IP_SHORT_FORMS && BB_CONFIG_FEATURE_IP_ROUTE + depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_ROUTE -config BB_CONFIG_IPTUNNEL +config BUSYBOX_IPTUNNEL bool default y - depends on BB_CONFIG_FEATURE_IP_SHORT_FORMS && BB_CONFIG_FEATURE_IP_TUNNEL + depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_TUNNEL -config BB_CONFIG_IPRULE +config BUSYBOX_IPRULE bool default y - depends on BB_CONFIG_FEATURE_IP_SHORT_FORMS && BB_CONFIG_FEATURE_IP_RULE + depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_RULE -config BB_CONFIG_IPCALC +config BUSYBOX_IPCALC bool "ipcalc" default n help ipcalc takes an IP address and netmask and calculates the resulting broadcast, network, and host range. -config BB_CONFIG_FEATURE_IPCALC_FANCY +config BUSYBOX_FEATURE_IPCALC_FANCY bool "Fancy IPCALC, more options, adds 1 kbyte" default y - depends on BB_CONFIG_IPCALC + depends on BUSYBOX_IPCALC help - Adds the options hostname, prefix and silent to the output of "ipcalc". + Adds the options hostname, prefix and silent to the output of + "ipcalc". -config BB_CONFIG_FEATURE_IPCALC_LONG_OPTIONS +config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_IPCALC && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_IPCALC && BUSYBOX_GETOPT_LONG help Support long options for the ipcalc applet. -config BB_CONFIG_NAMEIF +config BUSYBOX_NAMEIF bool "nameif" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help nameif is used to rename network interface by its MAC address. Renamed interfaces MUST be in the down state. It is possible to use a file (default: /etc/mactab) with list of new interface names and MACs. - Maximum interface name length: IF_NAMESIZE = 16 + Maximum interface name length: IFNAMSIZ = 16 File fields are separated by space or tab. File format: # Comment new_interface_name XX:XX:XX:XX:XX:XX -config BB_CONFIG_FEATURE_NAMEIF_EXTENDED +config BUSYBOX_FEATURE_NAMEIF_EXTENDED bool "Extended nameif" default n - depends on BB_CONFIG_NAMEIF + depends on BUSYBOX_NAMEIF help This extends the nameif syntax to support the bus_info and driver checks. The syntax is compatible to the normal nameif. @@ -596,136 +596,143 @@ config BB_CONFIG_FEATURE_NAMEIF_EXTENDED new_interface_name mac=00:80:C8:38:91:B5 new_interface_name 00:80:C8:38:91:B5 -config BB_CONFIG_NC +config BUSYBOX_NC bool "nc" default n help A simple Unix utility which reads and writes data across network connections. -config BB_CONFIG_NC_SERVER +config BUSYBOX_NC_SERVER bool "Netcat server options (-l)" default n - depends on BB_CONFIG_NC + depends on BUSYBOX_NC help Allow netcat to act as a server. -config BB_CONFIG_NC_EXTRA +config BUSYBOX_NC_EXTRA bool "Netcat extensions (-eiw and filename)" default n - depends on BB_CONFIG_NC + depends on BUSYBOX_NC help Add -e (support for executing the rest of the command line after making or receiving a successful connection), -i (delay interval for lines sent), -w (timeout for initial connection). -config BB_CONFIG_NETSTAT +config BUSYBOX_NETSTAT bool "netstat" default n help netstat prints information about the Linux networking subsystem. -config BB_CONFIG_FEATURE_NETSTAT_WIDE +config BUSYBOX_FEATURE_NETSTAT_WIDE bool "Enable wide netstat output" default n - depends on BB_CONFIG_NETSTAT + depends on BUSYBOX_NETSTAT help Add support for wide columns. Useful when displaying IPv6 addresses (-W option). -config BB_CONFIG_NSLOOKUP +config BUSYBOX_FEATURE_NETSTAT_PRG + bool "Enable PID/Program name output" + default n + depends on BUSYBOX_NETSTAT + help + Add support for -p flag to print out PID and program name. + +700 bytes of code. + +config BUSYBOX_NSLOOKUP bool "nslookup" default n help nslookup is a tool to query Internet name servers. -config BB_CONFIG_PING +config BUSYBOX_PING bool "ping" default n help ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to elicit an ICMP ECHO_RESPONSE from a host or gateway. -config BB_CONFIG_PING6 +config BUSYBOX_PING6 bool "ping6" default n - depends on BB_CONFIG_FEATURE_IPV6 && BB_CONFIG_PING + depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_PING help This will give you a ping that can talk IPv6. -config BB_CONFIG_FEATURE_FANCY_PING +config BUSYBOX_FEATURE_FANCY_PING bool "Enable fancy ping output" default y - depends on BB_CONFIG_PING + depends on BUSYBOX_PING help Make the output from the ping applet include statistics, and at the same time provide full support for ICMP packets. -config BB_CONFIG_PSCAN +config BUSYBOX_PSCAN bool "pscan" default n help Simple network port scanner. -config BB_CONFIG_ROUTE +config BUSYBOX_ROUTE bool "route" default n help Route displays or manipulates the kernel's IP routing tables. -config BB_CONFIG_SENDMAIL - bool "sendmail" - default n - help - Barebones sendmail. - -config BB_CONFIG_FETCHMAIL - bool "fetchmail" - default n - help - Barebones fetchmail. - -config BB_CONFIG_SLATTACH +config BUSYBOX_SLATTACH bool "slattach" default n help - slattach is a small utility to attach network interfaces to serial lines. + slattach is a small utility to attach network interfaces to serial + lines. + +#config TC +# bool "tc" +# default n +# help +# show / manipulate traffic control settings +# +#config FEATURE_TC_INGRESS +# def_bool n +# depends on TC -config BB_CONFIG_TELNET +config BUSYBOX_TELNET bool "telnet" default n help Telnet is an interface to the TELNET protocol, but is also commonly used to test other simple protocols. -config BB_CONFIG_FEATURE_TELNET_TTYPE +config BUSYBOX_FEATURE_TELNET_TTYPE bool "Pass TERM type to remote host" default y - depends on BB_CONFIG_TELNET + depends on BUSYBOX_TELNET help Setting this option will forward the TERM environment variable to the - remote host you are connecting to. This is useful to make sure that + remote host you are connecting to. This is useful to make sure that things like ANSI colors and other control sequences behave. -config BB_CONFIG_FEATURE_TELNET_AUTOLOGIN +config BUSYBOX_FEATURE_TELNET_AUTOLOGIN bool "Pass USER type to remote host" default y - depends on BB_CONFIG_TELNET + depends on BUSYBOX_TELNET help Setting this option will forward the USER environment variable to the remote host you are connecting to. This is useful when you need to log into a machine without telling the username (autologin). This option enables `-a' and `-l USER' arguments. -config BB_CONFIG_TELNETD +config BUSYBOX_TELNETD bool "telnetd" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help A daemon for the TELNET protocol, allowing you to log onto the host - running the daemon. Please keep in mind that the TELNET protocol - sends passwords in plain text. If you can't afford the space for an - SSH daemon and you trust your network, you may say 'y' here. As a + running the daemon. Please keep in mind that the TELNET protocol + sends passwords in plain text. If you can't afford the space for an + SSH daemon and you trust your network, you may say 'y' here. As a more secure alternative, you should seriously consider installing the very small Dropbear SSH daemon instead: http://matt.ucc.asn.au/dropbear/dropbear.html @@ -751,7 +758,7 @@ config BB_CONFIG_TELNETD mount -t devpts devpts /dev/pts You need to be sure that Busybox has LOGIN and - FEATURE_SUID enabled. And finally, you should make + FEATURE_SUID enabled. And finally, you should make certain that Busybox has been installed setuid root: chown root.root /bin/busybox @@ -760,22 +767,22 @@ config BB_CONFIG_TELNETD with all that done, telnetd _should_ work.... -config BB_CONFIG_FEATURE_TELNETD_STANDALONE +config BUSYBOX_FEATURE_TELNETD_STANDALONE bool "Support standalone telnetd (not inetd only)" default n - depends on BB_CONFIG_TELNETD + depends on BUSYBOX_TELNETD help Selecting this will make telnetd able to run standalone. -config BB_CONFIG_TFTP +config BUSYBOX_TFTP bool "tftp" default n help - This enables the Trivial File Transfer Protocol client program. TFTP + This enables the Trivial File Transfer Protocol client program. TFTP is usually used for simple, small transfers such as a root image for a network-enabled bootloader. -config BB_CONFIG_TFTPD +config BUSYBOX_TFTPD bool "tftpd" default n help @@ -785,110 +792,110 @@ config BB_CONFIG_TFTPD In other words: it should be run from inetd in nowait mode, or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR" -config BB_CONFIG_FEATURE_TFTP_GET +config BUSYBOX_FEATURE_TFTP_GET bool "Enable \"get\" command" default y - depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD + depends on BUSYBOX_TFTP || BUSYBOX_TFTPD help - Add support for the GET command within the TFTP client. This allows + Add support for the GET command within the TFTP client. This allows a client to retrieve a file from a TFTP server. Also enable upload support in tftpd, if tftpd is selected. -config BB_CONFIG_FEATURE_TFTP_PUT +config BUSYBOX_FEATURE_TFTP_PUT bool "Enable \"put\" command" default y - depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD + depends on BUSYBOX_TFTP || BUSYBOX_TFTPD help - Add support for the PUT command within the TFTP client. This allows + Add support for the PUT command within the TFTP client. This allows a client to transfer a file to a TFTP server. Also enable download support in tftpd, if tftpd is selected. -config BB_CONFIG_FEATURE_TFTP_BLOCKSIZE +config BUSYBOX_FEATURE_TFTP_BLOCKSIZE bool "Enable \"blksize\" protocol option" default n - depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD + depends on BUSYBOX_TFTP || BUSYBOX_TFTPD help Allow tftp to specify block size, and tftpd to understand "blksize" option. -config BB_CONFIG_DEBUG_TFTP +config BUSYBOX_TFTP_DEBUG bool "Enable debug" default n - depends on BB_CONFIG_TFTP + depends on BUSYBOX_TFTP help - Enable debug settings for tftp. This is useful if you're running + Enable debug settings for tftp. This is useful if you're running into problems with tftp as the protocol doesn't help you much when you run into problems. -config BB_CONFIG_TRACEROUTE +config BUSYBOX_TRACEROUTE bool "traceroute" default n help Utility to trace the route of IP packets -config BB_CONFIG_FEATURE_TRACEROUTE_VERBOSE +config BUSYBOX_FEATURE_TRACEROUTE_VERBOSE bool "Enable verbose output" default n - depends on BB_CONFIG_TRACEROUTE + depends on BUSYBOX_TRACEROUTE help - Add some verbosity to traceroute. This includes amongst other things + Add some verbosity to traceroute. This includes amongst other things hostnames and ICMP response types. -config BB_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE +config BUSYBOX_FEATURE_TRACEROUTE_SOURCE_ROUTE bool "Enable loose source route" default n - depends on BB_CONFIG_TRACEROUTE + depends on BUSYBOX_TRACEROUTE help Add option to specify a loose source route gateway (8 maximum). -config BB_CONFIG_FEATURE_TRACEROUTE_USE_ICMP +config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP bool "Use ICMP instead of UDP" default n - depends on BB_CONFIG_TRACEROUTE + depends on BUSYBOX_TRACEROUTE help Add feature to allow for ICMP ECHO instead of UDP datagrams. source config/busybox/networking/udhcp/Config.in -config BB_CONFIG_VCONFIG +config BUSYBOX_VCONFIG bool "vconfig" default n help Creates, removes, and configures VLAN interfaces -config BB_CONFIG_WGET +config BUSYBOX_WGET bool "wget" default n help wget is a utility for non-interactive download of files from HTTP, HTTPS, and FTP servers. -config BB_CONFIG_FEATURE_WGET_STATUSBAR +config BUSYBOX_FEATURE_WGET_STATUSBAR bool "Enable a nifty process meter (+2k)" default y - depends on BB_CONFIG_WGET + depends on BUSYBOX_WGET help Enable the transfer progress bar for wget transfers. -config BB_CONFIG_FEATURE_WGET_AUTHENTICATION +config BUSYBOX_FEATURE_WGET_AUTHENTICATION bool "Enable HTTP authentication" default y - depends on BB_CONFIG_WGET + depends on BUSYBOX_WGET help Support authenticated HTTP transfers. -config BB_CONFIG_FEATURE_WGET_LONG_OPTIONS +config BUSYBOX_FEATURE_WGET_LONG_OPTIONS bool "Enable long options" default n - depends on BB_CONFIG_WGET && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_WGET && BUSYBOX_GETOPT_LONG help Support long options for the wget applet. -config BB_CONFIG_ZCIP +config BUSYBOX_ZCIP bool "zcip" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927. It's a daemon that allocates and defends a dynamically assigned @@ -897,16 +904,18 @@ config BB_CONFIG_ZCIP See http://www.zeroconf.org for further details, and "zcip.script" in the busybox examples. -config BB_CONFIG_TCPSVD +config BUSYBOX_TCPSVD bool "tcpsvd" default n help - tcpsvd listens on a TCP port and runs a program for each new connection + tcpsvd listens on a TCP port and runs a program for each new + connection. -config BB_CONFIG_UDPSVD +config BUSYBOX_UDPSVD bool "udpsvd" default n help - udpsvd listens on an UDP port and runs a program for each new connection + udpsvd listens on an UDP port and runs a program for each new + connection. endmenu diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in index a65d67f2c..f63997e6e 100644 --- a/config/busybox/networking/udhcp/Config.in +++ b/config/busybox/networking/udhcp/Config.in @@ -3,126 +3,115 @@ # see scripts/kbuild/config-language.txt. # -config BB_CONFIG_APP_UDHCPD - bool "udhcp Server (udhcpd)" +config BUSYBOX_APP_UDHCPD + bool "udhcp server (udhcpd)" default n help - uDHCPd is a DHCP server geared primarily toward embedded systems, + udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. - See http://udhcp.busybox.net for further details. - -config BB_CONFIG_APP_DHCPRELAY +config BUSYBOX_APP_DHCPRELAY bool "dhcprelay" default n - depends on BB_CONFIG_APP_UDHCPD + depends on BUSYBOX_APP_UDHCPD help dhcprelay listens for dhcp requests on one or more interfaces and forwards these requests to a different interface or dhcp server. -config BB_CONFIG_APP_DUMPLEASES +config BUSYBOX_APP_DUMPLEASES bool "Lease display utility (dumpleases)" default n - depends on BB_CONFIG_APP_UDHCPD + depends on BUSYBOX_APP_UDHCPD help dumpleases displays the leases written out by the udhcpd server. Lease times are stored in the file by time remaining in lease, or by the absolute time that it expires in seconds from epoch. - See http://udhcp.busybox.net for further details. - -config BB_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY +config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY bool "Rewrite the lease file at every new acknowledge" default n - depends on BB_CONFIG_APP_UDHCPD + depends on BUSYBOX_APP_UDHCPD help If selected, udhcpd will write a new file with leases every - time a new lease has been accepted, thus eleminating the need - to send SIGUSR1 for the initial writing, or updating. Any timed + time a new lease has been accepted, thus eliminating the need + to send SIGUSR1 for the initial writing or updating. Any timed rewriting remains undisturbed -config BB_CONFIG_DHCPD_LEASES_FILE +config BUSYBOX_DHCPD_LEASES_FILE string "Absolute path to lease file" default "/var/lib/misc/udhcpd.leases" - depends on BB_CONFIG_APP_UDHCPD + depends on BUSYBOX_APP_UDHCPD help - The udhcpd stores address in lease files. Normaly it is save - to leave it untouched. - + udhcpd stores addresses in a lease file. This is the absolute path + of the file. Normally it is safe to leave it untouched. -config BB_CONFIG_APP_UDHCPC - bool "udhcp Client (udhcpc)" +config BUSYBOX_APP_UDHCPC + bool "udhcp client (udhcpc)" default n help - uDHCPc is a DHCP client geared primarily toward embedded systems, + udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. The udhcp client negotiates a lease with the DHCP server and - notifies a set of scripts when a lease is obtained or lost. + runs a script when a lease is obtained or lost. - See http://udhcp.busybox.net for further details. - -config BB_CONFIG_FEATURE_UDHCPC_ARPING - bool "Ask udhcpc to verify that the offered address is free, using arpping" +config BUSYBOX_FEATURE_UDHCPC_ARPING + bool "Verify that the offered address is free, using ARP ping" default y - depends on BB_CONFIG_APP_UDHCPC + depends on BUSYBOX_APP_UDHCPC help - If selected, udhcpc will use arpping to make sure the offered address - is really available. The client will DHCPDECLINE the offer if the - address is in use, and restart the discover process. + If selected, udhcpc will send ARP probes and make sure + the offered address is really not in use by anyone. The client + will DHCPDECLINE the offer if the address is in use, + and restart the discover process. -config BB_CONFIG_FEATURE_UDHCP_PORT +config BUSYBOX_FEATURE_UDHCP_PORT bool "Enable '-P port' option for udhcpd and udhcpc" default n - depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC + depends on BUSYBOX_APP_UDHCPD || BUSYBOX_APP_UDHCPC help At the cost of ~300 bytes, enables -P port option. This feature is typically not needed. -config BB_CONFIG_FEATURE_UDHCP_DEBUG +config BUSYBOX_UDHCP_DEBUG bool "Compile udhcp with noisy debugging messages" default n - depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC + depends on BUSYBOX_APP_UDHCPD || BUSYBOX_APP_UDHCPC help - If selected, udhcpd will output extra debugging output. If using - this option, compile uDHCP with "-g", and do not fork the daemon to - the background. - - See http://udhcp.busybox.net for further details. + If selected, udhcpd will output extra debugging output. -config BB_CONFIG_FEATURE_RFC3397 +config BUSYBOX_FEATURE_UDHCP_RFC3397 bool "Support for RFC3397 domain search (experimental)" default n - depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC + depends on BUSYBOX_APP_UDHCPD || BUSYBOX_APP_UDHCPC help If selected, both client and server will support passing of domain search lists via option 119, specified in RFC3397. -config BB_CONFIG_DHCPC_DEFAULT_SCRIPT +config BUSYBOX_UDHCPC_DEFAULT_SCRIPT string "Absolute path to config script" default "/usr/share/udhcpc/default.script" - depends on BB_CONFIG_APP_UDHCPC + depends on BUSYBOX_APP_UDHCPC help - This script is called after udhcpc receives and answer. See - examples/udhcp for a working example. Normaly it is save + This script is called after udhcpc receives an answer. See + examples/udhcp for a working example. Normally it is safe to leave this untouched. - -config BB_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS +config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS int "DHCP options slack buffer size" default 80 range 0 924 - depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC + depends on BUSYBOX_APP_UDHCPD || BUSYBOX_APP_UDHCPC help - Some buggy DHCP servers will send DHCP offer packets with option + Some buggy DHCP servers send DHCP offer packets with option field larger than we expect (which might also be considered a buffer overflow attempt). These packets are normally discarded. If circumstances beyond your control force you to support such servers, this may help. The upper limit (924) makes dhcpc accept even 1500 byte packets (maximum-sized ethernet packets). - This options does not make dhcp[cd] emit non-standard + This option does not make dhcp[cd] emit non-standard sized packets. Known buggy DHCP servers: @@ -130,4 +119,4 @@ config BB_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS seems to confuse maximum allowed UDP packet size with maximum size of entire IP packet, and sends packets which are 28 bytes too large. - Seednet (ISP) VDSL: sends packets 2 bytes too big. + Seednet (ISP) VDSL: sends packets 2 bytes too large. diff --git a/config/busybox/printutils/Config.in b/config/busybox/printutils/Config.in index 2a9b5d827..41d0f9c2b 100644 --- a/config/busybox/printutils/Config.in +++ b/config/busybox/printutils/Config.in @@ -1,19 +1,23 @@ +# +# For a description of the syntax of this configuration file, +# see scripts/kbuild/config-language.txt. +# + menu "Print Utilities" - depends on BUSYBOX -config BB_CONFIG_LPD +config BUSYBOX_LPD bool "lpd" default n help lpd is a print spooling daemon. -config BB_CONFIG_LPR +config BUSYBOX_LPR bool "lpr" default n help lpr sends files (or standard input) to a print spooling daemon. -config BB_CONFIG_LPQ +config BUSYBOX_LPQ bool "lpq" default n help diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in index 502db1a27..9cee185d4 100644 --- a/config/busybox/procps/Config.in +++ b/config/busybox/procps/Config.in @@ -4,9 +4,8 @@ # menu "Process Utilities" - depends on BUSYBOX -config BB_CONFIG_FREE +config BUSYBOX_FREE bool "free" default n help @@ -14,156 +13,175 @@ config BB_CONFIG_FREE memory in the system, as well as the buffers used by the kernel. The shared memory column should be ignored; it is obsolete. -config BB_CONFIG_FUSER +config BUSYBOX_FUSER bool "fuser" default n help fuser lists all PIDs (Process IDs) that currently have a given - file open. fuser can also list all PIDs that have a given network + file open. fuser can also list all PIDs that have a given network (TCP or UDP) port open. -config BB_CONFIG_KILL +config BUSYBOX_KILL bool "kill" default n help The command kill sends the specified signal to the specified - process or process group. If no signal is specified, the TERM + process or process group. If no signal is specified, the TERM signal is sent. -config BB_CONFIG_KILLALL +config BUSYBOX_KILLALL bool "killall" default n - depends on BB_CONFIG_KILL + depends on BUSYBOX_KILL help killall sends a signal to all processes running any of the - specified commands. If no signal name is specified, SIGTERM is + specified commands. If no signal name is specified, SIGTERM is sent. -config BB_CONFIG_KILLALL5 +config BUSYBOX_KILLALL5 bool "killall5" default n - depends on BB_CONFIG_KILL + depends on BUSYBOX_KILL -config BB_CONFIG_NMETER +config BUSYBOX_NMETER bool "nmeter" default n help Prints selected system stats continuously, one line per update. -config BB_CONFIG_PGREP +config BUSYBOX_PGREP bool "pgrep" default n help Look for processes by name. -config BB_CONFIG_PIDOF +config BUSYBOX_PIDOF bool "pidof" default n help Pidof finds the process id's (pids) of the named programs. It prints those id's on the standard output. -config BB_CONFIG_FEATURE_PIDOF_SINGLE +config BUSYBOX_FEATURE_PIDOF_SINGLE bool "Enable argument for single shot (-s)" default n - depends on BB_CONFIG_PIDOF + depends on BUSYBOX_PIDOF help Support argument '-s' for returning only the first pid found. -config BB_CONFIG_FEATURE_PIDOF_OMIT +config BUSYBOX_FEATURE_PIDOF_OMIT bool "Enable argument for omitting pids (-o)" default n - depends on BB_CONFIG_PIDOF + depends on BUSYBOX_PIDOF help Support argument '-o' for omitting the given pids in output. The special pid %PPID can be used to name the parent process of the pidof, in other words the calling shell or shell script. -config BB_CONFIG_PKILL +config BUSYBOX_PKILL bool "pkill" default n help Send signals to processes by name. -config BB_CONFIG_PS +config BUSYBOX_PS bool "ps" default n help ps gives a snapshot of the current processes. -config BB_CONFIG_FEATURE_PS_WIDE +config BUSYBOX_FEATURE_PS_WIDE bool "Enable argument for wide output (-w)" default n - depends on BB_CONFIG_PS + depends on BUSYBOX_PS help Support argument 'w' for wide output. If given once, 132 chars are printed and given more than one, the length is unlimited. -config BB_CONFIG_FEATURE_PS_TIME +config BUSYBOX_FEATURE_PS_TIME bool "Enable time and elapsed time output" default n - depends on BB_CONFIG_PS && BB_CONFIG_DESKTOP + depends on BUSYBOX_PS && BUSYBOX_DESKTOP help Support -o time and -o etime output specifiers. -config BB_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS +config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS bool "Support Linux prior to 2.4.0 and non-ELF systems" default n - depends on BB_CONFIG_FEATURE_PS_TIME + depends on BUSYBOX_FEATURE_PS_TIME help Include support for measuring HZ on old kernels and non-ELF systems (if you are on Linux 2.4.0+ and use ELF, you don't need this) -config BB_CONFIG_RENICE +config BUSYBOX_RENICE bool "renice" default n help Renice alters the scheduling priority of one or more running processes. -config BB_CONFIG_BB_SYSCTL +config BUSYBOX_BB_SYSCTL bool "sysctl" default n help Configure kernel parameters at runtime. -config BB_CONFIG_TOP +config BUSYBOX_TOP bool "top" default n help The top program provides a dynamic real-time view of a running system. -config BB_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE - bool "Show CPU per-process usage percentage (adds 2k bytes)" +config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE + bool "Show CPU per-process usage percentage" default y - depends on BB_CONFIG_TOP + depends on BUSYBOX_TOP help Make top display CPU usage for each process. + This adds about 2k. -config BB_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS - bool "Show CPU global usage percentage (adds 0.5k bytes)" +config BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS + bool "Show CPU global usage percentage" default y - depends on BB_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE + depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE help Makes top display "CPU: NN% usr NN% sys..." line. + This adds about 0.5k. -config BB_CONFIG_FEATURE_TOP_DECIMALS - bool "Show 1/10th of a percent in CPU/mem statistics (adds 0.3k bytes)" +config BUSYBOX_FEATURE_TOP_SMP_CPU + bool "SMP CPU usage display ('c' key)" default n - depends on BB_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE + depends on BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS + help + Allow 'c' key to switch between individual/cumulative CPU stats + This adds about 0.5k. + +config BUSYBOX_FEATURE_TOP_DECIMALS + bool "Show 1/10th of a percent in CPU/mem statistics" + default n + depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE help Show 1/10th of a percent in CPU/mem statistics. + This adds about 0.3k. -config BB_CONFIG_FEATURE_TOPMEM - bool "topmem" +config BUSYBOX_FEATURE_TOP_SMP_PROCESS + bool "Show CPU process runs on ('j' field)" default n - depends on BB_CONFIG_TOP + depends on BUSYBOX_TOP help - Enable 's' in top (gives lots of memory info) + Show CPU where process was last found running on. + This is the 'j' field. -config BB_CONFIG_UPTIME +config BUSYBOX_FEATURE_TOPMEM + bool "Topmem command ('s' key)" + default n + depends on BUSYBOX_TOP + help + Enable 's' in top (gives lots of memory info). + +config BUSYBOX_UPTIME bool "uptime" default n help @@ -171,14 +189,12 @@ config BB_CONFIG_UPTIME the system has been running, how many users are currently logged on, and the system load averages for the past 1, 5, and 15 minutes. -config BB_CONFIG_WATCH +config BUSYBOX_WATCH bool "watch" default n - #huh?? select DATE help watch is used to execute a program periodically, showing output to the screen. endmenu - diff --git a/config/busybox/runit/Config.in b/config/busybox/runit/Config.in index e0ad9b329..d228df397 100644 --- a/config/busybox/runit/Config.in +++ b/config/busybox/runit/Config.in @@ -4,16 +4,15 @@ # menu "Runit Utilities" - depends on BUSYBOX -config BB_CONFIG_RUNSV +config BUSYBOX_RUNSV bool "runsv" default n help runsv starts and monitors a service and optionally an appendant log service. -config BB_CONFIG_RUNSVDIR +config BUSYBOX_RUNSVDIR bool "runsvdir" default n help @@ -21,14 +20,31 @@ config BB_CONFIG_RUNSVDIR a directory, in the services directory dir, up to a limit of 1000 subdirectories, and restarts a runsv process if it terminates. -config BB_CONFIG_SV +config BUSYBOX_FEATURE_RUNSVDIR_LOG + bool "Enable scrolling argument log" + depends on BUSYBOX_RUNSVDIR + default n + help + Enable feature where second parameter of runsvdir holds last error + message (viewable via top/ps). Otherwise (feature is off + or no parameter), error messages go to stderr only. + +config BUSYBOX_SV bool "sv" default n help sv reports the current status and controls the state of services monitored by the runsv supervisor. -config BB_CONFIG_SVLOGD +config BUSYBOX_SV_DEFAULT_SERVICE_DIR + string "Default directory for services" + default "/var/service" + depends on BUSYBOX_SV + help + Default directory for services. + Defaults to "/var/service" + +config BUSYBOX_SVLOGD bool "svlogd" default n help @@ -36,30 +52,30 @@ config BB_CONFIG_SVLOGD filters log messages, and writes the data to one or more automatically rotated logs. -config BB_CONFIG_CHPST +config BUSYBOX_CHPST bool "chpst" default n help chpst changes the process state according to the given options, and execs specified program. -config BB_CONFIG_SETUIDGID +config BUSYBOX_SETUIDGID bool "setuidgid" help Sets soft resource limits as specified by options -config BB_CONFIG_ENVUIDGID +config BUSYBOX_ENVUIDGID bool "envuidgid" help Sets $UID to account's uid and $GID to account's gid -config BB_CONFIG_ENVDIR +config BUSYBOX_ENVDIR bool "envdir" help Sets various environment variables as specified by files in the given directory -config BB_CONFIG_SOFTLIMIT +config BUSYBOX_SOFTLIMIT bool "softlimit" help Sets soft resource limits as specified by options diff --git a/config/busybox/selinux/Config.in b/config/busybox/selinux/Config.in index b5764f507..ddb0247ba 100644 --- a/config/busybox/selinux/Config.in +++ b/config/busybox/selinux/Config.in @@ -3,120 +3,119 @@ # see scripts/kbuild/config-language.txt. # -menu "Selinux Utilities" - depends on BUSYBOX - depends on BB_CONFIG_SELINUX +menu "SELinux Utilities" + depends on BUSYBOX_SELINUX -config BB_CONFIG_CHCON +config BUSYBOX_CHCON bool "chcon" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to change the security context of file. -config BB_CONFIG_FEATURE_CHCON_LONG_OPTIONS +config BUSYBOX_FEATURE_CHCON_LONG_OPTIONS bool "Enable long options" default y - depends on BB_CONFIG_CHCON && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_CHCON && BUSYBOX_GETOPT_LONG help Support long options for the chcon applet. -config BB_CONFIG_GETENFORCE +config BUSYBOX_GETENFORCE bool "getenforce" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to get the current mode of SELinux. -config BB_CONFIG_GETSEBOOL +config BUSYBOX_GETSEBOOL bool "getsebool" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to get SELinux boolean values. -config BB_CONFIG_LOAD_POLICY +config BUSYBOX_LOAD_POLICY bool "load_policy" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to load SELinux policy. -config BB_CONFIG_MATCHPATHCON +config BUSYBOX_MATCHPATHCON bool "matchpathcon" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to get default security context of the specified path from the file contexts configuration. -config BB_CONFIG_RESTORECON +config BUSYBOX_RESTORECON bool "restorecon" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to relabel files. The feature is almost the same as setfiles, but usage is a little different. -config BB_CONFIG_RUNCON +config BUSYBOX_RUNCON bool "runcon" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to run command in speficied security context. -config BB_CONFIG_FEATURE_RUNCON_LONG_OPTIONS +config BUSYBOX_FEATURE_RUNCON_LONG_OPTIONS bool "Enable long options" default y - depends on BB_CONFIG_RUNCON && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_RUNCON && BUSYBOX_GETOPT_LONG help Support long options for the runcon applet. -config BB_CONFIG_SELINUXENABLED +config BUSYBOX_SELINUXENABLED bool "selinuxenabled" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support for this command to be used within shell scripts to determine if selinux is enabled. -config BB_CONFIG_SETENFORCE +config BUSYBOX_SETENFORCE bool "setenforce" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to modify the mode SELinux is running in. -config BB_CONFIG_SETFILES +config BUSYBOX_SETFILES bool "setfiles" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support to modify to relabel files. Notice: If you built libselinux with -D_FILE_OFFSET_BITS=64, (It is default in libselinux's Makefile), you _must_ enable CONFIG_LFS. -config BB_CONFIG_FEATURE_SETFILES_CHECK_OPTION +config BUSYBOX_FEATURE_SETFILES_CHECK_OPTION bool "Enable check option" default n - depends on BB_CONFIG_SETFILES + depends on BUSYBOX_SETFILES help Support "-c" option (check the validity of the contexts against the specified binary policy) for setfiles. Requires libsepol. -config BB_CONFIG_SETSEBOOL +config BUSYBOX_SETSEBOOL bool "setsebool" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Enable support for change boolean. semanage and -P option is not supported yet. -config BB_CONFIG_SESTATUS +config BUSYBOX_SESTATUS bool "sestatus" default n - depends on BB_CONFIG_SELINUX + depends on BUSYBOX_SELINUX help Displays the status of SELinux. diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in index fcb98b804..7419d12a4 100644 --- a/config/busybox/shell/Config.in +++ b/config/busybox/shell/Config.in @@ -4,147 +4,157 @@ # menu "Shells" - depends on BUSYBOX choice prompt "Choose your default shell" - default BB_CONFIG_FEATURE_SH_IS_NONE + default BUSYBOX_FEATURE_SH_IS_NONE help Choose a shell. The ash shell is the most bash compatible and full featured one. -config BB_CONFIG_FEATURE_SH_IS_ASH - select BB_CONFIG_ASH +config BUSYBOX_FEATURE_SH_IS_ASH + select BUSYBOX_ASH bool "ash" -config BB_CONFIG_FEATURE_SH_IS_HUSH - select BB_CONFIG_HUSH +config BUSYBOX_FEATURE_SH_IS_HUSH + select BUSYBOX_HUSH bool "hush" ####config FEATURE_SH_IS_LASH #### select LASH #### bool "lash" -config BB_CONFIG_FEATURE_SH_IS_MSH - select BB_CONFIG_MSH +config BUSYBOX_FEATURE_SH_IS_MSH + select BUSYBOX_MSH bool "msh" -config BB_CONFIG_FEATURE_SH_IS_NONE +config BUSYBOX_FEATURE_SH_IS_NONE bool "none" endchoice -config BB_CONFIG_ASH +config BUSYBOX_ASH bool "ash" default n - select BB_CONFIG_TEST help Tha 'ash' shell adds about 60k in the default configuration and is the most complete and most pedantically correct shell included with - busybox. This shell is actually a derivative of the Debian 'dash' + busybox. This shell is actually a derivative of the Debian 'dash' shell (by Herbert Xu), which was created by porting the 'ash' shell (written by Kenneth Almquist) from NetBSD. comment "Ash Shell Options" - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH -config BB_CONFIG_ASH_JOB_CONTROL +config BUSYBOX_ASH_BASH_COMPAT + bool "bash-compatible extensions" + default y + depends on BUSYBOX_ASH + help + Enable bash-compatible extensions. + +config BUSYBOX_ASH_JOB_CONTROL bool "Job control" default y - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable job control in the ash shell. -config BB_CONFIG_ASH_READ_NCHARS +config BUSYBOX_ASH_READ_NCHARS bool "'read -n N' and 'read -s' support" default n - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help 'read -n N' will return a value after N characters have been read. 'read -s' will read without echoing the user's input. -config BB_CONFIG_ASH_READ_TIMEOUT - bool "'read -t S' support." +config BUSYBOX_ASH_READ_TIMEOUT + bool "'read -t S' support" default n - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help 'read -t S' will return a value after S seconds have passed. This implementation will allow fractional seconds, expressed as a decimal fraction, e.g. 'read -t 2.5 foo'. -config BB_CONFIG_ASH_ALIAS +config BUSYBOX_ASH_ALIAS bool "alias support" default y - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable alias support in the ash shell. -config BB_CONFIG_ASH_MATH_SUPPORT +config BUSYBOX_ASH_MATH_SUPPORT bool "Posix math support" default y - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable math support in the ash shell. -config BB_CONFIG_ASH_MATH_SUPPORT_64 +config BUSYBOX_ASH_MATH_SUPPORT_64 bool "Extend Posix math support to 64 bit" default n - depends on BB_CONFIG_ASH_MATH_SUPPORT + depends on BUSYBOX_ASH_MATH_SUPPORT help - Enable 64-bit math support in the ash shell. This will make + Enable 64-bit math support in the ash shell. This will make the shell slightly larger, but will allow computation with very large numbers. -config BB_CONFIG_ASH_GETOPTS +config BUSYBOX_ASH_GETOPTS bool "Builtin getopt to parse positional parameters" default n - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable getopts builtin in the ash shell. -config BB_CONFIG_ASH_BUILTIN_ECHO +config BUSYBOX_ASH_BUILTIN_ECHO bool "Builtin version of 'echo'" default y - select BB_CONFIG_ECHO - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable support for echo, builtin to ash. -config BB_CONFIG_ASH_BUILTIN_TEST +config BUSYBOX_ASH_BUILTIN_PRINTF + bool "Builtin version of 'printf'" + default y + depends on BUSYBOX_ASH + help + Enable support for printf, builtin to ash. + +config BUSYBOX_ASH_BUILTIN_TEST bool "Builtin version of 'test'" default y - select BB_CONFIG_TEST - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable support for test, builtin to ash. -config BB_CONFIG_ASH_CMDCMD +config BUSYBOX_ASH_CMDCMD bool "'command' command to override shell builtins" default n - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable support for the ash 'command' builtin, which allows you to run the specified command with the specified arguments, even when there is an ash builtin command with the same name. -config BB_CONFIG_ASH_MAIL +config BUSYBOX_ASH_MAIL bool "Check for new mail on interactive shells" default y - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable "check for new mail" in the ash shell. -config BB_CONFIG_ASH_OPTIMIZE_FOR_SIZE +config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE bool "Optimize for size instead of speed" default y - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Compile ash for reduced size at the price of speed. -config BB_CONFIG_ASH_RANDOM_SUPPORT +config BUSYBOX_ASH_RANDOM_SUPPORT bool "Pseudorandom generator and variable $RANDOM" default n - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. @@ -152,53 +162,51 @@ config BB_CONFIG_ASH_RANDOM_SUPPORT After "unset RANDOM" then generator will switch off and this variable will no longer have special treatment. -config BB_CONFIG_ASH_EXPAND_PRMT +config BUSYBOX_ASH_EXPAND_PRMT bool "Expand prompt string" default n - depends on BB_CONFIG_ASH + depends on BUSYBOX_ASH help "PS#" may be contain volatile content, such as backquote commands. This option recreates the prompt string from the environment variable each time it is displayed. -config BB_CONFIG_HUSH +config BUSYBOX_HUSH bool "hush" default n - select BB_CONFIG_TRUE - select BB_CONFIG_FALSE - select BB_CONFIG_TEST - select BB_CONFIG_ECHO help hush is a very small shell (just 18k) and it has fairly complete - Bourne shell grammar. It even handles all the normal flow control + Bourne shell grammar. It even handles all the normal flow control options such as if/then/elif/else/fi, for/in/do/done, while loops, - etc. + case/esac. + + It uses only vfork, so it can be used on uClinux systems. - It does not handle case/esac, select, function, here documents ( << + It does not handle select, functions, here documents ( << word ), arithmetic expansion, aliases, brace expansion, tilde expansion, &> and >& redirection of stdout+stderr, etc. -config BB_CONFIG_HUSH_HELP +config BUSYBOX_HUSH_HELP bool "help builtin" default n - depends on BB_CONFIG_HUSH + depends on BUSYBOX_HUSH help Enable help builtin in hush. Code size + ~1 kbyte. -config BB_CONFIG_HUSH_INTERACTIVE +config BUSYBOX_HUSH_INTERACTIVE bool "Interactive mode" default y - depends on BB_CONFIG_HUSH + depends on BUSYBOX_HUSH help Enable interactive mode (prompt and command editing). Without this, hush simply reads and executes commands from stdin just like a shell script from the file. No prompt, no PS1/PS2 magic shell variables. -config BB_CONFIG_HUSH_JOB +config BUSYBOX_HUSH_JOB bool "Job control" default n - depends on BB_CONFIG_HUSH_INTERACTIVE + depends on BUSYBOX_HUSH_INTERACTIVE help Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current command (not entire shell), fg/bg builtins work. Without this option, @@ -206,70 +214,74 @@ config BB_CONFIG_HUSH_JOB prompting for next command (or executing next command in a script), but no separate process group is formed. -config BB_CONFIG_HUSH_TICK +config BUSYBOX_HUSH_TICK bool "Process substitution" default n - depends on BB_CONFIG_HUSH + depends on BUSYBOX_HUSH help Enable process substitution `command` and $(command) in hush. -config BB_CONFIG_HUSH_IF +config BUSYBOX_HUSH_IF bool "Support if/then/elif/else/fi" default n - depends on BB_CONFIG_HUSH + depends on BUSYBOX_HUSH help Enable if/then/elif/else/fi in hush. -config BB_CONFIG_HUSH_LOOPS +config BUSYBOX_HUSH_LOOPS bool "Support for, while and until loops" default n - depends on BB_CONFIG_HUSH + depends on BUSYBOX_HUSH help Enable for, while and until loops in hush. + As of 2008-07, break and continue statements are not supported. -config BB_CONFIG_LASH +config BUSYBOX_HUSH_CASE + bool "Support case ... esac statement" + default n + depends on BUSYBOX_HUSH + help + Enable case ... esac statement in hush. +400 bytes. + +config BUSYBOX_LASH bool "lash" default n - select BB_CONFIG_HUSH + select BUSYBOX_HUSH help lash is deprecated and will be removed, please migrate to hush. - -config BB_CONFIG_MSH +config BUSYBOX_MSH bool "msh" default n - select BB_CONFIG_TRUE - select BB_CONFIG_FALSE - select BB_CONFIG_TEST help The minix shell (adds just 30k) is quite complete and handles things like for/do/done, case/esac and all the things you expect a Bourne - shell to do. It is not always pedantically correct about Bourne + shell to do. It is not always pedantically correct about Bourne shell grammar (try running the shell testscript "tests/sh.testcases" on it and compare vs bash) but for most things it works quite well. - It also uses only vfork, so it can be used on uClinux systems. + It uses only vfork, so it can be used on uClinux systems. comment "Bourne Shell Options" - depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH + depends on BUSYBOX_MSH || BUSYBOX_LASH || BUSYBOX_HUSH || BUSYBOX_ASH -config BB_CONFIG_FEATURE_SH_EXTRA_QUIET +config BUSYBOX_FEATURE_SH_EXTRA_QUIET bool "Hide message on interactive shell startup" default n - depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH + depends on BUSYBOX_MSH || BUSYBOX_LASH || BUSYBOX_HUSH || BUSYBOX_ASH help Remove the busybox introduction when starting a shell. -config BB_CONFIG_FEATURE_SH_STANDALONE +config BUSYBOX_FEATURE_SH_STANDALONE bool "Standalone shell" default n - depends on (BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH) && BB_CONFIG_FEATURE_PREFER_APPLETS + depends on (BUSYBOX_MSH || BUSYBOX_LASH || BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS help This option causes busybox shells to use busybox applets - in preference to executables in the PATH whenever possible. For + in preference to executables in the PATH whenever possible. For example, entering the command 'ifconfig' into the shell would cause - busybox to use the ifconfig busybox applet. Specifying the fully + busybox to use the ifconfig busybox applet. Specifying the fully qualified executable name, such as '/sbin/ifconfig' will still - execute the /sbin/ifconfig executable on the filesystem. This option + execute the /sbin/ifconfig executable on the filesystem. This option is generally used when creating a statically linked version of busybox for use as a rescue shell, in the event that you screw up your system. @@ -283,16 +295,33 @@ config BB_CONFIG_FEATURE_SH_STANDALONE started this way). # untrue? # Note that this will *also* cause applets to take precedence -# over shell builtins of the same name. So turning this on will +# over shell builtins of the same name. So turning this on will # eliminate any performance gained by turning on the builtin "echo" # and "test" commands in ash. # untrue? # Note that when using this option, the shell will attempt to directly -# run '/bin/busybox'. If you do not have the busybox binary sitting in +# run '/bin/busybox'. If you do not have the busybox binary sitting in # that exact location with that exact name, this option will not work at # all. -config BB_CONFIG_CTTYHACK +config BUSYBOX_FEATURE_SH_NOFORK + bool "Run 'nofork' applets directly" + default n + depends on (BUSYBOX_MSH || BUSYBOX_LASH || BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS + help + This option causes busybox shells [currently only ash] + to not execute typical fork/exec/wait sequence, but call _main + directly, if possible. (Sometimes it is not possible: for example, + this is not possible in pipes). + + This will be done only for some applets (those which are marked + NOFORK in include/applets.h). + + This may significantly speed up some shell scripts. + + This feature is relatively new. Use with care. + +config BUSYBOX_CTTYHACK bool "cttyhack" default n help diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in index 8807e679d..64db34175 100644 --- a/config/busybox/sysklogd/Config.in +++ b/config/busybox/sysklogd/Config.in @@ -4,90 +4,89 @@ # menu "System Logging Utilities" - depends on BUSYBOX -config BB_CONFIG_SYSLOGD +config BUSYBOX_SYSLOGD bool "syslogd" default n help The syslogd utility is used to record logs of all the - significant events that occur on a system. Every + significant events that occur on a system. Every message that is logged records the date and time of the event, and will generally also record the name of the - application that generated the message. When used in + application that generated the message. When used in conjunction with klogd, messages from the Linux kernel - can also be recorded. This is terribly useful, + can also be recorded. This is terribly useful, especially for finding what happened when something goes - wrong. And something almost always will go wrong if + wrong. And something almost always will go wrong if you wait long enough.... -config BB_CONFIG_FEATURE_ROTATE_LOGFILE +config BUSYBOX_FEATURE_ROTATE_LOGFILE bool "Rotate message files" default n - depends on BB_CONFIG_SYSLOGD + depends on BUSYBOX_SYSLOGD help This enables syslogd to rotate the message files on his own. No need to use an external rotatescript. -config BB_CONFIG_FEATURE_REMOTE_LOG +config BUSYBOX_FEATURE_REMOTE_LOG bool "Remote Log support" default n - depends on BB_CONFIG_SYSLOGD + depends on BUSYBOX_SYSLOGD help When you enable this feature, the syslogd utility can be used to send system log messages to another system - connected via a network. This allows the remote + connected via a network. This allows the remote machine to log all the system messages, which can be terribly useful for reducing the number of serial - cables you use. It can also be a very good security + cables you use. It can also be a very good security measure to prevent system logs from being tampered with by an intruder. -config BB_CONFIG_FEATURE_SYSLOGD_DUP +config BUSYBOX_FEATURE_SYSLOGD_DUP bool "Support -D (drop dups) option" default n - depends on BB_CONFIG_SYSLOGD + depends on BUSYBOX_SYSLOGD help Option -D instructs syslogd to drop consecutive messages which are totally the same. -config BB_CONFIG_FEATURE_IPC_SYSLOG +config BUSYBOX_FEATURE_IPC_SYSLOG bool "Circular Buffer support" default n - depends on BB_CONFIG_SYSLOGD + depends on BUSYBOX_SYSLOGD help When you enable this feature, the syslogd utility will use a circular buffer to record system log messages. When the buffer is filled it will continue to overwrite - the oldest messages. This can be very useful for + the oldest messages. This can be very useful for systems with little or no permanent storage, since otherwise system logs can eventually fill up your entire filesystem, which may cause your system to break badly. -config BB_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE +config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE int "Circular buffer size in Kbytes (minimum 4KB)" default 16 range 4 2147483647 - depends on BB_CONFIG_FEATURE_IPC_SYSLOG + depends on BUSYBOX_FEATURE_IPC_SYSLOG help This option sets the size of the circular buffer used to record system log messages. -config BB_CONFIG_LOGREAD +config BUSYBOX_LOGREAD bool "logread" default y - depends on BB_CONFIG_FEATURE_IPC_SYSLOG + depends on BUSYBOX_FEATURE_IPC_SYSLOG help If you enabled Circular Buffer support, you almost - certainly want to enable this feature as well. This + certainly want to enable this feature as well. This utility will allow you to read the messages that are stored in the syslogd circular buffer. -config BB_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING +config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING bool "Double buffering" default n - depends on BB_CONFIG_LOGREAD + depends on BUSYBOX_LOGREAD help 'logread' ouput to slow serial terminals can have side effects on syslog because of the semaphore. @@ -95,24 +94,24 @@ config BB_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING from circular buffer, minimizing semaphore contention at some minor memory expense. -config BB_CONFIG_KLOGD +config BUSYBOX_KLOGD bool "klogd" default n help klogd is a utility which intercepts and logs all messages from the Linux kernel and sends the messages - out to the 'syslogd' utility so they can be logged. If + out to the 'syslogd' utility so they can be logged. If you wish to record the messages produced by the kernel, you should enable this option. -config BB_CONFIG_LOGGER +config BUSYBOX_LOGGER bool "logger" default n - select BB_CONFIG_FEATURE_SYSLOG + select BUSYBOX_FEATURE_SYSLOG help The logger utility allows you to send arbitrary text messages to the system log (i.e. the 'syslogd' utility) so - they can be logged. This is generally used to help locate + they can be logged. This is generally used to help locate problems that occur within programs and scripts. endmenu diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in index 32e55fcda..a1a127a9e 100644 --- a/config/busybox/util-linux/Config.in +++ b/config/busybox/util-linux/Config.in @@ -4,27 +4,36 @@ # menu "Linux System Utilities" - depends on BUSYBOX -config BB_CONFIG_DMESG +config BUSYBOX_BLKID + bool "blkid" + default n + select BUSYBOX_VOLUMEID + help + Lists labels and UUIDs of all filesystems. + WARNING: + With all submodules selected, it will add ~8k to busybox. + +config BUSYBOX_DMESG bool "dmesg" default n help - dmesg is used to examine or control the kernel ring buffer. When the + dmesg is used to examine or control the kernel ring buffer. When the Linux kernel prints messages to the system log, they are stored in - the kernel ring buffer. You can use dmesg to print the kernel's ring + the kernel ring buffer. You can use dmesg to print the kernel's ring buffer, clear the kernel ring buffer, change the size of the kernel ring buffer, and change the priority level at which kernel messages - are also logged to the system console. Enable this option if you + are also logged to the system console. Enable this option if you wish to enable the 'dmesg' utility. -config BB_CONFIG_FEATURE_DMESG_PRETTY +config BUSYBOX_FEATURE_DMESG_PRETTY bool "Pretty dmesg output" default y - depends on BB_CONFIG_DMESG + depends on BUSYBOX_DMESG help If you wish to scrub the syslog level from the output, say 'Y' here. - The syslog level is a string prefixed to every line with the form "<#>". + The syslog level is a string prefixed to every line with the form + "<#>". With this option you will see: # dmesg @@ -38,263 +47,261 @@ config BB_CONFIG_FEATURE_DMESG_PRETTY <6>BIOS-provided physical RAM map: <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable) -config BB_CONFIG_FBSET +config BUSYBOX_FBSET bool "fbset" default n help fbset is used to show or change the settings of a Linux frame buffer - device. The frame buffer device provides a simple and unique - interface to access a graphics display. Enable this option + device. The frame buffer device provides a simple and unique + interface to access a graphics display. Enable this option if you wish to enable the 'fbset' utility. -config BB_CONFIG_FEATURE_FBSET_FANCY +config BUSYBOX_FEATURE_FBSET_FANCY bool "Turn on extra fbset options" default n - depends on BB_CONFIG_FBSET + depends on BUSYBOX_FBSET help This option enables extended fbset options, allowing one to set the - framebuffer size, color depth, etc. interface to access a graphics - display. Enable this option if you wish to enable extended fbset + framebuffer size, color depth, etc. interface to access a graphics + display. Enable this option if you wish to enable extended fbset options. -config BB_CONFIG_FEATURE_FBSET_READMODE +config BUSYBOX_FEATURE_FBSET_READMODE bool "Turn on fbset readmode support" default n - depends on BB_CONFIG_FBSET + depends on BUSYBOX_FBSET help This option allows fbset to read the video mode database stored by default as /etc/fb.modes, which can be used to set frame buffer device to pre-defined video modes. -config BB_CONFIG_FDFLUSH +config BUSYBOX_FDFLUSH bool "fdflush" default n help fdflush is only needed when changing media on slightly-broken - removable media drives. It is used to make Linux believe that a + removable media drives. It is used to make Linux believe that a hardware disk-change switch has been actuated, which causes Linux to - forget anything it has cached from the previous media. If you have + forget anything it has cached from the previous media. If you have such a slightly-broken drive, you will need to run fdflush every time - you change a disk. Most people have working hardware and can safely + you change a disk. Most people have working hardware and can safely leave this disabled. -config BB_CONFIG_FDFORMAT +config BUSYBOX_FDFORMAT bool "fdformat" default n help fdformat is used to low-level format a floppy disk. -config BB_CONFIG_FDISK +config BUSYBOX_FDISK bool "fdisk" default n help The fdisk utility is used to divide hard disks into one or more - logical disks, which are generally called partitions. This utility + logical disks, which are generally called partitions. This utility can be used to list and edit the set of partitions or BSD style 'disk slices' that are defined on a hard drive. -config BB_CONFIG_FDISK_SUPPORT_LARGE_DISKS +config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS bool "Support over 4GB disks" default y - depends on BB_CONFIG_FDISK + depends on BUSYBOX_FDISK help Enable this option to support large disks > 4GB. -config BB_CONFIG_FEATURE_FDISK_WRITABLE +config BUSYBOX_FEATURE_FDISK_WRITABLE bool "Write support" default y - depends on BB_CONFIG_FDISK + depends on BUSYBOX_FDISK help Enabling this option allows you to create or change a partition table - and write those changes out to disk. If you leave this option + and write those changes out to disk. If you leave this option disabled, you will only be able to view the partition table. -config BB_CONFIG_FEATURE_AIX_LABEL +config BUSYBOX_FEATURE_AIX_LABEL bool "Support AIX disklabels" default n - depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE + depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE help Enabling this option allows you to create or change AIX disklabels. Most people can safely leave this option disabled. -config BB_CONFIG_FEATURE_SGI_LABEL +config BUSYBOX_FEATURE_SGI_LABEL bool "Support SGI disklabels" default n - depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE + depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE help Enabling this option allows you to create or change SGI disklabels. Most people can safely leave this option disabled. -config BB_CONFIG_FEATURE_SUN_LABEL +config BUSYBOX_FEATURE_SUN_LABEL bool "Support SUN disklabels" default n - depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE + depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE help Enabling this option allows you to create or change SUN disklabels. Most people can safely leave this option disabled. -config BB_CONFIG_FEATURE_OSF_LABEL +config BUSYBOX_FEATURE_OSF_LABEL bool "Support BSD disklabels" default n - depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE + depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE help Enabling this option allows you to create or change BSD disklabels and define and edit BSD disk slices. -config BB_CONFIG_FEATURE_FDISK_ADVANCED +config BUSYBOX_FEATURE_FDISK_ADVANCED bool "Support expert mode" default n - depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE + depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE help Enabling this option allows you to do terribly unsafe things like define arbitrary drive geometry, move the beginning of data in a - partition, and similarly evil things. Unless you have a very good + partition, and similarly evil things. Unless you have a very good reason you would be wise to leave this disabled. -config BB_CONFIG_FINDFS +config BUSYBOX_FINDFS bool "findfs" default n - select BB_CONFIG_VOLUMEID + select BUSYBOX_VOLUMEID help - This is similar to the findfs program that is part of the e2fsprogs - package. However, the e2fsprogs version only support ext2/3. This - version supports those in addition to FAT, swap, and ReiserFS. + Prints the name of a filesystem with given label or UUID. WARNING: With all submodules selected, it will add ~8k to busybox. -config BB_CONFIG_FREERAMDISK +config BUSYBOX_FREERAMDISK bool "freeramdisk" default n help - Linux allows you to create ramdisks. This utility allows you to + Linux allows you to create ramdisks. This utility allows you to delete them and completely free all memory that was used for the - ramdisk. For example, if you boot Linux into a ramdisk and later + ramdisk. For example, if you boot Linux into a ramdisk and later pivot_root, you may want to free the memory that is allocated to the - ramdisk. If you have no use for freeing memory from a ramdisk, leave + ramdisk. If you have no use for freeing memory from a ramdisk, leave this disabled. -config BB_CONFIG_FSCK_MINIX +config BUSYBOX_FSCK_MINIX bool "fsck_minix" default n help The minix filesystem is a nice, small, compact, read-write filesystem - with little overhead. It is not a journaling filesystem however and + with little overhead. It is not a journaling filesystem however and can experience corruption if it is not properly unmounted or if the - power goes off in the middle of a write. This utility allows you to + power goes off in the middle of a write. This utility allows you to check for and attempt to repair any corruption that occurs to a minix filesystem. -config BB_CONFIG_MKFS_MINIX +config BUSYBOX_MKFS_MINIX bool "mkfs_minix" default n help The minix filesystem is a nice, small, compact, read-write filesystem - with little overhead. If you wish to be able to create minix filesystems - this utility will do the job for you. + with little overhead. If you wish to be able to create minix + filesystems this utility will do the job for you. comment "Minix filesystem support" - depends on BB_CONFIG_FSCK_MINIX || BB_CONFIG_MKFS_MINIX + depends on BUSYBOX_FSCK_MINIX || BUSYBOX_MKFS_MINIX -config BB_CONFIG_FEATURE_MINIX2 +config BUSYBOX_FEATURE_MINIX2 bool "Support Minix fs v2 (fsck_minix/mkfs_minix)" default y - depends on BB_CONFIG_FSCK_MINIX || BB_CONFIG_MKFS_MINIX + depends on BUSYBOX_FSCK_MINIX || BUSYBOX_MKFS_MINIX help - If you wish to be able to create version 2 minix filesystems, enable this. - If you enabled 'mkfs_minix' then you almost certainly want to be using the - version 2 filesystem support. + If you wish to be able to create version 2 minix filesystems, enable + this. If you enabled 'mkfs_minix' then you almost certainly want to + be using the version 2 filesystem support. -config BB_CONFIG_GETOPT +config BUSYBOX_GETOPT bool "getopt" default n help The getopt utility is used to break up (parse) options in command lines to make it easy to write complex shell scripts that also check - for legal (and illegal) options. If you want to write horribly + for legal (and illegal) options. If you want to write horribly complex shell scripts, or use some horribly complex shell script - written by others, this utility may be for you. Most people will + written by others, this utility may be for you. Most people will wisely leave this disabled. -config BB_CONFIG_HEXDUMP +config BUSYBOX_HEXDUMP bool "hexdump" default n help The hexdump utility is used to display binary data in a readable way that is comparable to the output from most hex editors. -config BB_CONFIG_FEATURE_HEXDUMP_REVERSE +config BUSYBOX_FEATURE_HEXDUMP_REVERSE bool "Support -R, reverse of 'hexdump -Cv'" default n - depends on BB_CONFIG_HEXDUMP + depends on BUSYBOX_HEXDUMP help The hexdump utility is used to display binary data in an ascii readable way. This option creates binary data from an ascii input. NB: this option is non-standard. It's unwise to use it in scripts aimed to be portable. -config BB_CONFIG_HD +config BUSYBOX_HD bool "hd" default n - select BB_CONFIG_HEXDUMP + select BUSYBOX_HEXDUMP help hd is an alias to hexdump -C. -config BB_CONFIG_HWCLOCK +config BUSYBOX_HWCLOCK bool "hwclock" default n help The hwclock utility is used to read and set the hardware clock - on a system. This is primarily used to set the current time on + on a system. This is primarily used to set the current time on shutdown in the hardware clock, so the hardware will keep the correct time when Linux is _not_ running. -config BB_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS +config BUSYBOX_FEATURE_HWCLOCK_LONG_OPTIONS bool "Support long options (--hctosys,...)" default n - depends on BB_CONFIG_HWCLOCK && BB_CONFIG_GETOPT_LONG + depends on BUSYBOX_HWCLOCK && BUSYBOX_GETOPT_LONG help - By default, the hwclock utility only uses short options. If you + By default, the hwclock utility only uses short options. If you are overly fond of its long options, such as --hctosys, --utc, etc) then enable this option. -config BB_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS +config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS bool "Use FHS /var/lib/hwclock/adjtime" default y - depends on BB_CONFIG_HWCLOCK + depends on BUSYBOX_HWCLOCK help Starting with FHS 2.3, the adjtime state file is supposed to exist - at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish + at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish to use the FHS behavior, answer Y here, otherwise answer N for the classic /etc/adjtime path. - http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO + pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO -config BB_CONFIG_IPCRM +config BUSYBOX_IPCRM bool "ipcrm" default n - select BB_CONFIG_FEATURE_SUID + select BUSYBOX_FEATURE_SUID help The ipcrm utility allows the removal of System V interprocess communication (IPC) objects and the associated data structures from the system. -config BB_CONFIG_IPCS +config BUSYBOX_IPCS bool "ipcs" default n - select BB_CONFIG_FEATURE_SUID + select BUSYBOX_FEATURE_SUID help The ipcs utility is used to provide information on the currently allocated System V interprocess (IPC) objects in the system. -config BB_CONFIG_LOSETUP +config BUSYBOX_LOSETUP bool "losetup" default n help losetup is used to associate or detach a loop device with a regular - file or block device, and to query the status of a loop device. This + file or block device, and to query the status of a loop device. This version does not currently support enabling data encryption. -config BB_CONFIG_MDEV +config BUSYBOX_MDEV bool "mdev" default n help @@ -303,39 +310,47 @@ config BB_CONFIG_MDEV For more information, please see docs/mdev.txt -config BB_CONFIG_FEATURE_MDEV_CONF +config BUSYBOX_FEATURE_MDEV_CONF bool "Support /etc/mdev.conf" default n - depends on BB_CONFIG_MDEV + depends on BUSYBOX_MDEV help Add support for the mdev config file to control ownership and permissions of the device nodes. For more information, please see docs/mdev.txt -config BB_CONFIG_FEATURE_MDEV_RENAME +config BUSYBOX_FEATURE_MDEV_RENAME bool "Support subdirs/symlinks" default n - depends on BB_CONFIG_FEATURE_MDEV_CONF + depends on BUSYBOX_FEATURE_MDEV_CONF help Add support for renaming devices and creating symlinks. For more information, please see docs/mdev.txt -config BB_CONFIG_FEATURE_MDEV_EXEC +config BUSYBOX_FEATURE_MDEV_RENAME_REGEXP + bool "Support regular expressions substitutions when renaming device" + default n + depends on BUSYBOX_FEATURE_MDEV_RENAME + help + Add support for regular expressions substitutions when renaming + device. + +config BUSYBOX_FEATURE_MDEV_EXEC bool "Support command execution at device addition/removal" default n - depends on BB_CONFIG_FEATURE_MDEV_CONF + depends on BUSYBOX_FEATURE_MDEV_CONF help This adds support for an optional field to /etc/mdev.conf for executing commands when devices are created/removed. For more information, please see docs/mdev.txt -config BB_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE +config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE bool "Support loading of firmwares" default n - depends on BB_CONFIG_MDEV + depends on BUSYBOX_MDEV help Some devices need to load firmware before they can be usable. @@ -343,88 +358,86 @@ config BB_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE /lib/firmware/ and if it exists, send it to the kernel for loading into the hardware. -config BB_CONFIG_MKSWAP +config BUSYBOX_MKSWAP bool "mkswap" default n help The mkswap utility is used to configure a file or disk partition as - Linux swap space. This allows Linux to use the entire file or + Linux swap space. This allows Linux to use the entire file or partition as if it were additional RAM, which can greatly increase - the capability of low-memory machines. This additional memory is + the capability of low-memory machines. This additional memory is much slower than real RAM, but can be very helpful at preventing your applications being killed by the Linux out of memory (OOM) killer. Once you have created swap space using 'mkswap' you need to enable the swap space using the 'swapon' utility. -config BB_CONFIG_FEATURE_MKSWAP_V0 +config BUSYBOX_FEATURE_MKSWAP_V0 bool "Version 0 support" default n - depends on BB_CONFIG_MKSWAP + depends on BUSYBOX_MKSWAP # depends on MKSWAP && DEPRECATED help Enable support for the old v0 style. If your kernel is older than 2.1.117, then v0 support is the only option. -config BB_CONFIG_MORE +config BUSYBOX_MORE bool "more" default n help more is a simple utility which allows you to read text one screen - sized page at a time. If you want to read text that is larger than + sized page at a time. If you want to read text that is larger than the screen, and you are using anything faster than a 300 baud modem, - you will probably find this utility very helpful. If you don't have + you will probably find this utility very helpful. If you don't have any need to reading text files, you can leave this disabled. -config BB_CONFIG_FEATURE_USE_TERMIOS +config BUSYBOX_FEATURE_USE_TERMIOS bool "Use termios to manipulate the screen" default y - depends on BB_CONFIG_MORE || BB_CONFIG_TOP + depends on BUSYBOX_MORE || BUSYBOX_TOP help This option allows utilities such as 'more' and 'top' to determine - the size of the screen. If you leave this disabled, your utilities + the size of the screen. If you leave this disabled, your utilities that display things on the screen will be especially primitive and will be unable to determine the current screen size, and will be unable to move the cursor. -config BB_CONFIG_VOLUMEID - bool "Routines for detecting label and uuid on common filesystems" +config BUSYBOX_VOLUMEID + bool #No description makes it a hidden option default n - help - TODO -config BB_CONFIG_FEATURE_VOLUMEID_EXT +config BUSYBOX_FEATURE_VOLUMEID_EXT bool "Ext filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_REISERFS +config BUSYBOX_FEATURE_VOLUMEID_REISERFS bool "Reiser filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_FAT +config BUSYBOX_FEATURE_VOLUMEID_FAT bool "fat filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_HFS +config BUSYBOX_FEATURE_VOLUMEID_HFS bool "hfs filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_JFS +config BUSYBOX_FEATURE_VOLUMEID_JFS bool "jfs filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO @@ -435,45 +448,45 @@ config BB_CONFIG_FEATURE_VOLUMEID_JFS ### help ### TODO -config BB_CONFIG_FEATURE_VOLUMEID_XFS +config BUSYBOX_FEATURE_VOLUMEID_XFS bool "xfs filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_NTFS +config BUSYBOX_FEATURE_VOLUMEID_NTFS bool "ntfs filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_ISO9660 +config BUSYBOX_FEATURE_VOLUMEID_ISO9660 bool "iso9660 filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_UDF +config BUSYBOX_FEATURE_VOLUMEID_UDF bool "udf filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_LUKS +config BUSYBOX_FEATURE_VOLUMEID_LUKS bool "luks filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_LINUXSWAP +config BUSYBOX_FEATURE_VOLUMEID_LINUXSWAP bool "linux swap filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO @@ -484,10 +497,10 @@ config BB_CONFIG_FEATURE_VOLUMEID_LINUXSWAP ### help ### TODO -config BB_CONFIG_FEATURE_VOLUMEID_CRAMFS +config BUSYBOX_FEATURE_VOLUMEID_CRAMFS bool "cramfs filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO @@ -498,17 +511,17 @@ config BB_CONFIG_FEATURE_VOLUMEID_CRAMFS ### help ### TODO -config BB_CONFIG_FEATURE_VOLUMEID_ROMFS +config BUSYBOX_FEATURE_VOLUMEID_ROMFS bool "romfs filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_FEATURE_VOLUMEID_SYSV +config BUSYBOX_FEATURE_VOLUMEID_SYSV bool "sysv filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO @@ -526,7 +539,7 @@ config BB_CONFIG_FEATURE_VOLUMEID_SYSV ### depends on VOLUMEID ### help ### TODO -### +### ### config FEATURE_VOLUMEID_MSDOS ### bool "msdos filesystem" ### default n @@ -534,10 +547,10 @@ config BB_CONFIG_FEATURE_VOLUMEID_SYSV ### help ### TODO -config BB_CONFIG_FEATURE_VOLUMEID_OCFS2 +config BUSYBOX_FEATURE_VOLUMEID_OCFS2 bool "ocfs2 filesystem" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO @@ -590,44 +603,44 @@ config BB_CONFIG_FEATURE_VOLUMEID_OCFS2 ### help ### TODO -config BB_CONFIG_FEATURE_VOLUMEID_LINUXRAID +config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID bool "linuxraid" default n - depends on BB_CONFIG_VOLUMEID + depends on BUSYBOX_VOLUMEID help TODO -config BB_CONFIG_MOUNT +config BUSYBOX_MOUNT bool "mount" default n help All files and filesystems in Unix are arranged into one big directory - tree. The 'mount' utility is used to graft a filesystem onto a - particular part of the tree. A filesystem can either live on a block + tree. The 'mount' utility is used to graft a filesystem onto a + particular part of the tree. A filesystem can either live on a block device, or it can be accessible over the network, as is the case with - NFS filesystems. Most people using BusyBox will also want to enable + NFS filesystems. Most people using BusyBox will also want to enable the 'mount' utility. -config BB_CONFIG_FEATURE_MOUNT_FAKE +config BUSYBOX_FEATURE_MOUNT_FAKE bool "Support option -f" default n - depends on BB_CONFIG_MOUNT + depends on BUSYBOX_MOUNT help Enable support for faking a file system mount. -config BB_CONFIG_FEATURE_MOUNT_VERBOSE +config BUSYBOX_FEATURE_MOUNT_VERBOSE bool "Support option -v" default n - depends on BB_CONFIG_MOUNT + depends on BUSYBOX_MOUNT help Enable multi-level -v[vv...] verbose messages. Useful if you debug mount problems and want to see what is exactly passed to the kernel. -config BB_CONFIG_FEATURE_MOUNT_HELPERS +config BUSYBOX_FEATURE_MOUNT_HELPERS bool "Support mount helpers" default n - depends on BB_CONFIG_MOUNT + depends on BUSYBOX_MOUNT help Enable mounting of virtual file systems via external helpers. E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call @@ -636,61 +649,61 @@ config BB_CONFIG_FEATURE_MOUNT_HELPERS "sometype [-o opts] fs /mnt" if simple mount syscall fails. The idea is to use such virtual filesystems in /etc/fstab. -config BB_CONFIG_FEATURE_MOUNT_LABEL +config BUSYBOX_FEATURE_MOUNT_LABEL bool "Support specifiying devices by label or UUID" default n - depends on BB_CONFIG_MOUNT - select BB_CONFIG_VOLUMEID + depends on BUSYBOX_MOUNT + select BUSYBOX_VOLUMEID help This allows for specifying a device by label or uuid, rather than by - name. This feature utilizes the same functionality as findfs. + name. This feature utilizes the same functionality as blkid/findfs. -config BB_CONFIG_FEATURE_MOUNT_NFS +config BUSYBOX_FEATURE_MOUNT_NFS bool "Support mounting NFS file systems" default n - depends on BB_CONFIG_MOUNT - select BB_CONFIG_FEATURE_HAVE_RPC - select BB_CONFIG_FEATURE_SYSLOG + depends on BUSYBOX_MOUNT + select BUSYBOX_FEATURE_HAVE_RPC + select BUSYBOX_FEATURE_SYSLOG help Enable mounting of NFS file systems. -config BB_CONFIG_FEATURE_MOUNT_CIFS +config BUSYBOX_FEATURE_MOUNT_CIFS bool "Support mounting CIFS/SMB file systems" default n - depends on BB_CONFIG_MOUNT + depends on BUSYBOX_MOUNT help Enable support for samba mounts. -config BB_CONFIG_FEATURE_MOUNT_FLAGS - depends on BB_CONFIG_MOUNT +config BUSYBOX_FEATURE_MOUNT_FLAGS + depends on BUSYBOX_MOUNT bool "Support lots of -o flags in mount" default y help - Without this, mount only supports ro/rw/remount. With this, it + Without this, mount only supports ro/rw/remount. With this, it supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime, noatime, diratime, nodiratime, loud, bind, move, shared, slave, private, unbindable, rshared, rslave, rprivate, and runbindable. -config BB_CONFIG_FEATURE_MOUNT_FSTAB - depends on BB_CONFIG_MOUNT +config BUSYBOX_FEATURE_MOUNT_FSTAB + depends on BUSYBOX_MOUNT bool "Support /etc/fstab and -a" default y help Support mount all and looking for files in /etc/fstab. -config BB_CONFIG_PIVOT_ROOT +config BUSYBOX_PIVOT_ROOT bool "pivot_root" default n help The pivot_root utility swaps the mount points for the root filesystem - with some other mounted filesystem. This allows you to do all sorts + with some other mounted filesystem. This allows you to do all sorts of wild and crazy things with your Linux system and is far more powerful than 'chroot'. - Note: This is for initrd in linux 2.4. Under initramfs (introduced + Note: This is for initrd in linux 2.4. Under initramfs (introduced in linux 2.6) use switch_root instead. -config BB_CONFIG_RDATE +config BUSYBOX_RDATE bool "rdate" default n help @@ -699,102 +712,122 @@ config BB_CONFIG_RDATE the RFC868 protocol, which is built into the inetd daemon on most systems. -config BB_CONFIG_READPROFILE +config BUSYBOX_RDEV + bool "rdev" + default n + help + Print the device node associated with the filesystem mounted at '/'. + +config BUSYBOX_READPROFILE bool "readprofile" default n help This allows you to parse /proc/profile for basic profiling. -config BB_CONFIG_RTCWAKE +config BUSYBOX_RTCWAKE bool "rtcwake" default n help Enter a system sleep state until specified wakeup time. -config BB_CONFIG_SETARCH +config BUSYBOX_SCRIPT + bool "script" + default n + help + The script makes typescript of terminal session. + +config BUSYBOX_SETARCH bool "setarch" default n help The linux32 utility is used to create a 32bit environment for the - specified program (usually a shell). It only makes sense to have + specified program (usually a shell). It only makes sense to have this util on a system that supports both 64bit and 32bit userland (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...). -config BB_CONFIG_SWAPONOFF +config BUSYBOX_SWAPONOFF bool "swaponoff" default n help This option enables both the 'swapon' and the 'swapoff' utilities. Once you have created some swap space using 'mkswap', you also need - to enable your swap space with the 'swapon' utility. The 'swapoff' + to enable your swap space with the 'swapon' utility. The 'swapoff' utility is used, typically at system shutdown, to disable any swap - space. If you are not using any swap space, you can leave this + space. If you are not using any swap space, you can leave this option disabled. -config BB_CONFIG_SWITCH_ROOT +config BUSYBOX_FEATURE_SWAPON_PRI + bool "Support priority option -p" + default n + depends on BUSYBOX_SWAPONOFF + help + Enable support for setting swap device priority in swapon. + +config BUSYBOX_SWITCH_ROOT bool "switch_root" default n help The switch_root utility is used from initramfs to select a new - root device. Under initramfs, you have to use this instead of - pivot_root. (Stop reading here if you don't care why.) + root device. Under initramfs, you have to use this instead of + pivot_root. (Stop reading here if you don't care why.) Booting with initramfs extracts a gzipped cpio archive into rootfs - (which is a variant of ramfs/tmpfs). Because rootfs can't be moved - or unmounted*, pivot_root will not work from initramfs. Instead, + (which is a variant of ramfs/tmpfs). Because rootfs can't be moved + or unmounted*, pivot_root will not work from initramfs. Instead, switch_root deletes everything out of rootfs (including itself), does a mount --move that overmounts rootfs with the new root, and then execs the specified init program. * Because the Linux kernel uses rootfs internally as the starting and ending point for searching through the kernel's doubly linked - list of active mount points. That's why. + list of active mount points. That's why. -config BB_CONFIG_UMOUNT +config BUSYBOX_UMOUNT bool "umount" default n help - When you want to remove a mounted filesystem from its current mount point, - for example when you are shutting down the system, the 'umount' utility is - the tool to use. If you enabled the 'mount' utility, you almost certainly - also want to enable 'umount'. + When you want to remove a mounted filesystem from its current mount + point, for example when you are shutting down the system, the + 'umount' utility is the tool to use. If you enabled the 'mount' + utility, you almost certainly also want to enable 'umount'. -config BB_CONFIG_FEATURE_UMOUNT_ALL +config BUSYBOX_FEATURE_UMOUNT_ALL bool "Support option -a" default n - depends on BB_CONFIG_UMOUNT + depends on BUSYBOX_UMOUNT help Support -a option to unmount all currently mounted filesystems. comment "Common options for mount/umount" - depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT + depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT -config BB_CONFIG_FEATURE_MOUNT_LOOP +config BUSYBOX_FEATURE_MOUNT_LOOP bool "Support loopback mounts" default n - depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT + depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT help Enabling this feature allows automatic mounting of files (containing - filesystem images) via the linux kernel's loopback devices. The mount - command will detect you are trying to mount a file instead of a block - device, and transparently associate the file with a loopback device. - The umount command will also free that loopback device. + filesystem images) via the linux kernel's loopback devices. + The mount command will detect you are trying to mount a file instead + of a block device, and transparently associate the file with a + loopback device. The umount command will also free that loopback + device. You can still use the 'losetup' utility (to manually associate files with loop devices) if you need to do something advanced, such as specify an offset or cryptographic options to the loopback device. (If you don't want umount to free the loop device, use "umount -D".) -config BB_CONFIG_FEATURE_MTAB_SUPPORT +config BUSYBOX_FEATURE_MTAB_SUPPORT bool "Support for the old /etc/mtab file" default n - depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT - select BB_CONFIG_FEATURE_MOUNT_FAKE + depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT + select BUSYBOX_FEATURE_MOUNT_FAKE help Historically, Unix systems kept track of the currently mounted - partitions in the file "/etc/mtab". These days, the kernel exports + partitions in the file "/etc/mtab". These days, the kernel exports the list of currently mounted partitions in "/proc/mounts", rendering - the old mtab file obsolete. (In modern systems, /etc/mtab should be + the old mtab file obsolete. (In modern systems, /etc/mtab should be a symlink to /proc/mounts.) The only reason to have mount maintain an /etc/mtab file itself is if @@ -804,7 +837,7 @@ config BB_CONFIG_FEATURE_MTAB_SUPPORT features like separate per-process filesystem namespaces, requires that your /etc directory be writeable, tends to get easily confused by --bind or --move mounts, won't update if you rename a directory - that contains a mount point, and so on. (In brief: avoid.) + that contains a mount point, and so on. (In brief: avoid.) About the only reason to use this is if you've removed /proc from your kernel. diff --git a/patches/busybox-1.10.4/generic/busybox-1.10.4-init-extra-quiet.diff b/patches/busybox-1.10.4/generic/busybox-1.10.4-init-extra-quiet.diff deleted file mode 100644 index ef5de133a..000000000 --- a/patches/busybox-1.10.4/generic/busybox-1.10.4-init-extra-quiet.diff +++ /dev/null @@ -1,43 +0,0 @@ -Subject: Avoid messages when quiet -From: Robert Schwebel - -I've tried to use busybox with CONFIG_FEATURE_EXTRA_QUIET, but init's -startup banner does still appear. I don't understand the intended logic -behind the sniplet patched below: it is in an 'else' part that is only -executed if the syslog feature is not enabled; why should something -printed out differently if syslog is not enabled? - -So this patch removes the duplicate full_write and delegates it to the -normal one. - -The second part of the patch changes the file descriptor to stdout -instead of stderr. Init doesn't print out errors. - -Signed-off-by: Robert Schwebel - ---- - init/init.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -Index: busybox-1.10.4/init/init.c -=================================================================== ---- busybox-1.10.4.orig/init/init.c -+++ busybox-1.10.4/init/init.c -@@ -166,16 +166,11 @@ static void message(int where, const cha - } - } - } -- if (where & L_LOG) { -- full_write(log_fd, msg, l); -- if (log_fd == 2) -- return; /* don't print dup messages */ -- } - } - - if (where & L_CONSOLE) { - /* Send console messages to console so people will see them. */ -- full_write(2, msg, l); -+ full_write(1, msg, l); - } - } - diff --git a/patches/busybox-1.10.4/generic/series b/patches/busybox-1.10.4/generic/series deleted file mode 100644 index 9507de819..000000000 --- a/patches/busybox-1.10.4/generic/series +++ /dev/null @@ -1 +0,0 @@ -busybox-1.10.4-init-extra-quiet.diff diff --git a/patches/busybox-1.13.2/generic/busybox-1.10.4-init-extra-quiet.diff b/patches/busybox-1.13.2/generic/busybox-1.10.4-init-extra-quiet.diff new file mode 100644 index 000000000..f1d6e5140 --- /dev/null +++ b/patches/busybox-1.13.2/generic/busybox-1.10.4-init-extra-quiet.diff @@ -0,0 +1,52 @@ +Subject: Avoid messages when quiet +From: Robert Schwebel + +I've tried to use busybox with CONFIG_FEATURE_EXTRA_QUIET, but init's +startup banner does still appear. I don't understand the intended logic +behind the sniplet patched below: it is in an 'else' part that is only +executed if the syslog feature is not enabled; why should something +printed out differently if syslog is not enabled? + +So this patch removes the duplicate full_write and delegates it to the +normal one. + +The second part of the patch changes the file descriptor to stdout +instead of stderr. Init doesn't print out errors. + +Signed-off-by: Robert Schwebel + +ported to busybox-1.13.2 + +Signed-ogg-by: Marc Kleine-Budde + +--- + init/init.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: busybox-1.13.2/init/init.c +=================================================================== +--- busybox-1.13.2.orig/init/init.c ++++ busybox-1.13.2/init/init.c +@@ -152,16 +152,22 @@ static void message(int where, const cha + } + } + } ++#if 0 + if (where & L_LOG) { + full_write(log_fd, msg, l); + if (log_fd == STDERR_FILENO) + return; /* don't print dup messages */ + } ++#endif + } + + if (where & L_CONSOLE) { + /* Send console messages to console so people will see them. */ ++#if 0 + full_write(STDERR_FILENO, msg, l); ++#else ++ full_write(STDOUT_FILENO, msg, l); ++#endif + } + } + diff --git a/patches/busybox-1.13.2/generic/series b/patches/busybox-1.13.2/generic/series new file mode 100644 index 000000000..9507de819 --- /dev/null +++ b/patches/busybox-1.13.2/generic/series @@ -0,0 +1 @@ +busybox-1.10.4-init-extra-quiet.diff diff --git a/rules/busybox.in b/rules/busybox.in index 65e925b95..d3adb4353 100644 --- a/rules/busybox.in +++ b/rules/busybox.in @@ -3,7 +3,7 @@ menuconfig BUSYBOX tristate prompt "busybox " - select LIBC_M if BB_CONFIG_FEATURE_AWK_MATH + select LIBC_M if BUSYBOX_FEATURE_AWK_MATH help BusyBox is the Swiss Army Knife of embedded Linux. It is a multi call program which hosts nearly all important unix diff --git a/rules/busybox.make b/rules/busybox.make index 8e5e6e50e..d319a8a88 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox # # Paths and names # -BUSYBOX_VERSION := 1.10.4 +BUSYBOX_VERSION := 1.13.2 BUSYBOX := busybox-$(BUSYBOX_VERSION) BUSYBOX_SUFFIX := tar.bz2 BUSYBOX_URL := http://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX) @@ -52,8 +52,8 @@ $(STATEDIR)/busybox.prepare: cd $(BUSYBOX_DIR) && \ $(BUSYBOX_PATH) $(BUSYBOX_ENV) \ $(MAKE) distclean $(BUSYBOX_MAKEVARS) - grep -e PTXCONF_BB_CONFIG_ $(PTXDIST_PTXCONFIG) | \ - sed -e 's/PTXCONF_BB_CONFIG_/CONFIG_/g' > $(BUSYBOX_DIR)/.config + grep -e PTXCONF_BUSYBOX_ $(PTXDIST_PTXCONFIG) | \ + sed -e 's/PTXCONF_BUSYBOX_/CONFIG_/g' > $(BUSYBOX_DIR)/.config $(call ptx/oldconfig, BUSYBOX) @@ -87,7 +87,7 @@ $(STATEDIR)/busybox.targetinstall: @$(call install_fixup, busybox,DEPENDS,) @$(call install_fixup, busybox,DESCRIPTION,missing) -ifdef PTXCONF_BB_CONFIG_FEATURE_SUID +ifdef PTXCONF_BUSYBOX_FEATURE_SUID @$(call install_copy, busybox, 0, 0, 4755, $(BUSYBOX_DIR)/busybox, /bin/busybox) else @$(call install_copy, busybox, 0, 0, 755, $(BUSYBOX_DIR)/busybox, /bin/busybox) diff --git a/rules/coreutils.in b/rules/coreutils.in index c1e87017a..248b1c5ac 100644 --- a/rules/coreutils.in +++ b/rules/coreutils.in @@ -10,48 +10,48 @@ if COREUTILS config COREUTILS_CP bool prompt "cp" - depends on !BB_CONFIG_CP + depends on !BUSYBOX_CP help copy files and directories -comment "busy box' cp is selected!" - depends on BB_CONFIG_CP +comment "BusyBox' cp is selected!" + depends on BUSYBOX_CP config COREUTILS_DD bool prompt "dd" - depends on !BB_CONFIG_DD + depends on !BUSYBOX_DD help convert and copy a file -comment "busy box' dd is selected!" - depends on COREUTILS && BB_CONFIG_DD +comment "BusyBox' dd is selected!" + depends on COREUTILS && BUSYBOX_DD config COREUTILS_MD5SUM bool prompt "md5sum" - depends on !BB_CONFIG_MD5SUM + depends on !BUSYBOX_MD5SUM help compute and check MD5 message digest -comment "busy box' md5sum is selected!" - depends on BB_CONFIG_MD5SUM +comment "BusyBox' md5sum is selected!" + depends on BUSYBOX_MD5SUM config COREUTILS_READLINK bool prompt "readlink" - depends on !BB_CONFIG_READLINK + depends on !BUSYBOX_READLINK help the readlink tool config COREUTILS_SEQ bool prompt "seq" - depends on !BB_CONFIG_SEQ + depends on !BUSYBOX_SEQ help print a sequence of numbers -comment "busy box' seq is selected!" - depends on BB_CONFIG_SEQ +comment "BusyBox' seq is selected!" + depends on BUSYBOX_SEQ endif diff --git a/rules/diffutils.in b/rules/diffutils.in index da16a055f..84ee2297a 100644 --- a/rules/diffutils.in +++ b/rules/diffutils.in @@ -8,12 +8,12 @@ if DIFFUTILS config DIFFUTILS_DIFF bool prompt "diff" - depends on !BB_CONFIG_DIFF + depends on !BUSYBOX_DIFF help diff - compare files line by line -comment "busybox's diff selected" - depends on BB_CONFIG_DIFF +comment "BusyBox' diff selected" + depends on BUSYBOX_DIFF config DIFFUTILS_DIFF3 bool @@ -30,11 +30,11 @@ config DIFFUTILS_SDIFF config DIFFUTILS_CMP bool prompt "cmp" - depends on !BB_CONFIG_CMP + depends on !BUSYBOX_CMP help cmp - compare two files byte by byte -comment "busybox's cmp selected" - depends on BB_CONFIG_CMP +comment "BusyBox' cmp selected" + depends on BUSYBOX_CMP endif diff --git a/rules/dropbear.in b/rules/dropbear.in index 2d3971b96..aaaa85124 100644 --- a/rules/dropbear.in +++ b/rules/dropbear.in @@ -244,7 +244,7 @@ config DROPBEAR_DROPBEAR select DROPBEAR_DROPBEAR_KEY select DROPBEAR_RSA select DROPBEAR_DSS - select BB_CONFIG_START_STOP_DAEMON if BUSYBOX + select BUSYBOX_START_STOP_DAEMON if BUSYBOX help Installs the dropbar server in /usr/sbin/dropbear on the target diff --git a/rules/findutils.in b/rules/findutils.in index 54f50e1af..2c8ca5238 100644 --- a/rules/findutils.in +++ b/rules/findutils.in @@ -11,27 +11,27 @@ if FINDUTILS config FINDUTILS_FIND bool - depends on !BB_CONFIG_FIND + depends on !BUSYBOX_FIND prompt "find" help Searches given directory trees for files matching the specified criteria -comment "busy box' find is selected!" - depends on BB_CONFIG_FIND +comment "BusyBox' find is selected!" + depends on BUSYBOX_FIND config FINDUTILS_XARGS bool - depends on !BB_CONFIG_XARGS + depends on !BUSYBOX_XARGS prompt "xargs" help Can be used to apply a given command to a list of files -comment "busy box' xargs is selected!" - depends on BB_CONFIG_XARGS +comment "BusyBox' xargs is selected!" + depends on BUSYBOX_XARGS config FINDUTILS_DATABASE bool - depends on !BB_CONFIG_FIND && !BB_CONFIG_XARGS + depends on !BUSYBOX_FIND && !BUSYBOX_XARGS select FINDUTILS_FIND select FINDUTILS_XARGS prompt "database support" diff --git a/rules/grep.in b/rules/grep.in index c6d0e877d..2022f5fe7 100644 --- a/rules/grep.in +++ b/rules/grep.in @@ -1,10 +1,10 @@ ## SECTION=shell_and_console -comment "busy box' grep is selected!" - depends on BB_CONFIG_GREP +comment "BusyBox' grep is selected!" + depends on BUSYBOX_GREP config GREP tristate - depends on !BB_CONFIG_GREP + depends on !BUSYBOX_GREP prompt "grep" help GNUgrep searches one or more input files for lines diff --git a/rules/hdparm.in b/rules/hdparm.in index c69ae9c5a..4a18b9bd8 100644 --- a/rules/hdparm.in +++ b/rules/hdparm.in @@ -1,11 +1,11 @@ ## SECTION=disk_and_file config HDPARM tristate "hdparm" - depends on !BB_CONFIG_HDPARM + depends on !BUSYBOX_HDPARM help hdparm - get/set ATA drive parameters under Linux See http://sourceforge.net/projects/hdparm/ for details. -comment "Busybox' hdparm is selected" - depends on BB_CONFIG_HDPARM +comment "BusyBox' hdparm is selected" + depends on BUSYBOX_HDPARM diff --git a/rules/inetutils.in b/rules/inetutils.in index 3fa1d73cf..6ee59c3cf 100644 --- a/rules/inetutils.in +++ b/rules/inetutils.in @@ -18,24 +18,24 @@ comment "build options ---" config INETUTILS_INETD bool - depends on !BB_CONFIG_INETD + depends on !BUSYBOX_INETD prompt "inetd" help This is the network super daemon. It opens network connection for various other programs and start them if a connection request occures. -comment "busy box' inetd is selected!" - depends on BB_CONFIG_INETD +comment "BusyBox' inetd is selected!" + depends on BUSYBOX_INETD config INETUTILS_PING bool - depends on !BB_CONFIG_PING + depends on !BUSYBOX_PING prompt "ping" help Ping is a small tool to check if another host is alive in the network -comment "busy box' ping is selected!" - depends on BB_CONFIG_PING +comment "BusyBox' ping is selected!" + depends on BUSYBOX_PING config INETUTILS_RCP bool @@ -72,15 +72,15 @@ config INETUTILS_RSHD config INETUTILS_SYSLOGD bool prompt "syslogd" - depends on !BB_CONFIG_SYSLOGD + depends on !BUSYBOX_SYSLOGD help Sysklogd provides two system utilities which provide support for system logging and kernel message trapping. Support of both internet and unix domain sockets enables this utility package to support both local and remote logging. -comment "busy box' syslogd is selected!" - depends on BB_CONFIG_SYSLOGD +comment "BusyBox' syslogd is selected!" + depends on BUSYBOX_SYSLOGD config INETUTILS_TFTPD bool diff --git a/rules/ipkg.in b/rules/ipkg.in index 806914b50..0787b4101 100644 --- a/rules/ipkg.in +++ b/rules/ipkg.in @@ -3,7 +3,7 @@ menuconfig IPKG tristate prompt "ipkg " # ipkg calls wget with long options! - select BB_CONFIG_FEATURE_WGET_LONG_OPTIONS if BB_CONFIG_WGET + select BUSYBOX_FEATURE_WGET_LONG_OPTIONS if BUSYBOX_WGET help IPKG is a small packet mechanism for embedded systems to maintain the applications on the system. diff --git a/rules/less.in b/rules/less.in index 891fc865c..cbd88b444 100644 --- a/rules/less.in +++ b/rules/less.in @@ -1,11 +1,11 @@ ## SECTION=shell_and_console -comment "busy box' less is selected!" - depends on BB_CONFIG_LESS +comment "BusyBox' less is selected!" + depends on BUSYBOX_LESS menuconfig LESS tristate prompt "less " - depends on !BB_CONFIG_LESS + depends on !BUSYBOX_LESS # select LIBPW if LESS_USE_PW # select CURSES if LESS_USE_CURSES # select TINFO if LESS_USE_TINFO diff --git a/rules/module-init-tools.in b/rules/module-init-tools.in index 5cc056bde..7176fa87a 100644 --- a/rules/module-init-tools.in +++ b/rules/module-init-tools.in @@ -14,32 +14,32 @@ if MODULE_INIT_TOOLS config MODULE_INIT_TOOLS_INSMOD bool prompt "Install insmod on target" - depends on !BB_CONFIG_INSMOD + depends on !BUSYBOX_INSMOD help simple program to insert a module into the Linux Kernel -comment "Busybox' insmod is selected!" - depends on BB_CONFIG_INSMOD +comment "BusyBox' insmod is selected!" + depends on BUSYBOX_INSMOD config MODULE_INIT_TOOLS_RMMOD bool prompt "Install rmmod on target" - depends on !BB_CONFIG_RMMOD + depends on !BUSYBOX_RMMOD help simple program to remove a module from the Linux Kernel -comment "Busybox' rmmod is selected!" - depends on BB_CONFIG_RMMOD +comment "BusyBox' rmmod is selected!" + depends on BUSYBOX_RMMOD config MODULE_INIT_TOOLS_LSMOD bool prompt "Install lsmod on target" - depends on !BB_CONFIG_LSMOD + depends on !BUSYBOX_LSMOD help program to show the status of modules in the Linux Kernel -comment "Busybox' lsmod is selected!" - depends on BB_CONFIG_LSMOD +comment "BusyBox' lsmod is selected!" + depends on BUSYBOX_LSMOD config MODULE_INIT_TOOLS_MODINFO bool @@ -50,12 +50,12 @@ config MODULE_INIT_TOOLS_MODINFO config MODULE_INIT_TOOLS_MODPROBE bool prompt "Install modprobe on target" - depends on !BB_CONFIG_MODPROBE + depends on !BUSYBOX_MODPROBE help program to add and remove modules from the Linux Kernel -comment "Busybox' modprobe is selected!" - depends on BB_CONFIG_MODPROBE +comment "BusyBox' modprobe is selected!" + depends on BUSYBOX_MODPROBE config MODULE_INIT_TOOLS_DEPMOD bool diff --git a/rules/ntpclient.in b/rules/ntpclient.in index f7344dff8..ba107435c 100644 --- a/rules/ntpclient.in +++ b/rules/ntpclient.in @@ -33,14 +33,14 @@ config NTPCLIENT_BUILD_NTPCLIENT config NTPCLIENT_BUILD_ADJTIMEX bool - depends on !BB_CONFIG_ADJTIMEX + depends on !BUSYBOX_ADJTIMEX prompt "adjtimex" default y help Builds the adjtimex binary to control system time -comment "Busybox' adjtimex is in use" - depends on BB_CONFIG_ADJTIMEX +comment "BusyBox' adjtimex is in use" + depends on BUSYBOX_ADJTIMEX comment "runtime options ---" diff --git a/rules/oprofile.in b/rules/oprofile.in index 5df59c88c..627c57055 100644 --- a/rules/oprofile.in +++ b/rules/oprofile.in @@ -5,11 +5,11 @@ config OPROFILE select LIBPOPT select KERNEL select KERNEL_VMLINUX - select BB_CONFIG_DIRNAME - select BB_CONFIG_ID - select BB_CONFIG_MKTEMP - select BB_CONFIG_PIDOF - select BB_CONFIG_PRINTF + select BUSYBOX_DIRNAME + select BUSYBOX_ID + select BUSYBOX_MKTEMP + select BUSYBOX_PIDOF + select BUSYBOX_PRINTF select BINUTILS select BINUTILS_OBJDUMP prompt "oprofile tools" diff --git a/rules/procps.in b/rules/procps.in index 8d7771aca..45d5849ab 100644 --- a/rules/procps.in +++ b/rules/procps.in @@ -12,12 +12,12 @@ if PROCPS config PROCPS_TOP bool prompt "top" - depends on !BB_CONFIG_TOP + depends on !BUSYBOX_TOP help FIXME: This item needs to be documented comment "top is disabled by busybox top" - depends on BB_CONFIG_TOP + depends on BUSYBOX_TOP config PROCPS_SLABTOP bool @@ -28,24 +28,24 @@ config PROCPS_SLABTOP config PROCPS_SYSCTL bool prompt "sysctl" - depends on !BB_CONFIG_SYSCTL + depends on !BUSYBOX_SYSCTL help configure kernel parameters at runtime comment "sysctl is disabled by busybox sysctl" - depends on BB_CONFIG_SYSCTL + depends on BUSYBOX_SYSCTL config PROCPS_PS bool prompt "ps" - depends on !BB_CONFIG_PS + depends on !BUSYBOX_PS help ps stands for process status. With this command you analyse current states of all processes running on the system comment "ps is disabled by busybox ps" - depends on BB_CONFIG_PS + depends on BUSYBOX_PS config PROCPS_W bool diff --git a/rules/rootfs.in b/rules/rootfs.in index 6b995555c..dde062cb1 100644 --- a/rules/rootfs.in +++ b/rules/rootfs.in @@ -8,7 +8,7 @@ config ROOTFS bool prompt "Create Directories in /" default y - select BB_CONFIG_FEATURE_SHADOWPASSWDS if BUSYBOX + select BUSYBOX_FEATURE_SHADOWPASSWDS if BUSYBOX help In order to support a standard root filesystem some subdirectories are mandatory. They will be created by ptxdist automatically. Some diff --git a/rules/rootfs.make b/rules/rootfs.make index 347164abc..d2e88604a 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -801,8 +801,8 @@ endif # ----------------------------------------------------------------------------- # add telnetd if enabled # -ifdef PTXCONF_BB_CONFIG_TELNETD -ifdef PTXCONF_BB_CONFIG_FEATURE_TELNETD_STANDALONE +ifdef PTXCONF_BUSYBOX_TELNETD +ifdef PTXCONF_BUSYBOX_FEATURE_TELNETD_STANDALONE # remove all telnetd entries if this service is not enabled @$(call install_replace, rootfs, /etc/inetd.conf, @TELNETD@, ) @$(call install_replace, rootfs, /etc/services, @TELNETD@, ) diff --git a/rules/rootfs_configfiles.in b/rules/rootfs_configfiles.in index 812ff5740..f174bdea1 100644 --- a/rules/rootfs_configfiles.in +++ b/rules/rootfs_configfiles.in @@ -243,7 +243,7 @@ menuconfig ROOTFS_HOSTS # menuconfig ROOTFS_INITTAB depends on ROOTFS - select BB_CONFIG_GETTY if BUSYBOX + select BUSYBOX_GETTY if BUSYBOX bool prompt "/etc/inittab " default y @@ -399,7 +399,7 @@ menuconfig ROOTFS_PROTOCOLS # menuconfig ROOTFS_INETD depends on ROOTFS - depends on BB_CONFIG_INETD || INETUTILS_INETD + depends on BUSYBOX_INETD || INETUTILS_INETD bool prompt "/etc/inetd.conf " default y @@ -448,18 +448,18 @@ config ROOTFS_ETC_MODULES # # /etc/udhcpc.script -# specific to Busybox' udhcp-client +# specific to BusyBox' udhcp-client # menuconfig ROOTFS_UDHCPC depends on ROOTFS - depends on BB_CONFIG_APP_UDHCPC - select BB_CONFIG_IFCONFIG + depends on BUSYBOX_APP_UDHCPC + select BUSYBOX_IFCONFIG bool prompt "/etc/udhcpc.script " default y help Installs a /etc/udhcpc.script file from a selectable source. - You have checked busybox' udhcpc feature. It accepts the -s file or + You have checked BusyBox' udhcpc feature. It accepts the -s file or --script=file option. So this /etc/udhcpc.script will be run at dhcp events. If your network supports DNS, this script will generate /etc/resolv.conf. @@ -490,7 +490,7 @@ menuconfig ROOTFS_UDHCPC endchoice # -# for Busybox' crond only +# for BusyBox' crond only # /var/spool/cron/crontabs/ # /etc/crond.conf # @@ -505,12 +505,12 @@ config ROOTFS_USER_CROND_CONF /etc/cron/daily from projectroot/crond/daily # -# for Busybox' http only +# for BusyBox' http only # install users httpd.conf # config ROOTFS_BUSYBOX_USER_HTTPD_CONF depends on ROOTFS - depends on BB_CONFIG_HTTPD + depends on BUSYBOX_HTTPD default n bool prompt "project's httpd.conf configuration" diff --git a/rules/rootfs_init_d_files.in b/rules/rootfs_init_d_files.in index 9a9d1ffff..7a27af3df 100644 --- a/rules/rootfs_init_d_files.in +++ b/rules/rootfs_init_d_files.in @@ -9,7 +9,7 @@ config ROOTFS_ETC_INITD bool prompt "Generic Scripts for /etc/init.d" default y - select BB_CONFIG_RUN_PARTS if BUSYBOX + select BUSYBOX_RUN_PARTS if BUSYBOX help When enabled, this option copies the files from ${PTXDIST_TOPDIR}/generic/etc/init.d to the target root @@ -50,18 +50,18 @@ menuconfig ROOTFS_ETC_INITD_RCS your local project endchoice -########################## inetd for Busybox ############################ +########################## inetd for BusyBox ############################ # initd startscript is for busysbox only config ROOTFS_ETC_INITD_INETD depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_INETD + depends on BUSYBOX_INETD bool prompt "inetd" help When enabled, this option installs the generic /etc/init.d/inetd file. This script starts your internet super server (inetd). - This is for Busybox' inetd only. + This is for BusyBox' inetd only. config ROOTFS_ETC_INITD_LOGROTATE bool @@ -76,15 +76,15 @@ config ROOTFS_ETC_INITD_MODULES prompt "modules" help When enabled, load all modules in /etc/modules. This requires - one type of the tool "grep" (from Busybox or paket procps) + one type of the tool "grep" (from BusyBox or paket procps) menuconfig ROOTFS_ETC_INITD_NETWORKING depends on ROOTFS_ETC_INITD bool default y prompt "networking " - select BB_CONFIG_IFUPDOWN if BUSYBOX - select BB_CONFIG_FEATURE_IFUPDOWN_IP if BUSYBOX + select BUSYBOX_IFUPDOWN if BUSYBOX + select BUSYBOX_FEATURE_IFUPDOWN_IP if BUSYBOX help When enabled, this option installs the generic /etc/init.d/networking file. This script starts @@ -103,8 +103,8 @@ menuconfig ROOTFS_ETC_INITD_NETWORKING menuconfig ROOTFS_ETC_INITD_TELNETD depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_TELNETD - depends on BB_CONFIG_FEATURE_TELNETD_STANDALONE + depends on BUSYBOX_TELNETD + depends on BUSYBOX_FEATURE_TELNETD_STANDALONE bool default y prompt "telnetd " @@ -139,7 +139,7 @@ menuconfig ROOTFS_ETC_INITD_TELNETD menuconfig ROOTFS_ETC_INITD_SYSLOGD_KLOGD depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_SYSLOGD + depends on BUSYBOX_SYSLOGD bool prompt "syslogd " help @@ -173,7 +173,7 @@ menuconfig ROOTFS_ETC_INITD_SYSLOGD_KLOGD menuconfig ROOTFS_ETC_INITD_HWCLOCK depends on ROOTFS_ETC_INITD - depends on BB_CONFIG_HWCLOCK + depends on BUSYBOX_HWCLOCK bool prompt "timekeeper " help @@ -261,15 +261,15 @@ menuconfig ROOTFS_ETC_INITD_BANNER ########################## crond ########################################## -# this is for busybox' crond only +# this is for BusyBox' crond only # menuconfig ROOTFS_ETC_INITD_CROND - depends on ROOTFS_ETC_INITD && BB_CONFIG_CROND + depends on ROOTFS_ETC_INITD && BUSYBOX_CROND bool default y prompt "crond " help - The /etc/init.d/crond script lets you control busybox' crond daemon. + The /etc/init.d/crond script lets you control BusyBox' crond daemon. choice prompt "Kind of startup scrict" diff --git a/rules/samba.in b/rules/samba.in index 27125f316..0df2a41ae 100644 --- a/rules/samba.in +++ b/rules/samba.in @@ -135,7 +135,7 @@ if SAMBA config ROOTFS_ETC_INITD_SAMBA bool depends on SAMBA_SERVER - select BB_CONFIG_START_STOP_DAEMON if BUSYBOX + select BUSYBOX_START_STOP_DAEMON if BUSYBOX default y choice prompt "Kind of samba start script" diff --git a/rules/schedutils.in b/rules/schedutils.in index 270cb90b1..f087d3d51 100644 --- a/rules/schedutils.in +++ b/rules/schedutils.in @@ -15,12 +15,12 @@ if SCHEDUTILS config SCHEDUTILS_CHRT bool prompt "chrt" - depends on !BB_CONFIG_CHRT + depends on !BUSYBOX_CHRT help chrt manipulates the real-time attributes of a process. comment "chrt from busybox selected" - depends on BB_CONFIG_CHRT + depends on BUSYBOX_CHRT config SCHEDUTILS_IONICE bool diff --git a/rules/sed.in b/rules/sed.in index 862b24871..f6cdaba07 100644 --- a/rules/sed.in +++ b/rules/sed.in @@ -1,7 +1,7 @@ ## SECTION=shell_and_console config SED tristate - depends on !BB_CONFIG_SED + depends on !BUSYBOX_SED prompt "sed" help sed reads the specified files or the standard input if no @@ -9,6 +9,6 @@ config SED list of commands, and writes the results to the standard output. -comment "busybox's sed selected" - depends on BB_CONFIG_SED +comment "BusyBox' sed selected" + depends on BUSYBOX_SED diff --git a/rules/unzip.in b/rules/unzip.in index be4cb2572..735e88f44 100644 --- a/rules/unzip.in +++ b/rules/unzip.in @@ -10,10 +10,10 @@ if UNZIP config UNZIP_UNZIP bool "unzip" - depends on !BB_CONFIG_UNZIP + depends on !BUSYBOX_UNZIP -comment "busybox's unzip selected" - depends on BB_CONFIG_UNZIP +comment "BusyBox' unzip selected" + depends on BUSYBOX_UNZIP config UNZIP_FUNZIP bool "funzip" diff --git a/rules/utelnetd.in b/rules/utelnetd.in index 85e551226..95bdd1247 100644 --- a/rules/utelnetd.in +++ b/rules/utelnetd.in @@ -1,6 +1,6 @@ ## SECTION=networking menuconfig UTELNETD - depends on !BB_CONFIG_TELNETD + depends on !BUSYBOX_TELNETD tristate prompt "utelnetd " help diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 8ed1a5572..bd6399708 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -11,12 +11,12 @@ config UTIL_LINUX_NG_FDISK bool prompt "fdisk" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_FDISK + depends on !BUSYBOX_FDISK help fdisk - Partition table manipulator for Linux -comment "busy box' fdisk is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_FDISK +comment "BusyBox' fdisk is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_FDISK config UTIL_LINUX_NG_SFDISK bool @@ -38,7 +38,7 @@ config UTIL_LINUX_NG_MKSWAP bool prompt "mkswap" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_MKSWAP + depends on !BUSYBOX_MKSWAP help mkswap sets up a Linux swap area on a device or in a file. @@ -49,62 +49,62 @@ config UTIL_LINUX_NG_MKSWAP_UUID help enable uuid support for mkswap -comment "busy box' mkswap is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_MKSWAP +comment "BusyBox' mkswap is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_MKSWAP config UTIL_LINUX_NG_SWAPON bool prompt "swapon" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_SWAPONOFF + depends on !BUSYBOX_SWAPONOFF help Swapon is used to specify devices on which paging and swapping are to take place. -comment "busy box' swapon is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_SWAPONOFF +comment "BusyBox' swapon is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_SWAPONOFF config UTIL_LINUX_NG_MOUNT bool prompt "mount" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_MOUNT + depends on !BUSYBOX_MOUNT help The mount command serves to attach the file system found on some device to the big file tree. -comment "busy box' mount is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_MOUNT +comment "BusyBox' mount is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_MOUNT config UTIL_LINUX_NG_UMOUNT bool prompt "umount" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_UMOUNT + depends on !BUSYBOX_UMOUNT help The mount(8) command serves to attach the file system found on some device to the big file tree. Conversely, the umount(8) command will detach it again. -comment "busy box' umount is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_UMOUNT +comment "BusyBox' umount is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_UMOUNT config UTIL_LINUX_NG_IPCS bool prompt "ipcs" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_IPCS + depends on !BUSYBOX_IPCS help ipcs provides information on the ipc facilities for which the calling process has read acccess. -comment "busy box' ipcs is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_IPCS +comment "BusyBox' ipcs is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_IPCS config UTIL_LINUX_NG_READPROFILE bool prompt "readprofile" depends on UTIL_LINUX_NG - depends on !BB_CONFIG_READPROFILE + depends on !BUSYBOX_READPROFILE help The readprofile command uses the /proc/profile information to print ascii data on standard output. The output is @@ -115,8 +115,8 @@ config UTIL_LINUX_NG_READPROFILE as a ratio between the number of ticks and the length of the procedure. The output is filled with blanks to ease readability. -comment "busy box' readprofile is selected!" - depends on UTIL_LINUX_NG && BB_CONFIG_READPROFILE +comment "BusyBox' readprofile is selected!" + depends on UTIL_LINUX_NG && BUSYBOX_READPROFILE config UTIL_LINUX_NG_SETTERM bool diff --git a/rules/util-linux.in b/rules/util-linux.in index e66894244..92b41af99 100644 --- a/rules/util-linux.in +++ b/rules/util-linux.in @@ -11,12 +11,12 @@ if UTIL_LINUX config UTIL_LINUX_FDISK bool prompt "fdisk" - depends on !BB_CONFIG_FDISK + depends on !BUSYBOX_FDISK help fdisk - Partition table manipulator for Linux -comment "busy box' fdisk is selected!" - depends on UTIL_LINUX && BB_CONFIG_FDISK +comment "BusyBox' fdisk is selected!" + depends on UTIL_LINUX && BUSYBOX_FDISK config UTIL_LINUX_SFDISK bool @@ -35,61 +35,61 @@ config UTIL_LINUX_CFDISK config UTIL_LINUX_MKSWAP bool prompt "mkswap" - depends on !BB_CONFIG_MKSWAP + depends on !BUSYBOX_MKSWAP help mkswap sets up a Linux swap area on a device or in a file. -comment "busy box' mkswap is selected!" - depends on UTIL_LINUX && BB_CONFIG_MKSWAP +comment "BusyBox' mkswap is selected!" + depends on UTIL_LINUX && BUSYBOX_MKSWAP config UTIL_LINUX_SWAPON bool prompt "swapon" - depends on !BB_CONFIG_SWAPONOFF + depends on !BUSYBOX_SWAPONOFF help Swapon is used to specify devices on which paging and swapping are to take place. -comment "busy box' swapon is selected!" - depends on BB_CONFIG_SWAPONOFF +comment "BusyBox' swapon is selected!" + depends on BUSYBOX_SWAPONOFF config UTIL_LINUX_MOUNT bool prompt "mount" - depends on !BB_CONFIG_MOUNT + depends on !BUSYBOX_MOUNT help The mount command serves to attach the file system found on some device to the big file tree. -comment "busy box' mount is selected!" - depends on BB_CONFIG_MOUNT +comment "BusyBox' mount is selected!" + depends on BUSYBOX_MOUNT config UTIL_LINUX_UMOUNT bool prompt "umount" - depends on !BB_CONFIG_UMOUNT + depends on !BUSYBOX_UMOUNT help The mount(8) command serves to attach the file system found on some device to the big file tree. Conversely, the umount(8) command will detach it again. -comment "busy box' umount is selected!" - depends on UTIL_LINUX && BB_CONFIG_UMOUNT +comment "BusyBox' umount is selected!" + depends on UTIL_LINUX && BUSYBOX_UMOUNT config UTIL_LINUX_IPCS bool prompt "ipcs" - depends on !BB_CONFIG_IPCS + depends on !BUSYBOX_IPCS help ipcs provides information on the ipc facilities for which the calling process has read acccess. -comment "busy box' ipcs is selected!" - depends on BB_CONFIG_IPCS +comment "BusyBox' ipcs is selected!" + depends on BUSYBOX_IPCS config UTIL_LINUX_READPROFILE bool prompt "readprofile" - depends on !BB_CONFIG_READPROFILE + depends on !BUSYBOX_READPROFILE help The readprofile command uses the /proc/profile information to print ascii data on standard output. The output is @@ -100,8 +100,8 @@ config UTIL_LINUX_READPROFILE as a ratio between the number of ticks and the length of the procedure. The output is filled with blanks to ease readability. -comment "busy box' readprofile is selected!" - depends on BB_CONFIG_READPROFILE +comment "BusyBox' readprofile is selected!" + depends on BUSYBOX_READPROFILE config UTIL_LINUX_SETTERM bool diff --git a/rules/wget.in b/rules/wget.in index 037ab6fa9..05fd14475 100644 --- a/rules/wget.in +++ b/rules/wget.in @@ -2,7 +2,7 @@ config WGET tristate prompt "wget" - depends on !BB_CONFIG_WGET + depends on !BUSYBOX_WGET help GNU wget is a commandline mirroring tool. @@ -32,5 +32,5 @@ config WGET http://www.gnu.org/software/wget/ -comment "Busybox's wget is selected!" - depends on BB_CONFIG_WGET +comment "BusyBox's wget is selected!" + depends on BUSYBOX_WGET -- cgit v1.2.3