diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-06-12 11:13:58 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-06-12 11:13:58 +0200 |
commit | 045dae618763ae15d426057817373b1ebf37a3bc (patch) | |
tree | 165f186e9a4e82433847fbecf85767290b0ffa60 /packages/busybox/busybox-kconfigs | |
parent | b1f371df7b5f484fb41ff5ee6ef31dacb3ec124a (diff) | |
download | embtoolkit-045dae618763ae15d426057817373b1ebf37a3bc.tar.gz embtoolkit-045dae618763ae15d426057817373b1ebf37a3bc.tar.bz2 embtoolkit-045dae618763ae15d426057817373b1ebf37a3bc.tar.xz |
Packages: Busybox: Add busybox-1.18.4 and update kconfig symbols
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/busybox/busybox-kconfigs')
18 files changed, 585 insertions, 336 deletions
diff --git a/packages/busybox/busybox-kconfigs/busybox-archival.kconfig b/packages/busybox/busybox-kconfigs/busybox-archival.kconfig index a3d70c6..2297fca 100644 --- a/packages/busybox/busybox-kconfigs/busybox-archival.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-archival.kconfig @@ -11,7 +11,7 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_FEATURE_SEAMLESS_XZ bool "Make tar, rpm, modprobe etc understand .xz data" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Make tar, rpm, modprobe etc understand .xz data. @@ -73,7 +73,7 @@ config KEMBTK_BUSYB_FEATURE_AR_LONG_FILENAMES config KEMBTK_BUSYB_FEATURE_AR_CREATE bool "Support archive creation" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_AR help @@ -131,7 +131,7 @@ config KEMBTK_BUSYB_FEATURE_CPIO_P bool "Support for passthrough mode" default y depends on KEMBTK_BUSYB_FEATURE_CPIO_O - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Passthrough mode. Rarely used. @@ -189,13 +189,13 @@ config KEMBTK_BUSYB_FEATURE_GZIP_LONG_OPTIONS config KEMBTK_BUSYB_LZOP bool "lzop" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Lzop compression/decompresion. config KEMBTK_BUSYB_LZOP_COMPR_HIGH - bool "lzop complession levels 7,8,9 (not very useful)" + bool "lzop compression levels 7,8,9 (not very useful)" depends on KEMBTK_BUSYB_LZOP help High levels (7,8,9) of lzop compression. These levels @@ -206,7 +206,7 @@ config KEMBTK_BUSYB_RPM2CPIO bool "rpm2cpio" default y help - Converts an KEMBTK_BUSYB_RPM file into a KEMBTK_BUSYB_CPIO archive. + Converts a KEMBTK_BUSYB_RPM file into a KEMBTK_BUSYB_CPIO archive. config KEMBTK_BUSYB_RPM bool "rpm" @@ -282,9 +282,9 @@ config KEMBTK_BUSYB_FEATURE_TAR_LONG_OPTIONS config KEMBTK_BUSYB_FEATURE_TAR_TO_COMMAND bool "Support for writing to an external program" - depends on EMBTK_BB_VERSION_1_17_X - depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_FEATURE_TAR_LONG_OPTIONS + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y + depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_FEATURE_TAR_LONG_OPTIONS help If you enable this option you'll be able to instruct tar to send the contents of each extracted file to the standard input of an @@ -301,7 +301,7 @@ config KEMBTK_BUSYB_FEATURE_TAR_UNAME_GNAME config KEMBTK_BUSYB_FEATURE_TAR_NOPRESERVE_TIME bool "Enable -m (do not preserve time) option" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_TAR help @@ -311,7 +311,7 @@ config KEMBTK_BUSYB_FEATURE_TAR_NOPRESERVE_TIME config KEMBTK_BUSYB_FEATURE_TAR_SELINUX bool "Support for extracting SELinux labels" depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_SELINUX - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option busybox supports restoring SELinux labels when extracting files from tar archives. @@ -347,7 +347,7 @@ config KEMBTK_BUSYB_FEATURE_LZMA_FAST config KEMBTK_BUSYB_LZMA bool "Provide lzma alias which supports only unpacking" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_UNLZMA help @@ -356,14 +356,14 @@ config KEMBTK_BUSYB_LZMA config KEMBTK_BUSYB_UNXZ bool "unxz" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help unxz is a unlzma successor. config KEMBTK_BUSYB_XZ bool "Provide xz alias which supports only unpacking" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_UNXZ help diff --git a/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig b/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig index 449104f..500470a 100644 --- a/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig @@ -12,14 +12,16 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_CHVT bool "chvt" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) config KEMBTK_BUSYB_FGCONSOLE bool "fgconsole" - depends on EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help This program prints active (foreground) console number. @@ -32,12 +34,14 @@ config KEMBTK_BUSYB_CLEAR config KEMBTK_BUSYB_DEALLOCVT bool "deallocvt" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program deallocates unused virtual consoles. config KEMBTK_BUSYB_DUMPKMAP bool "dumpkmap" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. @@ -45,18 +49,21 @@ config KEMBTK_BUSYB_DUMPKMAP config KEMBTK_BUSYB_KBD_MODE bool "kbd_mode" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program reports and sets keyboard mode. config KEMBTK_BUSYB_LOADFONT bool "loadfont" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program loads a console font from standard input. config KEMBTK_BUSYB_LOADKMAP bool "loadkmap" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program loads a keyboard translation table from standard input. @@ -64,6 +71,7 @@ config KEMBTK_BUSYB_LOADKMAP config KEMBTK_BUSYB_OPENVT bool "openvt" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program is used to start a command on an unused virtual terminal. @@ -95,6 +103,7 @@ config KEMBTK_BUSYB_FEATURE_RESIZE_PRINT config KEMBTK_BUSYB_SETCONSOLE bool "setconsole" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program redirects the system console to another device, like the current tty while logged in via telnet. @@ -109,6 +118,7 @@ config KEMBTK_BUSYB_FEATURE_SETCONSOLE_LONG_OPTIONS config KEMBTK_BUSYB_SETFONT bool "setfont" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Allows to load console screen map. Useful for i18n. @@ -130,6 +140,7 @@ config KEMBTK_BUSYB_DEFAULT_SETFONT_DIR config KEMBTK_BUSYB_SETKEYCODES bool "setkeycodes" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. @@ -137,32 +148,34 @@ config KEMBTK_BUSYB_SETKEYCODES config KEMBTK_BUSYB_SETLOGCONS bool "setlogcons" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This program redirects the output console of kernel messages. config KEMBTK_BUSYB_SHOWKEY bool "showkey" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Shows keys pressed. comment "Common options for loadfont and setfont" depends on KEMBTK_BUSYB_LOADFONT || KEMBTK_BUSYB_SETFONT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X config KEMBTK_BUSYB_FEATURE_LOADFONT_PSF2 bool "Support for KEMBTK_BUSYB_PSF2 console fonts" - depends on EMBTK_BB_VERSION_1_17_X default y depends on KEMBTK_BUSYB_LOADFONT || KEMBTK_BUSYB_SETFONT + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support KEMBTK_BUSYB_PSF2 console fonts. config KEMBTK_BUSYB_FEATURE_LOADFONT_RAW bool "Support for old (raw) console fonts" - depends on EMBTK_BB_VERSION_1_17_X default y depends on KEMBTK_BUSYB_LOADFONT || KEMBTK_BUSYB_SETFONT + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support old (raw) console fonts. diff --git a/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig index c2e091e..e939b7c 100644 --- a/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig @@ -35,10 +35,11 @@ config KEMBTK_BUSYB_FEATURE_DATE_ISOFMT Enable option (-I) to output an ISO-8601 compliant date/time string. +# defaults to "no": stat's nanosecond field is a bit non-portable config KEMBTK_BUSYB_FEATURE_DATE_NANO bool "Support %[num]N nanosecond format specifier" - depends on KEMBTK_BUSYB_DATE - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + depends on KEMBTK_BUSYB_DATE && KEMBTK_BUSYB_PLATFORM_LINUX # syscall(__NR_clock_gettime) help Support %[num]N format specifier. Adds ~250 bytes of code. @@ -46,7 +47,7 @@ config KEMBTK_BUSYB_FEATURE_DATE_COMPAT bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format" default y depends on KEMBTK_BUSYB_DATE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help System time can be set by 'date -s KEMBTK_BUSYB_DATE' and simply 'date KEMBTK_BUSYB_DATE', but formats of KEMBTK_BUSYB_DATE string are different. 'date KEMBTK_BUSYB_DATE' accepts @@ -97,6 +98,12 @@ config KEMBTK_BUSYB_FEATURE_TR_EQUIV replace all instances of 'a' with 'xyz'. This option is mainly useful for cases when no other way of expressing a character is possible. +config KEMBTK_BUSYB_BASE64 + bool "base64" + depends on EMBTK_BB_VERSION_1_18_X + default y + help + Base64 encode and decode config KEMBTK_BUSYB_CAL bool "cal" @@ -132,9 +139,9 @@ config KEMBTK_BUSYB_CHOWN config KEMBTK_BUSYB_FEATURE_CHOWN_LONG_OPTIONS bool "Enable long options" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y depends on KEMBTK_BUSYB_CHOWN && KEMBTK_BUSYB_LONG_OPTS + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable use of long options @@ -166,9 +173,9 @@ config KEMBTK_BUSYB_CP config KEMBTK_BUSYB_FEATURE_CP_LONG_OPTIONS bool "Enable long options for cp" + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_CP && KEMBTK_BUSYB_LONG_OPTS - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Enable long options for cp. Also add support for --parents option. @@ -206,7 +213,7 @@ config KEMBTK_BUSYB_FEATURE_DD_THIRD_STATUS_LINE bool "Enable the third status line upon signal" default y depends on KEMBTK_BUSYB_DD && KEMBTK_BUSYB_FEATURE_DD_SIGNAL_HANDLING - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Displays a coreutils-like third status line with transferred bytes, elapsed time and speed. @@ -345,7 +352,7 @@ config KEMBTK_BUSYB_FOLD config KEMBTK_BUSYB_FSYNC bool "fsync" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help fsync is used to flush file-related cached blocks to disk. @@ -612,14 +619,14 @@ config KEMBTK_BUSYB_SHA1SUM config KEMBTK_BUSYB_SHA256SUM bool "sha256sum" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Compute and check SHA256 message digest config KEMBTK_BUSYB_SHA512SUM bool "sha512sum" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Compute and check SHA512 message digest @@ -688,6 +695,7 @@ config KEMBTK_BUSYB_FEATURE_SPLIT_FANCY config KEMBTK_BUSYB_STAT bool "stat" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX # statfs() help display file or filesystem status. diff --git a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig index 268e307..43e8256 100644 --- a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig @@ -35,6 +35,7 @@ config KEMBTK_BUSYB_FSCK config KEMBTK_BUSYB_LSATTR bool "lsattr" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help lsattr lists the file attributes on a second extended file system. diff --git a/packages/busybox/busybox-kconfigs/busybox-editors.kconfig b/packages/busybox/busybox-kconfigs/busybox-editors.kconfig index 9e2bf49..96bc52f 100644 --- a/packages/busybox/busybox-kconfigs/busybox-editors.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-editors.kconfig @@ -7,7 +7,11 @@ comment "-------------------------------------------------" comment "Editors" comment "-------------------------------------------------" - +config KEMBTK_BUSYB_PATCH + bool "patch" + default y + help + Apply a unified diff formatted patch. config KEMBTK_BUSYB_AWK bool "awk" @@ -45,14 +49,14 @@ config KEMBTK_BUSYB_FEATURE_DIFF_BINARY depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X default y help - This option enables support for checking for binary files - before a comparison is carried out. + This option enables support for checking for binary files + before a comparison is carried out. config KEMBTK_BUSYB_FEATURE_DIFF_LONG_OPTIONS bool "Enable long options" - depends on KEMBTK_BUSYB_DIFF && KEMBTK_BUSYB_LONG_OPTS - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_DIFF && KEMBTK_BUSYB_LONG_OPTS + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable use of long options. @@ -80,12 +84,6 @@ config KEMBTK_BUSYB_ED Small, simple, evil. Part of KEMBTK_BUSYB_SUSv3. If you're not already using this, you don't need it. -config KEMBTK_BUSYB_PATCH - bool "patch" - default y - help - Apply a unified diff formatted patch. - config KEMBTK_BUSYB_SED bool "sed" default y @@ -191,9 +189,9 @@ config KEMBTK_BUSYB_FEATURE_VI_WIN_RESIZE config KEMBTK_BUSYB_FEATURE_VI_ASK_TERMINAL bool "Use 'tell me cursor position' ESC sequence to measure window" - depends on KEMBTK_BUSYB_VI - depends on EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_VI + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help If terminal size can't be retrieved and $LINES/$COLUMNS are not set, this option makes vi perform a last-ditch effort to find it: diff --git a/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig index ddaa865..ceb9329 100644 --- a/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig @@ -174,9 +174,9 @@ config KEMBTK_BUSYB_FEATURE_FIND_CONTEXT config KEMBTK_BUSYB_FEATURE_FIND_LINKS bool "Enable -links: link count matching" - depends on KEMBTK_BUSYB_FIND - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_FIND + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support the 'find -links' option for matching number of links. config KEMBTK_BUSYB_GREP diff --git a/packages/busybox/busybox-kconfigs/busybox-init.kconfig b/packages/busybox/busybox-kconfigs/busybox-init.kconfig index bbcce9f..93757ba 100644 --- a/packages/busybox/busybox-kconfigs/busybox-init.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-init.kconfig @@ -9,7 +9,7 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_BOOTCHARTD bool "bootchartd" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help bootchartd is commonly used to profile the boot process @@ -46,7 +46,32 @@ config KEMBTK_BUSYB_FEATURE_BOOTCHARTD_CONFIG_FILE help Enable reading and parsing of $PWD/bootchartd.conf and /etc/bootchartd.conf files. +config KEMBTK_BUSYB_HALT + bool "poweroff, halt, and reboot" + default y + help + Stop all processes and either halt, reboot, or power off the system. + +config KEMBTK_BUSYB_FEATURE_CALL_TELINIT + bool "Call telinit on shutdown and reboot" + default y + depends on KEMBTK_BUSYB_HALT && !KEMBTK_BUSYB_INIT + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + help + Call an external program (normally telinit) to facilitate + a switch to a proper runlevel. + This option is only available if you selected halt and friends, + but did not select init. + +config KEMBTK_BUSYB_TELINIT_PATH + string "Path to telinit executable" + default "/sbin/telinit" + depends on KEMBTK_BUSYB_FEATURE_CALL_TELINIT + help + When busybox halt and friends have to call external telinit + to facilitate proper shutdown, this path is to be used when + locating telinit executable. config KEMBTK_BUSYB_INIT bool "init" default y @@ -128,33 +153,18 @@ config KEMBTK_BUSYB_FEATURE_INITRD This does not apply to initramfs, which runs /init as PID 1 and requires no special support. -config KEMBTK_BUSYB_HALT - bool "poweroff, halt, and reboot" - default y - help - Stop all processes and either halt, reboot, or power off the system. - -config KEMBTK_BUSYB_FEATURE_CALL_TELINIT - bool "Call telinit on shutdown and reboot" - default y - depends on KEMBTK_BUSYB_HALT && !KEMBTK_BUSYB_INIT - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X - help - Call an external program (normally telinit) to facilitate - a switch to a proper runlevel. - - This option is only available if you selected halt and friends, - but did not select init. - -config KEMBTK_BUSYB_TELINIT_PATH - string "Path to telinit executable" - default "/sbin/telinit" - depends on KEMBTK_BUSYB_FEATURE_CALL_TELINIT +config KEMBTK_BUSYB_INIT_TERMINAL_TYPE + string "Initial terminal type" + default "linux" + depends on KEMBTK_BUSYB_INIT + depends on EMBTK_BB_VERSION_1_18_X help - When busybox halt and friends have to call external telinit - to facilitate proper shutdown, this path is to be used when - locating telinit executable. + This is the initial value set by init for the TERM environment + variable. This variable is used by programs which make use of + extended terminal capabilities. + Note that on Linux, init attempts to detect serial terminal and + sets TERM to "vt102" if one is found. config KEMBTK_BUSYB_MESG bool "mesg" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig b/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig index 870bcf4..340230c 100644 --- a/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig @@ -44,6 +44,17 @@ config KEMBTK_BUSYB_FEATURE_ETC_NETWORKS a rarely used feature which allows you to use names instead of KEMBTK_BUSYB_IP/mask pairs in route command. +config KEMBTK_BUSYB_FEATURE_USE_TERMIOS + bool "Use termios to manipulate the screen" + default y + depends on KEMBTK_BUSYB_MORE || KEMBTK_BUSYB_TOP || KEMBTK_BUSYB_POWERTOP + help + This option allows utilities such as 'more' and 'top' to determine + 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 KEMBTK_BUSYB_FEATURE_EDITING bool "Command line editing" default y @@ -78,9 +89,9 @@ config KEMBTK_BUSYB_FEATURE_EDITING_HISTORY config KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY bool "History saving" default y - depends on KEMBTK_BUSYB_ASH && KEMBTK_BUSYB_FEATURE_EDITING + depends on KEMBTK_BUSYB_FEATURE_EDITING help - Enable history saving in ash shell. + Enable history saving in shells. config KEMBTK_BUSYB_FEATURE_TAB_COMPLETION bool "Tab completion" @@ -106,7 +117,7 @@ config KEMBTK_BUSYB_FEATURE_EDITING_FANCY_PROMPT config KEMBTK_BUSYB_FEATURE_EDITING_ASK_TERMINAL bool "Query cursor position from terminal" depends on KEMBTK_BUSYB_FEATURE_EDITING - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Allow usage of "ESC [ 6 n" sequence. Terminal answers back with current cursor position. This information is used to make line @@ -117,7 +128,7 @@ config KEMBTK_BUSYB_FEATURE_EDITING_ASK_TERMINAL config KEMBTK_BUSYB_FEATURE_NON_POSIX_CP bool "Non-POSIX, but safer, copying to special nodes" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help With this option, "cp file symlink" will delete symlink @@ -151,6 +162,7 @@ config KEMBTK_BUSYB_FEATURE_COPYBUF_KB config KEMBTK_BUSYB_MONOTONIC_SYSCALL bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring time intervals (time, ping, traceroute etc need this). diff --git a/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig index d0afc38..018dcd2 100644 --- a/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig @@ -7,7 +7,19 @@ comment "-------------------------------------------------" comment "Login/Password Management Utilities" comment "-------------------------------------------------" - +config KEMBTK_BUSYB_ADD_SHELL + bool "add-shell" + depends on EMBTK_BB_VERSION_1_18_X + default y if KEMBTK_BUSYB_DESKTOP + help + Add shells to /etc/shells. + +config KEMBTK_BUSYB_REMOVE_SHELL + bool "remove-shell" + depends on EMBTK_BB_VERSION_1_18_X + default y if KEMBTK_BUSYB_DESKTOP + help + Remove shells from /etc/shells. config KEMBTK_BUSYB_FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" @@ -87,7 +99,7 @@ config KEMBTK_BUSYB_USE_BB_CRYPT_SHA bool "Enable SHA256/512 crypt functions" default y depends on KEMBTK_BUSYB_USE_BB_CRYPT - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable this if you have passwords starting with "$5$" or "$6$" in your /etc/passwd or /etc/shadow files. These passwords @@ -96,42 +108,18 @@ config KEMBTK_BUSYB_USE_BB_CRYPT_SHA With this option off, login will fail password check for any user which has password encrypted with these algorithms. -config KEMBTK_BUSYB_ADDGROUP - bool "addgroup" +config KEMBTK_BUSYB_ADDUSER + bool "adduser" default y help - Utility for creating a new group account. + Utility for creating a new user account. -config KEMBTK_BUSYB_FEATURE_ADDGROUP_LONG_OPTIONS +config KEMBTK_BUSYB_FEATURE_ADDUSER_LONG_OPTIONS bool "Enable long options" default y - depends on KEMBTK_BUSYB_ADDGROUP && KEMBTK_BUSYB_LONG_OPTS - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X - help - Support long options for the addgroup applet. - -config KEMBTK_BUSYB_FEATURE_ADDUSER_TO_GROUP - bool "Support for adding users to groups" - default y - depends on KEMBTK_BUSYB_ADDGROUP - help - If called with two non-option arguments, - addgroup will add an existing user to an - existing group. - -config KEMBTK_BUSYB_DELGROUP - bool "delgroup" - default y - help - Utility for deleting a group account. - -config KEMBTK_BUSYB_FEATURE_DEL_USER_FROM_GROUP - bool "Support for removing users from groups" - default y - depends on KEMBTK_BUSYB_DELGROUP + depends on KEMBTK_BUSYB_ADDUSER && KEMBTK_BUSYB_LONG_OPTS help - If called with two non-option arguments, deluser - or delgroup will remove an user from a specified group. + Support long options for the adduser applet. config KEMBTK_BUSYB_FEATURE_CHECK_NAMES bool "Enable sanity check on user/group names in adduser and addgroup" @@ -144,23 +132,10 @@ config KEMBTK_BUSYB_FEATURE_CHECK_NAMES For compatibility with Samba machine accounts "$" is also supported at the end of the user or group name. -config KEMBTK_BUSYB_ADDUSER - bool "adduser" - default y - help - Utility for creating a new user account. - -config KEMBTK_BUSYB_FEATURE_ADDUSER_LONG_OPTIONS - bool "Enable long options" - default y - depends on KEMBTK_BUSYB_ADDUSER && KEMBTK_BUSYB_LONG_OPTS - help - Support long options for the adduser applet. - config KEMBTK_BUSYB_FIRST_SYSTEM_ID int "First valid system uid or gid for adduser and addgroup" depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X range 0 64900 default 100 help @@ -169,18 +144,55 @@ config KEMBTK_BUSYB_FIRST_SYSTEM_ID config KEMBTK_BUSYB_LAST_SYSTEM_ID int "Last valid system uid or gid for adduser and addgroup" depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X range 0 64900 default 999 help Last valid system uid or gid for adduser and addgroup +config KEMBTK_BUSYB_ADDGROUP + bool "addgroup" + default y + help + Utility for creating a new group account. + +config KEMBTK_BUSYB_FEATURE_ADDGROUP_LONG_OPTIONS + bool "Enable long options" + default y + depends on KEMBTK_BUSYB_ADDGROUP && KEMBTK_BUSYB_LONG_OPTS + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + help + Support long options for the addgroup applet. + +config KEMBTK_BUSYB_FEATURE_ADDUSER_TO_GROUP + bool "Support for adding users to groups" + default y + depends on KEMBTK_BUSYB_ADDGROUP + help + If called with two non-option arguments, + addgroup will add an existing user to an + existing group. + config KEMBTK_BUSYB_DELUSER bool "deluser" default y help Utility for deleting a user account. +config KEMBTK_BUSYB_DELGROUP + bool "delgroup" + default y + help + Utility for deleting a group account. + +config KEMBTK_BUSYB_FEATURE_DEL_USER_FROM_GROUP + bool "Support for removing users from groups" + default y + depends on KEMBTK_BUSYB_DELGROUP + help + If called with two non-option arguments, deluser + or delgroup will remove an user from a specified group. + config KEMBTK_BUSYB_GETTY bool "getty" default y @@ -191,7 +203,6 @@ config KEMBTK_BUSYB_GETTY config KEMBTK_BUSYB_LOGIN bool "login" default y - select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help login is used when signing onto a system. @@ -233,7 +244,6 @@ config KEMBTK_BUSYB_FEATURE_SECURETTY config KEMBTK_BUSYB_PASSWD bool "passwd" default y - select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help passwd changes passwords for user and group accounts. A normal user @@ -269,7 +279,6 @@ config KEMBTK_BUSYB_CHPASSWD config KEMBTK_BUSYB_SU bool "su" default y - select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help su is used to become another user during a login session. @@ -299,7 +308,6 @@ config KEMBTK_BUSYB_SULOGIN config KEMBTK_BUSYB_VLOCK bool "vlock" default y - select KEMBTK_BUSYB_FEATURE_SUID help Build the "vlock" applet which allows you to lock (virtual) terminals. diff --git a/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig index 506ea45..6e41683 100644 --- a/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig @@ -9,27 +9,44 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_CONSPY bool "conspy" - depends on EMBTK_BB_VERSION_1_17_X + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help A text-mode VNC like program for Linux virtual terminals. example: conspy NUM shared access to console num or conspy -nd NUM screenshot of console num or conspy -cs NUM poor man's GNU screen like +config KEMBTK_BUSYB_NANDWRITE + bool + depends on KEMBTK_BUSYB_PLATFORM_LINUX + default n + help + Write to the specified KEMBTK_BUSYB_MTD device, with bad blocks awareness + +config KEMBTK_BUSYB_NANDDUMP + bool + depends on KEMBTK_BUSYB_PLATFORM_LINUX + default n + help + Dump the content of raw NAND chip config KEMBTK_BUSYB_UBIATTACH - bool "ubiattach" - depends on EMBTK_BB_VERSION_1_17_X + bool + depends on KEMBTK_BUSYB_PLATFORM_LINUX + default n help Attach KEMBTK_BUSYB_MTD device to an UBI device. config KEMBTK_BUSYB_UBIDETACH - bool "ubidetach" - depends on EMBTK_BB_VERSION_1_17_X + bool + depends on KEMBTK_BUSYB_PLATFORM_LINUX + default n help Detach KEMBTK_BUSYB_MTD device from an UBI device. config KEMBTK_BUSYB_ADJTIMEX bool "adjtimex" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. @@ -40,10 +57,26 @@ config KEMBTK_BUSYB_BBCONFIG The bbconfig applet will print the config file with which busybox was built. +config KEMBTK_BUSYB_FEATURE_COMPRESS_BBCONFIG + bool "Compress bbconfig data" + default y + depends on KEMBTK_BUSYB_BBCONFIG + depends on EMBTK_BB_VERSION_1_18_X + help + Store bbconfig data in compressed form, uncompress them on-the-fly + before output. + + 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, + you probably want this. + config KEMBTK_BUSYB_BEEP bool "beep" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help The beep applets beeps in a given freq/Hz. @@ -139,7 +172,6 @@ config KEMBTK_BUSYB_CHRT config KEMBTK_BUSYB_CROND bool "crond" default y - select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help Crond is a background daemon that parses individual crontab @@ -168,14 +200,13 @@ config KEMBTK_BUSYB_FEATURE_CROND_DIR string "crond spool directory" default "/var/spool/cron" depends on KEMBTK_BUSYB_CROND || KEMBTK_BUSYB_CRONTAB - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Location of crond spool. config KEMBTK_BUSYB_CRONTAB bool "crontab" default y - select KEMBTK_BUSYB_FEATURE_SUID help Crontab manipulates the crontab for a particular user. Only the superuser may specify a different user and/or crontab directory. @@ -199,6 +230,7 @@ config KEMBTK_BUSYB_FEATURE_DC_LIBM config KEMBTK_BUSYB_DEVFSD bool "devfsd (obsolete)" + depends on KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_FEATURE_SYSLOG help This is deprecated and should NOT be used anymore. @@ -241,6 +273,7 @@ config KEMBTK_BUSYB_DEVFSD_VERBOSE config KEMBTK_BUSYB_FEATURE_DEVFS bool "Use devfs names for all devices (obsolete)" + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This is obsolete and should NOT be used anymore. Use linux >= 2.6 (optionally with hotplug) and mdev instead! @@ -260,6 +293,7 @@ config KEMBTK_BUSYB_DEVMEM config KEMBTK_BUSYB_EJECT bool "eject" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Used to eject cdroms. (defaults to /dev/cdrom) @@ -274,6 +308,7 @@ config KEMBTK_BUSYB_FEATURE_EJECT_SCSI config KEMBTK_BUSYB_FBSPLASH bool "fbsplash" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Shows splash image and progress bar on framebuffer device. Can be used during boot phase of an embedded device. ~2kb. @@ -293,36 +328,38 @@ config KEMBTK_BUSYB_FBSPLASH "exit" - well you guessed it config KEMBTK_BUSYB_FLASHCP - bool "flashcp" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + bool + default n help The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7. This utility is used to copy images into a KEMBTK_BUSYB_MTD device. config KEMBTK_BUSYB_FLASH_LOCK - bool "flash_lock" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + bool + default n help The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This utility locks part or all of the flash device. config KEMBTK_BUSYB_FLASH_UNLOCK - bool "flash_unlock" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + bool + default n help The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This utility unlocks part or all of the flash device. config KEMBTK_BUSYB_FLASH_ERASEALL - bool "flash_eraseall" + bool + default n help The flash_eraseall binary from mtd-utils as of git head c4c6a59eb. This utility is used to erase the whole KEMBTK_BUSYB_MTD device. config KEMBTK_BUSYB_IONICE bool "ionice" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Set/set program io scheduling class and priority Requires kernel >= 2.6.13 @@ -421,11 +458,12 @@ config KEMBTK_BUSYB_FEATURE_LESS_LINENUMS default y depends on KEMBTK_BUSYB_FEATURE_LESS_DASHCMD help - Enable "-N" command. + Enables "-N" command. config KEMBTK_BUSYB_HDPARM bool "hdparm" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Get/Set hard drive parameters. Primarily intended for ATA drives. Adds about 13k (or around 30k if you enable the @@ -487,15 +525,15 @@ config KEMBTK_BUSYB_MAKEDEVS help 'makedevs' is a utility used to create a batch of devices with one command. - . + There are two choices for command line behaviour, the interface as used by LEAF/Linux Router Project, or a device table file. - . + 'leaf' is traditionally what busybox follows, it allows multiple devices of a particluar type to be created per command. e.g. /dev/hda[0-9] Device properties are passed as command line arguments. - . + 'table' reads device properties from a file or stdin, allowing a batch of unrelated devices to be made with one command. User/group names are allowed as an alternative to uid/gid. @@ -541,6 +579,7 @@ config KEMBTK_BUSYB_MT config KEMBTK_BUSYB_RAIDAUTORUN bool "raidautorun" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help raidautorun tells the kernel md driver to search and start RAID arrays. @@ -548,7 +587,7 @@ config KEMBTK_BUSYB_RAIDAUTORUN config KEMBTK_BUSYB_READAHEAD bool "readahead" default y - depends on KEMBTK_BUSYB_LFS + depends on KEMBTK_BUSYB_LFS && KEMBTK_BUSYB_PLATFORM_LINUX 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. @@ -564,7 +603,8 @@ config KEMBTK_BUSYB_READAHEAD config KEMBTK_BUSYB_RFKILL bool "rfkill" - depends on EMBTK_BB_VERSION_1_17_X + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable/disable wireless devices. @@ -585,6 +625,7 @@ config KEMBTK_BUSYB_RUNLEVEL config KEMBTK_BUSYB_RX bool "rx" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Receive files using the Xmodem protocol. @@ -626,7 +667,7 @@ config KEMBTK_BUSYB_TIME config KEMBTK_BUSYB_TIMEOUT bool "timeout" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Runs a program and watches it. If it does not terminate in @@ -643,14 +684,14 @@ config KEMBTK_BUSYB_TTYSIZE config KEMBTK_BUSYB_VOLNAME bool "volname" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Prints a CD-ROM volume name. config KEMBTK_BUSYB_WALL bool "wall" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Write a message to all users that are logged in. @@ -658,6 +699,7 @@ config KEMBTK_BUSYB_WALL config KEMBTK_BUSYB_WATCHDOG bool "watchdog" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help The watchdog utility is used with hardware or software watchdog device drivers. It opens the specified watchdog device special file diff --git a/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig index f5b03d1..f4bdb46 100644 --- a/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig @@ -6,10 +6,11 @@ comment "-------------------------------------------------" comment "Linux Module Utilities" comment "-------------------------------------------------" +depends on KEMBTK_BUSYB_PLATFORM_LINUX config KEMBTK_BUSYB_MODINFO bool "modinfo" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Show information about a Linux Kernel module @@ -125,7 +126,7 @@ config KEMBTK_BUSYB_FEATURE_2_4_MODULES config KEMBTK_BUSYB_FEATURE_INSMOD_TRY_MMAP bool "Try to load module from a mmap'ed area" depends on KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_MODPROBE_SMALL - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help This option causes module loading code to try to mmap module first. If it does not work (for example, @@ -186,6 +187,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP_FULL config KEMBTK_BUSYB_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y + depends on (KEMBTK_BUSYB_LSMOD || KEMBTK_BUSYB_FEATURE_2_4_MODULES) && !KEMBTK_BUSYB_MODPROBE_SMALL help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your @@ -222,6 +224,7 @@ config KEMBTK_BUSYB_FEATURE_MODUTILS_SYMBOLS config KEMBTK_BUSYB_DEFAULT_MODULES_DIR string "Default directory containing modules" default "/lib/modules" + depends on KEMBTK_BUSYB_DEPMOD || KEMBTK_BUSYB_MODPROBE || KEMBTK_BUSYB_MODPROBE_SMALL || KEMBTK_BUSYB_MODINFO help Directory that contains kernel modules. Defaults to "/lib/modules" @@ -229,6 +232,7 @@ config KEMBTK_BUSYB_DEFAULT_MODULES_DIR config KEMBTK_BUSYB_DEFAULT_DEPMOD_FILE string "Default name of modules.dep" default "modules.dep" + depends on KEMBTK_BUSYB_DEPMOD || KEMBTK_BUSYB_MODPROBE || KEMBTK_BUSYB_MODPROBE_SMALL || KEMBTK_BUSYB_MODINFO help Filename that contains kernel modules dependencies. Defaults to "modules.dep" diff --git a/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig b/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig index a6f2079..099c4fa 100644 --- a/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig @@ -29,8 +29,9 @@ config KEMBTK_BUSYB_APP_UDHCPC config KEMBTK_BUSYB_UDHCPD bool "udhcp server (udhcpd)" - select KEMBTK_BUSYB_APP_UDHCPD default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_APP_UDHCPD help udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -75,8 +76,9 @@ config KEMBTK_BUSYB_DHCPD_LEASES_FILE config KEMBTK_BUSYB_UDHCPC bool "udhcp client (udhcpc)" - select KEMBTK_BUSYB_APP_UDHCPC default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_APP_UDHCPC help udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -84,6 +86,14 @@ config KEMBTK_BUSYB_UDHCPC The udhcp client negotiates a lease with the DHCP server and runs a script when a lease is obtained or lost. +config KEMBTK_BUSYB_UDHCP_DEBUG_1_13_X_1_14_X + bool "Compile udhcp with noisy debugging messages" + default n + depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC || KEMBTK_BUSYB_DHCPRELAY + depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X + help + If selected, udhcpd will output extra debugging output. + config KEMBTK_BUSYB_FEATURE_UDHCPC_ARPING bool "Verify that the offered address is free, using KEMBTK_BUSYB_ARP ping" default y @@ -102,23 +112,15 @@ config KEMBTK_BUSYB_FEATURE_UDHCP_PORT At the cost of ~300 bytes, enables -P port option. This feature is typically not needed. -config KEMBTK_BUSYB_UDHCP_DEBUG_1_13_X_1_14_X - bool "Compile udhcp with noisy debugging messages" - default n - depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC || KEMBTK_BUSYB_DHCPRELAY - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X - help - If selected, udhcpd will output extra debugging output. - config KEMBTK_BUSYB_UDHCP_DEBUG int "Maximum verbosity level for udhcp applets (0..9)" default 9 range 0 9 depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC || KEMBTK_BUSYB_DHCPRELAY - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Verbosity can be increased with multiple -v options. - This options controls how high it can be cranked up. + This option controls how high it can be cranked up. Bigger values result in bigger code. Levels above 1 are very verbose and useful for debugging only. diff --git a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig index f6a2a1b..7319af4 100644 --- a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig @@ -7,6 +7,11 @@ comment "-------------------------------------------------" comment "Networking Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_NBDCLIENT + bool "nbd-client" + default y + help + Network block device client config KEMBTK_BUSYB_NC bool "nc" default y @@ -48,7 +53,7 @@ config KEMBTK_BUSYB_FEATURE_IPV6 config KEMBTK_BUSYB_FEATURE_UNIX_LOCAL bool "Enable Unix domain socket support (usually not needed)" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable Unix domain socket support in all busybox networking applets. Address of the form local:/path/to/unix/socket @@ -82,18 +87,21 @@ config KEMBTK_BUSYB_VERBOSE_RESOLUTION_ERRORS config KEMBTK_BUSYB_ARP bool "arp" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Manipulate the system KEMBTK_BUSYB_ARP cache. config KEMBTK_BUSYB_ARPING bool "arping" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Ping hosts by KEMBTK_BUSYB_ARP packets. config KEMBTK_BUSYB_BRCTL bool "brctl" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Manage ethernet bridges. Supports addbr/delbr and addif/delif. @@ -126,6 +134,7 @@ config KEMBTK_BUSYB_DNSD config KEMBTK_BUSYB_ETHER_WAKE bool "ether-wake" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Send a magic packet to wake up sleeping machines. @@ -139,7 +148,7 @@ config KEMBTK_BUSYB_FAKEIDENTD config KEMBTK_BUSYB_FTPD bool "ftpd" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help simple FTP daemon. You have to run it via inetd. @@ -155,7 +164,7 @@ config KEMBTK_BUSYB_FEATURE_FTPD_ACCEPT_BROKEN_LIST bool "Enable workaround for RFC-violating clients" default y depends on KEMBTK_BUSYB_FTPD - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Some ftp clients (among them KDE's Konqueror) issue illegal "LIST -l" requests. This option works around such problems. @@ -314,9 +323,19 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_PROXY Then a request to /url/myfile will be forwarded to http://hostname[:port]/new/path/myfile. +config KEMBTK_BUSYB_FEATURE_HTTPD_GZIP + bool "Support for KEMBTK_BUSYB_GZIP content encoding" + default y + depends on KEMBTK_BUSYB_HTTPD + depends on EMBTK_BB_VERSION_1_18_X + help + Makes httpd send files using KEMBTK_BUSYB_GZIP content encoding if the + client supports it and a pre-compressed <file>.gz exists. + config KEMBTK_BUSYB_IFCONFIG bool "ifconfig" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Ifconfig is used to configure the kernel-resident network interfaces. @@ -364,14 +383,16 @@ config KEMBTK_BUSYB_FEATURE_IFCONFIG_BROADCAST_PLUS config KEMBTK_BUSYB_IFENSLAVE bool "ifenslave" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Userspace application to bind several interfaces to a logical interface (use with kernel bonding driver). config KEMBTK_BUSYB_IFPLUGD bool "ifplugd" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Network interface plug detection daemon. @@ -413,7 +434,7 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP_BUILTIN bool "Use busybox ip applet" default y - depends on KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP + depends on KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP && KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_IP select KEMBTK_BUSYB_FEATURE_IP_ADDRESS select KEMBTK_BUSYB_FEATURE_IP_LINK @@ -530,6 +551,7 @@ config KEMBTK_BUSYB_FEATURE_INETD_RPC config KEMBTK_BUSYB_IP bool "ip" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help The "ip" applet is a TCP/IP interface configuration and routing utility. You generally don't need "ip" to use busybox with @@ -644,6 +666,7 @@ config KEMBTK_BUSYB_FEATURE_IPCALC_LONG_OPTIONS config KEMBTK_BUSYB_NAMEIF bool "nameif" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_FEATURE_SYSLOG help nameif is used to rename network interface by its MAC address. @@ -672,6 +695,7 @@ config KEMBTK_BUSYB_FEATURE_NAMEIF_EXTENDED config KEMBTK_BUSYB_NETSTAT bool "netstat" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help netstat prints information about the Linux networking subsystem. @@ -699,8 +723,9 @@ config KEMBTK_BUSYB_NSLOOKUP config KEMBTK_BUSYB_NTPD bool "ntpd" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help The NTP client/server daemon. @@ -715,6 +740,7 @@ config KEMBTK_BUSYB_FEATURE_NTPD_SERVER config KEMBTK_BUSYB_PING bool "ping" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help ping uses the ICMP protocol's mandatory KEMBTK_BUSYB_ECHO_REQUEST datagram to elicit an ICMP KEMBTK_BUSYB_ECHO_RESPONSE from a host or gateway. @@ -743,12 +769,14 @@ config KEMBTK_BUSYB_PSCAN config KEMBTK_BUSYB_ROUTE bool "route" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Route displays or manipulates the kernel's KEMBTK_BUSYB_IP routing tables. config KEMBTK_BUSYB_SLATTACH bool "slattach" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help slattach is a small utility to attach network interfaces to serial lines. @@ -829,7 +857,7 @@ config KEMBTK_BUSYB_TELNETD mount -t devpts devpts /dev/pts - You need to be sure that Busybox has KEMBTK_BUSYB_LOGIN and + You need to be sure that busybox has KEMBTK_BUSYB_LOGIN and KEMBTK_BUSYB_FEATURE_SUID enabled. And finally, you should make certain that Busybox has been installed setuid root: @@ -850,7 +878,7 @@ config KEMBTK_BUSYB_FEATURE_TELNETD_INETD_WAIT bool "Support -w SEC option (inetd wait mode)" default y depends on KEMBTK_BUSYB_FEATURE_TELNETD_STANDALONE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help This option allows you to run telnetd in "inet wait" mode. Example inetd.conf line (note "wait", not usual "nowait"): @@ -920,9 +948,9 @@ config KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE config KEMBTK_BUSYB_FEATURE_TFTP_PROGRESS_BAR bool "Enable tftp progress meter" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y depends on KEMBTK_BUSYB_TFTP && KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Show progress bar. @@ -936,6 +964,7 @@ config KEMBTK_BUSYB_TFTP_DEBUG config KEMBTK_BUSYB_TRACEROUTE bool "traceroute" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Utility to trace the route of KEMBTK_BUSYB_IP packets. @@ -943,7 +972,7 @@ config KEMBTK_BUSYB_TRACEROUTE6 bool "traceroute6" default y depends on KEMBTK_BUSYB_FEATURE_IPV6 && KEMBTK_BUSYB_TRACEROUTE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Utility to trace the route of KEMBTK_BUSYB_IPv6 packets. @@ -970,8 +999,9 @@ config KEMBTK_BUSYB_FEATURE_TRACEROUTE_USE_ICMP config KEMBTK_BUSYB_TUNCTL bool "tunctl" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help tunctl creates or deletes tun devices. @@ -989,7 +1019,7 @@ config KEMBTK_BUSYB_IFUPDOWN_UDHCPC_CMD_OPTIONS string "ifup udhcpc command line options" default "-R -n" depends on KEMBTK_BUSYB_IFUPDOWN && KEMBTK_BUSYB_UDHCPC - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Command line options to pass to udhcpc from ifup. Intended to alter options not available in /etc/network/interfaces. @@ -1005,6 +1035,7 @@ config KEMBTK_BUSYB_UDPSVD config KEMBTK_BUSYB_VCONFIG bool "vconfig" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Creates, removes, and configures VLAN interfaces @@ -1036,9 +1067,23 @@ config KEMBTK_BUSYB_FEATURE_WGET_LONG_OPTIONS help Support long options for the wget applet. +config KEMBTK_BUSYB_FEATURE_WGET_TIMEOUT + bool "Enable read timeout option -T SEC" + default y + depends on KEMBTK_BUSYB_WGET + depends on EMBTK_BB_VERSION_1_18_X + help + Supports network read timeout for wget, so that wget will give + up and timeout when reading network data, through the -T command + line option. Currently only network data read timeout is + supported (i.e., timeout is not applied to the DNS nor TCP + connection initialization). When KEMBTK_BUSYB_FEATURE_WGET_LONG_OPTIONS is + also enabled, the --timeout option will work in addition to -T. + config KEMBTK_BUSYB_ZCIP bool "zcip" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_FEATURE_SYSLOG help KEMBTK_BUSYB_ZCIP provides ZeroConf KEMBTK_BUSYB_IPv4 address selection, according to RFC 3927. diff --git a/packages/busybox/busybox-kconfigs/busybox-procps.kconfig b/packages/busybox/busybox-kconfigs/busybox-procps.kconfig index 861fa44..14db82a 100644 --- a/packages/busybox/busybox-kconfigs/busybox-procps.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-procps.kconfig @@ -7,9 +7,33 @@ comment "-------------------------------------------------" comment "Process Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_IOSTAT + bool "iostat" + depends on EMBTK_BB_VERSION_1_18_X + default y + help + Report KEMBTK_BUSYB_CPU and I/O statistics +config KEMBTK_BUSYB_MPSTAT + bool "mpstat" + depends on EMBTK_BB_VERSION_1_18_X + default y + help + Per-processor statistics +config KEMBTK_BUSYB_PMAP + bool "pmap" + depends on EMBTK_BB_VERSION_1_18_X + default y + help + Display processes' memory mappings. +config KEMBTK_BUSYB_POWERTOP + bool + depends on EMBTK_BB_VERSION_1_18_X + default y + help + Analyze power consumption on Intel-based laptops config KEMBTK_BUSYB_SMEMCAP bool "smemcap" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help smemcap is a tool for capturing process data for smem, @@ -18,6 +42,7 @@ config KEMBTK_BUSYB_SMEMCAP config KEMBTK_BUSYB_FREE bool "free" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() help free displays the total amount of free and used physical and swap memory in the system, as well as the buffers used by the kernel. @@ -112,7 +137,7 @@ config KEMBTK_BUSYB_FEATURE_PS_WIDE config KEMBTK_BUSYB_FEATURE_PS_TIME bool "Enable time and elapsed time output" default y - depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP + depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP && KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() help Support -o time and -o etime output specifiers. @@ -120,7 +145,7 @@ config KEMBTK_BUSYB_FEATURE_PS_ADDITIONAL_COLUMNS bool "Enable additional ps columns" default y depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support -o rgroup, -o ruser, -o nice output specifiers. @@ -202,13 +227,14 @@ config KEMBTK_BUSYB_FEATURE_SHOW_THREADS bool "Support for showing threads in ps/top" default y depends on KEMBTK_BUSYB_PS || KEMBTK_BUSYB_TOP - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enables ps -T option and 'h' command in top config KEMBTK_BUSYB_UPTIME bool "uptime" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() help uptime gives a one line display of the current time, how long the system has been running, how many users are currently logged diff --git a/packages/busybox/busybox-kconfigs/busybox-shell.kconfig b/packages/busybox/busybox-kconfigs/busybox-shell.kconfig index ba41543..674beed 100644 --- a/packages/busybox/busybox-kconfigs/busybox-shell.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-shell.kconfig @@ -7,8 +7,6 @@ comment "-------------------------------------------------" comment "Shells" comment "-------------------------------------------------" - - config KEMBTK_BUSYB_ASH bool "ash" default y @@ -20,6 +18,23 @@ config KEMBTK_BUSYB_ASH shell (by Herbert Xu), which was created by porting the 'ash' shell (written by Kenneth Almquist) from NetBSD. +config KEMBTK_BUSYB_ASH_READ_NCHARS + bool "'read -n N' and 'read -s' support" + depends on KEMBTK_BUSYB_ASH + depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X + 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 KEMBTK_BUSYB_ASH_READ_TIMEOUT + bool "'read -t S' support" + depends on KEMBTK_BUSYB_ASH + depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X + 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 KEMBTK_BUSYB_ASH_BASH_COMPAT bool "bash-compatible extensions" default y @@ -34,23 +49,6 @@ config KEMBTK_BUSYB_ASH_JOB_CONTROL help Enable job control in the ash shell. -config KEMBTK_BUSYB_ASH_READ_NCHARS - bool "'read -n N' and 'read -s' support" - depends on KEMBTK_BUSYB_ASH - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X - 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 KEMBTK_BUSYB_ASH_READ_TIMEOUT - bool "'read -t S' support" - depends on KEMBTK_BUSYB_ASH - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X - 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 KEMBTK_BUSYB_ASH_ALIAS bool "alias support" default y @@ -145,28 +143,72 @@ config KEMBTK_BUSYB_ASH_EXPAND_PRMT This option recreates the prompt string from the environment variable each time it is displayed. +config KEMBTK_BUSYB_CTTYHACK + bool "cttyhack" + default y + help + One common problem reported on the mailing list is "can't access tty; + job control turned off" error message which typically appears when + one tries to use shell with stdin/stdout opened to /dev/console. + This device is special - it cannot be a controlling tty. + + Proper solution is to use correct device instead of /dev/console. + + cttyhack provides "quick and dirty" solution to this problem. + It analyzes stdin with various ioctls, trying to determine whether + it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). + If it detects one, it closes stdin/out/err and reopens that device. + Then it executes given program. Opening the device will make + that device a controlling tty. This may require cttyhack + to be a session leader. + + Example for /etc/inittab (for busybox init): + + ::respawn:/bin/cttyhack /bin/sh + + Starting an interactive shell from boot shell script: + + setsid cttyhack sh + + Giving controlling tty to shell running with PID 1: + + # exec cttyhack sh + + Without cttyhack, you need to know exact tty name, + and do something like this: + + # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1' + config KEMBTK_BUSYB_HUSH bool "hush" default y help - hush is a small shell (22k). It handles the normal flow control + hush is a small shell (25k). It handles the normal flow control constructs such as if/then/elif/else/fi, for/in/do/done, while loops, case/esac. Redirections, here documents, $((arithmetic)) and functions are supported. It will compile and work on no-mmu systems. - It does not handle select, aliases, brace expansion, - tilde expansion, &>file and >&file redirection of stdout+stderr. + It does not handle select, aliases, tilde expansion, + &>file and >&file redirection of stdout+stderr. config KEMBTK_BUSYB_HUSH_BASH_COMPAT bool "bash-compatible extensions" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable bash-compatible extensions. +config KEMBTK_BUSYB_HUSH_BRACE_EXPANSION + bool "Brace expansion" + default y + depends on KEMBTK_BUSYB_HUSH_BASH_COMPAT + depends on EMBTK_BB_VERSION_1_18_X + help + Enable {abc,def} extension. + config KEMBTK_BUSYB_HUSH_HELP bool "help builtin" default y @@ -184,6 +226,14 @@ config KEMBTK_BUSYB_HUSH_INTERACTIVE from stdin just like a shell script from a file. No prompt, no KEMBTK_BUSYB_PS1/PS2 magic shell variables. +config KEMBTK_BUSYB_HUSH_SAVEHISTORY + bool "Save command history to .hush_history" + default y + depends on KEMBTK_BUSYB_HUSH_INTERACTIVE && KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY + depends on EMBTK_BB_VERSION_1_18_X + help + Enable history saving in hush. + config KEMBTK_BUSYB_HUSH_JOB bool "Job control" default y @@ -227,7 +277,7 @@ config KEMBTK_BUSYB_HUSH_FUNCTIONS bool "Support funcname() { commands; } syntax" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable support for shell functions in hush. +800 bytes. @@ -238,22 +288,37 @@ config KEMBTK_BUSYB_HUSH_LOCAL help Enable support for local variables in functions. +config KEMBTK_BUSYB_HUSH_RANDOM_SUPPORT + bool "Pseudorandom generator and $RANDOM variable" + default y + depends on KEMBTK_BUSYB_HUSH + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + help + Enable pseudorandom generator and dynamic variable "$RANDOM". + Each read of "$RANDOM" will generate a new pseudorandom value. + config KEMBTK_BUSYB_HUSH_EXPORT_N - bool "Support export '-n' option" + bool "Support 'export -n' option" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help - Enable support for export '-n' option in hush. It is a bash extension. + export -n unexports variables. It is a bash extension. -config KEMBTK_BUSYB_HUSH_RANDOM_SUPPORT - bool "Pseudorandom generator and $RANDOM variable" +config KEMBTK_BUSYB_HUSH_MODE_X + bool "Support 'hush -x' option and 'set -x' command" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_18_X help - Enable pseudorandom generator and dynamic variable "$RANDOM". - Each read of "$RANDOM" will generate a new pseudorandom value. + This instructs hush to print commands before execution. + Adds ~300 bytes. + +config KEMBTK_BUSYB_MSH + bool "msh (deprecated: aliased to hush)" + select KEMBTK_BUSYB_HUSH if EMBTK_BB_VERSION_1_18_X + help + msh is deprecated and will be removed, please migrate to hush. choice @@ -264,18 +329,17 @@ choice # note: cannot use "select KEMBTK_BUSYB_ASH" here, it breaks "make allnoconfig" config KEMBTK_BUSYB_FEATURE_SH_IS_ASH - depends on KEMBTK_BUSYB_ASH bool "ash" + depends on KEMBTK_BUSYB_ASH depends on !KEMBTK_BUSYB_NOMMU config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH - depends on KEMBTK_BUSYB_HUSH bool "hush" + depends on KEMBTK_BUSYB_HUSH config KEMBTK_BUSYB_FEATURE_SH_IS_MSH - select KEMBTK_BUSYB_MSH - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X - bool "msh" + bool "msh" + depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X config KEMBTK_BUSYB_FEATURE_SH_IS_NONE bool "none" @@ -284,7 +348,7 @@ endchoice choice prompt "Choose which shell is aliased to 'bash' name" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Choose which shell you want to be executed by 'bash' alias. The ash shell is the most bash compatible and full featured one. @@ -313,32 +377,17 @@ config KEMBTK_BUSYB_FEATURE_BASH_IS_NONE endchoice - config KEMBTK_BUSYB_LASH - bool "lash (deprecated)" - select KEMBTK_BUSYB_HUSH if (EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X) - help - lash is deprecated and will be removed, please migrate to hush. - -config KEMBTK_BUSYB_MSH - bool "msh (deprecated: please use hush)" - help - msh is deprecated and will be removed, please migrate to hush. - If there is a feature msh has but hush does not, please let us know. - -# 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 grammar (try running the shell testscript "tests/sh.testcases" -# on it and compare vs bash) but for most things it works quite well. -# It uses only vfork, so it can be used on uClinux systems. - + bool "lash (deprecated)" + select KEMBTK_BUSYB_HUSH if (EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X) + help + lash is deprecated and will be removed, please migrate to hush. config KEMBTK_BUSYB_SH_MATH_SUPPORT bool "POSIX math support" default y depends on KEMBTK_BUSYB_ASH || KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable math support in the shell via $((...)) syntax. @@ -406,34 +455,3 @@ config KEMBTK_BUSYB_FEATURE_SH_NOFORK This feature is relatively new. Use with care. -config KEMBTK_BUSYB_CTTYHACK - bool "cttyhack" - default y - help - One common problem reported on the mailing list is "can't access tty; - job control turned off" error message which typically appears when - one tries to use shell with stdin/stdout opened to /dev/console. - This device is special - it cannot be a controlling tty. - - Proper solution is to use correct device instead of /dev/console. - - cttyhack provides "quick and dirty" solution to this problem. - It analyzes stdin with various ioctls, trying to determine whether - it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). - If it detects one, it closes stdin/out/err and reopens that device. - Then it executes given program. Opening the device will make - that device a controlling tty. This may require cttyhack - to be a session leader. - - Example for /etc/inittab (for busybox init): - - ::respawn:/bin/cttyhack /bin/sh - - Giving controlling tty to shell running with PID 1: - - $ exec cttyhack sh - - Starting an interactive shell from boot shell script: - - setsid cttyhack sh - diff --git a/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig b/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig index c555fa9..1cba376 100644 --- a/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig @@ -59,7 +59,7 @@ config KEMBTK_BUSYB_FEATURE_SYSLOGD_READ_BUFFER_SIZE default 256 range 256 20000 depends on KEMBTK_BUSYB_SYSLOGD - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help This option sets the size of the syslog read buffer. Actual memory usage increases around five times the @@ -119,6 +119,23 @@ config KEMBTK_BUSYB_KLOGD you wish to record the messages produced by the kernel, you should enable this option. +config KEMBTK_BUSYB_FEATURE_KLOGD_KLOGCTL + bool "Use the klogctl() interface" + default y + depends on KEMBTK_BUSYB_KLOGD && KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_18_X + help + The klogd applet supports two interfaces for reading + kernel messages. Linux provides the klogctl() interface + which allows reading messages from the kernel ring buffer + independently from the file system. + + If you answer 'N' here, klogd will use the more portable + approach of reading them from /proc or a device node. + However, this method requires the file to be available. + + If in doubt, say 'Y'. + config KEMBTK_BUSYB_LOGGER bool "logger" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig b/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig index 0e87dce..7b4fb2c 100644 --- a/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig @@ -7,17 +7,24 @@ comment "-------------------------------------------------" comment "Linux System Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_BLOCKDEV + bool "blockdev" + depends on EMBTK_BB_VERSION_1_18_X + default y + help + Performs some ioctls with block devices. config KEMBTK_BUSYB_REV bool "rev" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Reverse lines of a file or files. config KEMBTK_BUSYB_ACPID bool "acpid" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help acpid listens to ACPI events coming either in textual form from /proc/acpi/event (though it is marked deprecated it is still widely @@ -40,6 +47,7 @@ config KEMBTK_BUSYB_FEATURE_ACPID_COMPAT config KEMBTK_BUSYB_BLKID bool "blkid" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_VOLUMEID help Lists labels and UUIDs of all filesystems. @@ -49,6 +57,7 @@ config KEMBTK_BUSYB_BLKID config KEMBTK_BUSYB_DMESG bool "dmesg" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help 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 @@ -82,6 +91,7 @@ config KEMBTK_BUSYB_FEATURE_DMESG_PRETTY config KEMBTK_BUSYB_FBSET bool "fbset" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX 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 @@ -110,6 +120,7 @@ config KEMBTK_BUSYB_FEATURE_FBSET_READMODE config KEMBTK_BUSYB_FDFLUSH bool "fdflush" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help fdflush is only needed when changing media on slightly-broken removable media drives. It is used to make Linux believe that a @@ -122,12 +133,14 @@ config KEMBTK_BUSYB_FDFLUSH config KEMBTK_BUSYB_FDFORMAT bool "fdformat" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help fdformat is used to low-level format a floppy disk. config KEMBTK_BUSYB_FDISK bool "fdisk" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help The fdisk utility is used to divide hard disks into one or more logical disks, which are generally called partitions. This utility @@ -178,6 +191,14 @@ config KEMBTK_BUSYB_FEATURE_OSF_LABEL Enabling this option allows you to create or change BSD disklabels and define and edit BSD disk slices. +config KEMBTK_BUSYB_FEATURE_GPT_LABEL + bool "Support GPT disklabels" + depends on KEMBTK_BUSYB_FDISK && KEMBTK_BUSYB_FEATURE_FDISK_WRITABLE + depends on EMBTK_BB_VERSION_1_18_X + help + Enabling this option allows you to view GUID Partition Table + disklabels. + config KEMBTK_BUSYB_FEATURE_FDISK_ADVANCED bool "Support expert mode" default y @@ -191,6 +212,7 @@ config KEMBTK_BUSYB_FEATURE_FDISK_ADVANCED config KEMBTK_BUSYB_FINDFS bool "findfs" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_VOLUMEID help Prints the name of a filesystem with given label or UUID. @@ -199,7 +221,7 @@ config KEMBTK_BUSYB_FINDFS config KEMBTK_BUSYB_FLOCK bool "flock" - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Manage locks from shell scripts @@ -207,6 +229,7 @@ config KEMBTK_BUSYB_FLOCK config KEMBTK_BUSYB_FREERAMDISK bool "freeramdisk" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Linux allows you to create ramdisks. This utility allows you to delete them and completely free all memory that was used for the @@ -228,14 +251,16 @@ config KEMBTK_BUSYB_FSCK_MINIX config KEMBTK_BUSYB_MKFS_EXT2 bool "mkfs_ext2" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Utility to create EXT2 filesystems. config KEMBTK_BUSYB_MKFS_MINIX bool "mkfs_minix" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help The minix filesystem is a nice, small, compact, read-write filesystem with little overhead. If you wish to be able to create minix @@ -252,15 +277,17 @@ config KEMBTK_BUSYB_FEATURE_MINIX2 config KEMBTK_BUSYB_MKFS_REISER bool "mkfs_reiser" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Utility to create ReiserFS filesystems. Note: this applet needs a lot of testing and polishing. config KEMBTK_BUSYB_MKFS_VFAT bool "mkfs_vfat" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Utility to create FAT32 filesystems. @@ -279,7 +306,7 @@ config KEMBTK_BUSYB_FEATURE_GETOPT_LONG bool "Support option -l" default y if KEMBTK_BUSYB_LONG_OPTS depends on KEMBTK_BUSYB_GETOPT - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable support for long options (option -l). @@ -310,6 +337,7 @@ config KEMBTK_BUSYB_HD config KEMBTK_BUSYB_HWCLOCK bool "hwclock" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX 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 @@ -327,7 +355,6 @@ config KEMBTK_BUSYB_FEATURE_HWCLOCK_LONG_OPTIONS config KEMBTK_BUSYB_FEATURE_HWCLOCK_ADJTIME_FHS bool "Use FHS /var/lib/hwclock/adjtime" - default y depends on KEMBTK_BUSYB_HWCLOCK help Starting with FHS 2.3, the adjtime state file is supposed to exist @@ -340,7 +367,6 @@ config KEMBTK_BUSYB_FEATURE_HWCLOCK_ADJTIME_FHS config KEMBTK_BUSYB_IPCRM bool "ipcrm" default y - select KEMBTK_BUSYB_FEATURE_SUID help The ipcrm utility allows the removal of System V interprocess communication (KEMBTK_BUSYB_IPC) objects and the associated data structures @@ -349,7 +375,7 @@ config KEMBTK_BUSYB_IPCRM config KEMBTK_BUSYB_IPCS bool "ipcs" default y - select KEMBTK_BUSYB_FEATURE_SUID + depends on KEMBTK_BUSYB_PLATFORM_LINUX help The ipcs utility is used to provide information on the currently allocated System V interprocess (KEMBTK_BUSYB_IPC) objects in the system. @@ -357,6 +383,7 @@ config KEMBTK_BUSYB_IPCS config KEMBTK_BUSYB_LOSETUP bool "losetup" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX 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 @@ -364,8 +391,9 @@ config KEMBTK_BUSYB_LOSETUP config KEMBTK_BUSYB_LSPCI bool "lspci" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + #depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help lspci is a utility for displaying information about PCI buses in the system and devices connected to them. @@ -374,8 +402,9 @@ config KEMBTK_BUSYB_LSPCI config KEMBTK_BUSYB_LSUSB bool "lsusb" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + #depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help lsusb is a utility for displaying information about USB buses in the system and devices connected to them. @@ -385,6 +414,7 @@ config KEMBTK_BUSYB_LSUSB config KEMBTK_BUSYB_MDEV bool "mdev" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help mdev is a mini-udev implementation for dynamically creating device nodes in the /dev directory. @@ -464,7 +494,7 @@ config KEMBTK_BUSYB_FEATURE_MKSWAP_UUID bool "UUID support" default y depends on KEMBTK_BUSYB_MKSWAP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Generate swap spaces with universally unique identifiers. @@ -478,20 +508,10 @@ config KEMBTK_BUSYB_MORE 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 KEMBTK_BUSYB_FEATURE_USE_TERMIOS - bool "Use termios to manipulate the screen" - default y - depends on KEMBTK_BUSYB_MORE || KEMBTK_BUSYB_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 - 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 KEMBTK_BUSYB_MOUNT bool "mount" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX 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 @@ -573,6 +593,7 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_FSTAB config KEMBTK_BUSYB_PIVOT_ROOT bool "pivot_root" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX 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 @@ -600,12 +621,14 @@ config KEMBTK_BUSYB_RDEV config KEMBTK_BUSYB_READPROFILE bool "readprofile" default y + #depends on KEMBTK_BUSYB_PLATFORM_LINUX help This allows you to parse /proc/profile for basic profiling. config KEMBTK_BUSYB_RTCWAKE bool "rtcwake" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Enter a system sleep state until specified wakeup time. @@ -617,7 +640,7 @@ config KEMBTK_BUSYB_SCRIPT config KEMBTK_BUSYB_SCRIPTREPLAY bool "scriptreplay" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help This program replays a typescript, using timing information @@ -626,6 +649,7 @@ config KEMBTK_BUSYB_SCRIPTREPLAY config KEMBTK_BUSYB_SETARCH bool "setarch" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help The linux32 utility is used to create a 32bit environment for the specified program (usually a shell). It only makes sense to have @@ -635,6 +659,7 @@ config KEMBTK_BUSYB_SETARCH config KEMBTK_BUSYB_SWAPONOFF bool "swaponoff" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help This option enables both the 'swapon' and the 'swapoff' utilities. Once you have created some swap space using 'mkswap', you also need @@ -653,6 +678,7 @@ config KEMBTK_BUSYB_FEATURE_SWAPON_PRI config KEMBTK_BUSYB_SWITCH_ROOT bool "switch_root" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help The switch_root utility is used from initramfs to select a new root device. Under initramfs, you have to use this instead of @@ -672,6 +698,7 @@ config KEMBTK_BUSYB_SWITCH_ROOT config KEMBTK_BUSYB_UMOUNT bool "umount" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help When you want to remove a mounted filesystem from its current mount point, for example when you are shutting down the system, the @@ -709,7 +736,7 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_LOOP_CREATE bool "Create new loopback devices if needed" default y depends on KEMBTK_BUSYB_FEATURE_MOUNT_LOOP - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Linux kernels >= 2.6.24 support unlimited loopback devices. They are allocated for use when trying to use a loop device. The loop device diff --git a/packages/busybox/busybox-kconfigs/busybox.kconfig b/packages/busybox/busybox-kconfigs/busybox.kconfig index 8579b8a..3317df2 100644 --- a/packages/busybox/busybox-kconfigs/busybox.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox.kconfig @@ -43,12 +43,23 @@ config KEMBTK_BUSYB_INCLUDE_SUSv2 config KEMBTK_BUSYB_USE_PORTABLE_CODE bool "Avoid using GCC-specific code constructs" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Use this option if you are trying to compile busybox with compiler other than gcc. If you do use gcc, this option may needlessly increase code size. +config KEMBTK_BUSYB_PLATFORM_LINUX + bool + default y + help + For the most part, busybox requires only POSIX compatibility + from the target system, but some applets and features use + Linux-specific interfaces. + + Answering 'N' here will disable such applets and hide the + corresponding configuration options. + choice prompt "Buffer allocation policy" help @@ -113,6 +124,13 @@ config KEMBTK_BUSYB_FEATURE_INSTALLER busybox at runtime to create hard links or symlinks for all the applets that are compiled into busybox. +config KEMBTK_BUSYB_INSTALL_NO_USR + bool "Don't use /usr" + help + Disable use of /usr. busybox --install and "make install" + will install applets only to /bin and /sbin, + never to /usr/bin or /usr/sbin. + config KEMBTK_BUSYB_LOCALE_SUPPORT bool "Enable locale support (system needs locale for this to work)" help @@ -120,9 +138,9 @@ config KEMBTK_BUSYB_LOCALE_SUPPORT busybox to support locale settings. config KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE - bool - help - backward compatibility for busybox-1.{13,14,15,16}.x + bool + help + backward compatibility for busybox-1.{13,14,15,16}.x config KEMBTK_BUSYB_UNICODE_SUPPORT bool "Support Unicode" @@ -140,7 +158,7 @@ config KEMBTK_BUSYB_UNICODE_SUPPORT config KEMBTK_BUSYB_UNICODE_USING_LOCALE bool "Use libc routines for Unicode (else uses internal ones)" depends on KEMBTK_BUSYB_UNICODE_SUPPORT && KEMBTK_BUSYB_LOCALE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option on, Unicode support is implemented using libc routines. Otherwise, internal implementation is used. @@ -149,7 +167,7 @@ config KEMBTK_BUSYB_UNICODE_USING_LOCALE config KEMBTK_BUSYB_FEATURE_CHECK_UNICODE_IN_ENV bool "Check $LANG environment variable" depends on KEMBTK_BUSYB_UNICODE_SUPPORT && !(KEMBTK_BUSYB_UNICODE_USING_LOCALE || KEMBTK_BUSYB_UNICODE_USING_LOCALE) - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option on, Unicode support is activated only if LANG variable has the value of the form "xxxx.utf8" @@ -165,7 +183,7 @@ config KEMBTK_BUSYB_GETOPT_LONG config KEMBTK_BUSYB_SUBST_WCHAR int "Character code to substitute unprintable characters with" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default 63 help Typical values are 63 for '?' (works with any output device), @@ -175,7 +193,7 @@ config KEMBTK_BUSYB_SUBST_WCHAR config KEMBTK_BUSYB_LAST_SUPPORTED_WCHAR int "Range of supported Unicode characters" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default 767 help Any character with Unicode value bigger than this is assumed @@ -206,7 +224,7 @@ config KEMBTK_BUSYB_LAST_SUPPORTED_WCHAR config KEMBTK_BUSYB_UNICODE_COMBINING_WCHARS bool "Allow zero-width Unicode characters on output" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option off, any Unicode char with width of 0 is substituted on output. @@ -214,7 +232,7 @@ config KEMBTK_BUSYB_UNICODE_COMBINING_WCHARS config KEMBTK_BUSYB_UNICODE_WIDE_WCHARS bool "Allow wide Unicode characters on output" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option off, any Unicode char with width > 1 is substituted on output. @@ -222,7 +240,7 @@ config KEMBTK_BUSYB_UNICODE_WIDE_WCHARS config KEMBTK_BUSYB_UNICODE_BIDI_SUPPORT bool "Bidirectional character-aware line input" depends on KEMBTK_BUSYB_UNICODE_SUPPORT && !KEMBTK_BUSYB_UNICODE_USING_LOCALE - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option on, right-to-left Unicode characters are treated differently on input (e.g. cursor movement). @@ -230,7 +248,7 @@ config KEMBTK_BUSYB_UNICODE_BIDI_SUPPORT config KEMBTK_BUSYB_UNICODE_NEUTRAL_TABLE bool "In bidi input, support non-ASCII neutral chars too" depends on KEMBTK_BUSYB_UNICODE_BIDI_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help In most cases it's enough to treat only ASCII non-letters (i.e. punctuation, numbers and space) as characters @@ -241,7 +259,7 @@ config KEMBTK_BUSYB_UNICODE_NEUTRAL_TABLE config KEMBTK_BUSYB_UNICODE_PRESERVE_BROKEN bool "Make it possible to enter sequences of chars which are not Unicode" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option on, invalid UTF-8 bytes are not substituted with the selected substitution character. @@ -251,7 +269,6 @@ config KEMBTK_BUSYB_UNICODE_PRESERVE_BROKEN config KEMBTK_BUSYB_LONG_OPTS bool "Support for --long-options" - select KEMBTK_BUSYB_GETOPT_LONG default y help Enable this if you want busybox applets to use the gnu --long-option @@ -278,15 +295,6 @@ config KEMBTK_BUSYB_FEATURE_CLEAN_UP Don't enable this unless you have a really good reason to clean things up manually. -config KEMBTK_BUSYB_FEATURE_UTMP - bool "Support utmp file" - default y - help - The file /var/run/utmp is used to track who is currently logged in. - With this option on, certain applets (getty, login, telnetd etc) - will create and delete entries there. - "who" applet requires this option. - config KEMBTK_BUSYB_FEATURE_WTMP bool "Support wtmp file" default y @@ -298,6 +306,15 @@ config KEMBTK_BUSYB_FEATURE_WTMP will append new entries there. "last" applet requires this option. +config KEMBTK_BUSYB_FEATURE_UTMP + bool "Support utmp file" + default y + help + The file /var/run/utmp is used to track who is currently logged in. + With this option on, certain applets (getty, login, telnetd etc) + will create and delete entries there. + "who" applet requires this option. + config KEMBTK_BUSYB_FEATURE_PIDFILE bool "Support writing pidfiles" default y @@ -310,14 +327,19 @@ config KEMBTK_BUSYB_FEATURE_SUID default y help With this option you can install the busybox binary belonging - to root with the suid bit set, and it will automatically drop - priviledges for applets that don't need root access. + to root with the suid bit set, enabling some applets to perform + root-level operations even when run by ordinary users + (for example, mounting of user mounts in fstab needs this). + + Busybox will automatically drop priviledges for applets + that don't need root access. If you 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: + 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. @@ -366,6 +388,7 @@ config KEMBTK_BUSYB_FEATURE_SUID_CONFIG_QUIET config KEMBTK_BUSYB_SELINUX bool "Support NSA Security Enhanced Linux" + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Enable support for SELinux in applets ls, ps, and id. Also provide the option of compiling in SELinux applets. @@ -558,8 +581,8 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX Native builds leave this empty. config KEMBTK_BUSYB_EXTRA_CFLAGS - string "Additional CFLAGS" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + string + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default "" help Additional CFLAGS to pass to the compiler verbatim. @@ -642,19 +665,13 @@ endchoice comment "-------------------------------------------------" -comment 'Installation Options' +comment 'Installation Options ("make install" behavior)' comment "-------------------------------------------------" -config KEMBTK_BUSYB_INSTALL_NO_USR - bool "Don't use /usr" - help - Disable use of /usr. Don't activate this option if you don't know - that you really want this behaviour. - choice - prompt "Applets links" + prompt "What kind of applet links to install" help - Choose how you install applets links. + Choose what kind of links to applets are created by "make install". config KEMBTK_BUSYB_INSTALL_APPLET_SYMLINKS bool "as soft-links" @@ -678,8 +695,9 @@ config KEMBTK_BUSYB_INSTALL_APPLET_DONT bool "not installed" depends on KEMBTK_BUSYB_FEATURE_INSTALLER || KEMBTK_BUSYB_FEATURE_SH_STANDALONE || KEMBTK_BUSYB_FEATURE_PREFER_APPLETS help - Do not install applet links. Useful when using the -install feature - or a standalone shell for rescue purposes. + Do not install applet links. Useful when you plan to use + busybox --install for installing links, or plan to use + a standalone shell and thus don't need applet links. endchoice @@ -702,8 +720,8 @@ config KEMBTK_BUSYB_INSTALL_SH_APPLET_HARDLINK config KEMBTK_BUSYB_INSTALL_SH_APPLET_SCRIPT_WRAPPER bool "as script wrapper" help - Install /bin/sh applet as script wrapper that call the busybox - binary. + Install /bin/sh applet as script wrapper that calls + the busybox binary. endchoice |