From 11ce1309dc47aad331df8b53bffd8f9681186dfa Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 5 Dec 2010 11:05:31 +0100 Subject: Packages: busybox: add busybox-1.17.4 and its associated kconfig symbols Signed-off-by: Abdoulaye Walsimou Gaye --- .../busybox-kconfigs/busybox-archival.kconfig | 102 +++- .../busybox-kconfigs/busybox-console-tools.kconfig | 47 ++ .../busybox-kconfigs/busybox-coreutils.kconfig | 276 +++++++---- .../busybox-kconfigs/busybox-debianutils.kconfig | 12 +- .../busybox-e2fsprogs-old_e2fsprogs.kconfig | 2 + .../busybox-kconfigs/busybox-e2fsprogs.kconfig | 19 +- .../busybox-kconfigs/busybox-editors.kconfig | 43 +- .../busybox-kconfigs/busybox-findutils.kconfig | 13 +- .../busybox/busybox-kconfigs/busybox-init.kconfig | 54 ++- .../busybox/busybox-kconfigs/busybox-libbb.kconfig | 14 +- .../busybox-kconfigs/busybox-loginutils.kconfig | 44 +- .../busybox-kconfigs/busybox-mailutils.kconfig | 7 + .../busybox-kconfigs/busybox-miscutils.kconfig | 104 +++- .../busybox-kconfigs/busybox-modutils.kconfig | 12 +- .../busybox-networking-udhcp.kconfig | 53 ++- .../busybox-kconfigs/busybox-networking.kconfig | 218 ++++++--- .../busybox-kconfigs/busybox-printutils.kconfig | 5 + .../busybox-kconfigs/busybox-procps.kconfig | 37 +- .../busybox/busybox-kconfigs/busybox-runit.kconfig | 11 + .../busybox-kconfigs/busybox-selinux.kconfig | 5 +- .../busybox/busybox-kconfigs/busybox-shell.kconfig | 163 +++++-- .../busybox-kconfigs/busybox-sysklogd.kconfig | 22 +- .../busybox-kconfigs/busybox-util-linux.kconfig | 521 +++++++++++++-------- packages/busybox/busybox-kconfigs/busybox.kconfig | 143 +++++- packages/busybox/busybox.kconfig | 7 + packages/busybox/busybox.mk | 7 +- 26 files changed, 1444 insertions(+), 497 deletions(-) diff --git a/packages/busybox/busybox-kconfigs/busybox-archival.kconfig b/packages/busybox/busybox-kconfigs/busybox-archival.kconfig index 1a58b34..a3d70c6 100644 --- a/packages/busybox/busybox-kconfigs/busybox-archival.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-archival.kconfig @@ -7,18 +7,30 @@ comment "-------------------------------------------------" comment "Archival Utilities" comment "-------------------------------------------------" + + +config KEMBTK_BUSYB_FEATURE_SEAMLESS_XZ + bool "Make tar, rpm, modprobe etc understand .xz data" + depends on EMBTK_BB_VERSION_1_17_X + default y + help + Make tar, rpm, modprobe etc understand .xz data. + config KEMBTK_BUSYB_FEATURE_SEAMLESS_LZMA bool "Make tar, rpm, modprobe etc understand .lzma data" + default y help Make tar, rpm, modprobe etc understand .lzma data. config KEMBTK_BUSYB_FEATURE_SEAMLESS_BZ2 bool "Make tar, rpm, modprobe etc understand .bz2 data" + default y help Make tar, rpm, modprobe etc understand .bz2 data. config KEMBTK_BUSYB_FEATURE_SEAMLESS_GZ bool "Make tar, rpm, modprobe etc understand .gz data" + default y help Make tar, rpm, modprobe etc understand .gz data. @@ -51,6 +63,7 @@ config KEMBTK_BUSYB_AR config KEMBTK_BUSYB_FEATURE_AR_LONG_FILENAMES bool "Support for long filenames (not needed for debs)" + default y depends on KEMBTK_BUSYB_AR help By default the ar format can only store the first 15 characters @@ -58,8 +71,17 @@ config KEMBTK_BUSYB_FEATURE_AR_LONG_FILENAMES It supports the GNU ar long filename method which moves multiple long filenames into a the data section of a new ar entry. +config KEMBTK_BUSYB_FEATURE_AR_CREATE + bool "Support archive creation" + depends on EMBTK_BB_VERSION_1_17_X + default y + depends on KEMBTK_BUSYB_AR + help + This enables archive creation (-c and -r) with busybox ar. + config KEMBTK_BUSYB_BUNZIP2 bool "bunzip2" + default y help bunzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -72,6 +94,7 @@ config KEMBTK_BUSYB_BUNZIP2 config KEMBTK_BUSYB_BZIP2 bool "bzip2" + default y help bzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -84,6 +107,7 @@ config KEMBTK_BUSYB_BZIP2 config KEMBTK_BUSYB_CPIO bool "cpio" + default y help cpio is an archival utility program used to create, modify, and extract contents from archives. @@ -97,6 +121,7 @@ config KEMBTK_BUSYB_CPIO config KEMBTK_BUSYB_FEATURE_CPIO_O bool "Support for archive creation" + default y depends on KEMBTK_BUSYB_CPIO help This implementation of cpio can create cpio archives in the "newc" @@ -104,8 +129,9 @@ config KEMBTK_BUSYB_FEATURE_CPIO_O 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 + 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 help Passthrough mode. Rarely used. @@ -141,6 +167,7 @@ config KEMBTK_BUSYB_FEATURE_DPKG_DEB_EXTRACT_ONLY config KEMBTK_BUSYB_GUNZIP bool "gunzip" + default y help gunzip is used to decompress archives created by gzip. You can use the `-t' option to test the integrity of @@ -148,19 +175,22 @@ config KEMBTK_BUSYB_GUNZIP config KEMBTK_BUSYB_GZIP bool "gzip" + default y help gzip is used to compress files. It's probably the most widely used UNIX compression program. config KEMBTK_BUSYB_FEATURE_GZIP_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_GZIP && KEMBTK_BUSYB_LONG_OPTS help Enable use of long options, increases size by about 106 Bytes config KEMBTK_BUSYB_LZOP bool "lzop" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help Lzop compression/decompresion. @@ -174,23 +204,24 @@ config KEMBTK_BUSYB_LZOP_COMPR_HIGH config KEMBTK_BUSYB_RPM2CPIO bool "rpm2cpio" + default y help Converts an KEMBTK_BUSYB_RPM file into a KEMBTK_BUSYB_CPIO archive. config KEMBTK_BUSYB_RPM bool "rpm" + default y help Mini KEMBTK_BUSYB_RPM applet - queries and extracts KEMBTK_BUSYB_RPM packages. config KEMBTK_BUSYB_TAR bool "tar" + default y help tar is an archiving program. It's commonly used with gzip to create compressed archives. It's probably the most widely used UNIX archive program. -if KEMBTK_BUSYB_TAR - config KEMBTK_BUSYB_FEATURE_TAR_CREATE bool "Enable archive creation" default y @@ -201,13 +232,15 @@ config KEMBTK_BUSYB_FEATURE_TAR_CREATE config KEMBTK_BUSYB_FEATURE_TAR_AUTODETECT bool "Autodetect compressed tarballs" - depends on KEMBTK_BUSYB_FEATURE_SEAMLESS_Z || KEMBTK_BUSYB_FEATURE_SEAMLESS_GZ || KEMBTK_BUSYB_FEATURE_SEAMLESS_BZ2 || KEMBTK_BUSYB_FEATURE_SEAMLESS_LZMA + default y + depends on KEMBTK_BUSYB_TAR && (KEMBTK_BUSYB_FEATURE_SEAMLESS_Z || KEMBTK_BUSYB_FEATURE_SEAMLESS_GZ || KEMBTK_BUSYB_FEATURE_SEAMLESS_BZ2 || KEMBTK_BUSYB_FEATURE_SEAMLESS_LZMA || KEMBTK_BUSYB_FEATURE_SEAMLESS_XZ) help With this option tar can automatically detect compressed tarballs. Currently it works only on files (not pipes etc). config KEMBTK_BUSYB_FEATURE_TAR_FROM bool "Enable -X (exclude from) and -T (include from) options)" + default y depends on KEMBTK_BUSYB_TAR help If you enable this option you'll be able to specify @@ -215,7 +248,8 @@ config KEMBTK_BUSYB_FEATURE_TAR_FROM config KEMBTK_BUSYB_FEATURE_TAR_OLDGNU_COMPATIBILITY bool "Support for old tar header format" - depends on KEMBTK_BUSYB_TAR + default y + depends on KEMBTK_BUSYB_TAR || KEMBTK_BUSYB_DPKG help This option is required to unpack archives created in the old GNU format; help to kill this old format by @@ -223,7 +257,8 @@ config KEMBTK_BUSYB_FEATURE_TAR_OLDGNU_COMPATIBILITY config KEMBTK_BUSYB_FEATURE_TAR_OLDSUN_COMPATIBILITY bool "Enable untarring of tarballs with checksums produced by buggy Sun tar" - depends on KEMBTK_BUSYB_TAR + default y + depends on KEMBTK_BUSYB_TAR || KEMBTK_BUSYB_DPKG help This option is required to unpack archives created by some old version of Sun's tar (it was calculating checksum using signed @@ -233,19 +268,31 @@ config KEMBTK_BUSYB_FEATURE_TAR_OLDSUN_COMPATIBILITY config KEMBTK_BUSYB_FEATURE_TAR_GNU_EXTENSIONS bool "Support for GNU tar extensions (long filenames)" default y - depends on KEMBTK_BUSYB_TAR + depends on KEMBTK_BUSYB_TAR || KEMBTK_BUSYB_DPKG help With this option busybox supports GNU long filenames and linknames. config KEMBTK_BUSYB_FEATURE_TAR_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_LONG_OPTS help Enable use of long options, increases size by about 400 Bytes +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 + default y + 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 + external program. + config KEMBTK_BUSYB_FEATURE_TAR_UNAME_GNAME bool "Enable use of user and group names" + default y depends on KEMBTK_BUSYB_TAR help Enables use of user and group names in tar. This affects contents @@ -254,13 +301,20 @@ 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 + default y depends on KEMBTK_BUSYB_TAR - depends on EMBTK_BB_VERSION_1_16_X help With this option busybox supports GNU tar -m (do not preserve time) option. -endif #tar +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 + help + With this option busybox supports restoring SELinux labels + when extracting files from tar archives. config KEMBTK_BUSYB_UNCOMPRESS bool "uncompress" @@ -270,6 +324,7 @@ config KEMBTK_BUSYB_UNCOMPRESS config KEMBTK_BUSYB_UNLZMA bool "unlzma" + default y help unlzma is a compression utility using the Lempel-Ziv-Markov chain compression algorithm, and range coding. Compression @@ -284,13 +339,40 @@ config KEMBTK_BUSYB_UNLZMA config KEMBTK_BUSYB_FEATURE_LZMA_FAST bool "Optimize unlzma for speed" + default y depends on KEMBTK_BUSYB_UNLZMA help This option reduces decompression time by about 25% at the cost of a 1K bigger binary. +config KEMBTK_BUSYB_LZMA + bool "Provide lzma alias which supports only unpacking" + depends on EMBTK_BB_VERSION_1_17_X + default y + depends on KEMBTK_BUSYB_UNLZMA + help + Enable this option if you want commands like "lzma -d" to work. + IOW: you'll get lzma applet, but it will always require -d option. + +config KEMBTK_BUSYB_UNXZ + bool "unxz" + depends on EMBTK_BB_VERSION_1_17_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 + default y + depends on KEMBTK_BUSYB_UNXZ + help + Enable this option if you want commands like "xz -d" to work. + IOW: you'll get xz applet, but it will always require -d option. + config KEMBTK_BUSYB_UNZIP bool "unzip" + default y help unzip will list or extract files from a ZIP archive, commonly found on DOS/WIN systems. The default behavior diff --git a/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig b/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig index 2aa64b6..449104f 100644 --- a/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig @@ -7,64 +7,84 @@ comment "-------------------------------------------------" comment "Console Utilities" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_CHVT bool "chvt" + default y 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 + help + This program prints active (foreground) console number. + config KEMBTK_BUSYB_CLEAR bool "clear" + default y help This program clears the terminal screen. config KEMBTK_BUSYB_DEALLOCVT bool "deallocvt" + default y help This program deallocates unused virtual consoles. config KEMBTK_BUSYB_DUMPKMAP bool "dumpkmap" + default y help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. config KEMBTK_BUSYB_KBD_MODE bool "kbd_mode" + default y help This program reports and sets keyboard mode. config KEMBTK_BUSYB_LOADFONT bool "loadfont" + default y help This program loads a console font from standard input. config KEMBTK_BUSYB_LOADKMAP bool "loadkmap" + default y help This program loads a keyboard translation table from standard input. config KEMBTK_BUSYB_OPENVT bool "openvt" + default y help This program is used to start a command on an unused virtual terminal. config KEMBTK_BUSYB_RESET bool "reset" + default y help This program is used to reset the terminal screen, if it gets messed up. config KEMBTK_BUSYB_RESIZE bool "resize" + default y help This program is used to (re)set the width and height of your current terminal. config KEMBTK_BUSYB_FEATURE_RESIZE_PRINT bool "Print environment variables" + default y depends on KEMBTK_BUSYB_RESIZE help Prints the newly set size (number of columns and rows) of @@ -74,23 +94,27 @@ config KEMBTK_BUSYB_FEATURE_RESIZE_PRINT config KEMBTK_BUSYB_SETCONSOLE bool "setconsole" + default y help This program redirects the system console to another device, like the current tty while logged in via telnet. config KEMBTK_BUSYB_FEATURE_SETCONSOLE_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_SETCONSOLE && KEMBTK_BUSYB_LONG_OPTS help Support long options for the setconsole applet. config KEMBTK_BUSYB_SETFONT bool "setfont" + default y help Allows to load console screen map. Useful for i18n. config KEMBTK_BUSYB_FEATURE_SETFONT_TEXTUAL_MAP bool "Support reading textual screen maps" + default y depends on KEMBTK_BUSYB_SETFONT help Support reading textual screen maps. @@ -105,17 +129,40 @@ config KEMBTK_BUSYB_DEFAULT_SETFONT_DIR config KEMBTK_BUSYB_SETKEYCODES bool "setkeycodes" + default y help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. config KEMBTK_BUSYB_SETLOGCONS bool "setlogcons" + default y help This program redirects the output console of kernel messages. config KEMBTK_BUSYB_SHOWKEY bool "showkey" + default y 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 + +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 + 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 + 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 5c7d793..c2e091e 100644 --- a/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig @@ -9,120 +9,180 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_BASENAME bool "basename" + default y help basename is used to strip the directory and suffix from filenames, leaving just the filename itself. Enable this option if you wish to enable the 'basename' utility. - -config KEMBTK_BUSYB_CAL - bool "cal" - help - cal is used to display a monthly calender. - config KEMBTK_BUSYB_CAT bool "cat" + default y 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. +config KEMBTK_BUSYB_DATE + bool "date" + default y + help + date is used to set the system date or display the + current time in the given format. + +config KEMBTK_BUSYB_FEATURE_DATE_ISOFMT + bool "Enable ISO date format output (-I)" + default y + depends on KEMBTK_BUSYB_DATE + help + Enable option (-I) to output an ISO-8601 compliant + date/time string. + +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 + help + Support %[num]N format specifier. Adds ~250 bytes of code. + +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 + 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 + a rather weird MMDDhhmm[[YY]YY][.ss] format with completely + unnatural placement of year between minutes and seconds. + date -s (and other commands like touch -d) use more sensible + formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss). + + With this option off, 'date KEMBTK_BUSYB_DATE' is 'date -s KEMBTK_BUSYB_DATE' support + the same format. With it on, 'date KEMBTK_BUSYB_DATE' additionally supports + MMDDhhmm[[YY]YY][.ss] format. +config KEMBTK_BUSYB_TEST + bool "test" + default y + help + test is used to check file types and compare values, + returning an appropriate exit code. The bash shell + has test built in, ash can build it in optionally. + +config KEMBTK_BUSYB_FEATURE_TEST_64 + bool "Extend test to 64 bit" + default y + depends on KEMBTK_BUSYB_TEST || KEMBTK_BUSYB_ASH_BUILTIN_TEST || KEMBTK_BUSYB_HUSH + help + Enable 64-bit support in test. +config KEMBTK_BUSYB_TR + bool "tr" + default y + help + tr is used to squeeze, and/or delete characters from standard + input, writing to standard output. + +config KEMBTK_BUSYB_FEATURE_TR_CLASSES + bool "Enable character classes (such as [:upper:])" + default y + depends on KEMBTK_BUSYB_TR + help + Enable character classes, enabling commands such as: + tr [:upper:] [:lower:] to convert input into lowercase. + +config KEMBTK_BUSYB_FEATURE_TR_EQUIV + bool "Enable equivalence classes" + default y + depends on KEMBTK_BUSYB_TR + help + Enable equivalence classes, which essentially add the enclosed + character to the current set. For instance, tr [=a=] xyz would + 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_CAL + bool "cal" + default y + help + cal is used to display a monthly calender. config KEMBTK_BUSYB_CATV bool "catv" + default y help Display nonprinting characters as escape sequences (like some implementations' cat -v option). config KEMBTK_BUSYB_CHGRP bool "chgrp" + default y help chgrp is used to change the group ownership of files. config KEMBTK_BUSYB_CHMOD bool "chmod" + default y help chmod is used to change the access permission of files. config KEMBTK_BUSYB_CHOWN bool "chown" + default y help chown is used to change the user and/or group ownership of files. 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 help Enable use of long options config KEMBTK_BUSYB_CHROOT bool "chroot" + default y help chroot is used to change the root directory and run a command. The default command is `/bin/sh'. config KEMBTK_BUSYB_CKSUM bool "cksum" + default y help cksum is used to calculate the CRC32 checksum of a file. config KEMBTK_BUSYB_COMM bool "comm" + default y help comm is used to compare two files line by line and return a three-column output. config KEMBTK_BUSYB_CP bool "cp" + default y help cp is used to copy files and directories. config KEMBTK_BUSYB_FEATURE_CP_LONG_OPTIONS bool "Enable long options for cp" + default y depends on KEMBTK_BUSYB_CP && KEMBTK_BUSYB_LONG_OPTS - depends on EMBTK_BB_VERSION_1_16_X + 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. config KEMBTK_BUSYB_CUT bool "cut" + default y help cut is used to print selected parts of lines from each file to stdout. -config KEMBTK_BUSYB_DATE - bool "date" - help - date is used to set the system date or display the - current time in the given format. - -config KEMBTK_BUSYB_FEATURE_DATE_ISOFMT - bool "Enable ISO date format output (-I)" - default y - depends on KEMBTK_BUSYB_DATE - help - Enable option (-I) to output an ISO-8601 compliant - date/time string. - -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 - 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 - a rather weird MMDDhhmm[[YY]YY][.ss] format with completely - unnatural placement of year between minutes and seconds. - date -s (and other commands like touch -d) use more sensible - formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss). - - With this option off, 'date KEMBTK_BUSYB_DATE' is 'date -s KEMBTK_BUSYB_DATE' support - the same format. With it on, 'date KEMBTK_BUSYB_DATE' additionally supports - MMDDhhmm[[YY]YY][.ss] format. - config KEMBTK_BUSYB_DD bool "dd" + default y help dd copies a file (from standard input to standard output, by default) using specific input and output blocksizes, @@ -144,14 +204,16 @@ config KEMBTK_BUSYB_FEATURE_DD_SIGNAL_HANDLING 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Displays a coreutils-like third status line with transferred bytes, elapsed time and speed. config KEMBTK_BUSYB_FEATURE_DD_IBS_OBS bool "Enable ibs, obs and conv options" + default y depends on KEMBTK_BUSYB_DD help Enables support for writing a certain number of bytes in and out, @@ -159,24 +221,32 @@ config KEMBTK_BUSYB_FEATURE_DD_IBS_OBS config KEMBTK_BUSYB_DF bool "df" + default y help df reports the amount of disk space used and available on filesystems. config KEMBTK_BUSYB_FEATURE_DF_FANCY bool "Enable -a, -i, -B" + default y depends on KEMBTK_BUSYB_DF help This option enables -a, -i and -B. + -a Show all filesystems + -i Inodes + -B Blocksize + config KEMBTK_BUSYB_DIRNAME bool "dirname" + default y help dirname is used to strip a non-directory suffix from a file name. config KEMBTK_BUSYB_DOS2UNIX bool "dos2unix/unix2dos" + default y help dos2unix is used to convert a text file from DOS format to UNIX format, and vice versa. @@ -191,6 +261,7 @@ config KEMBTK_BUSYB_UNIX2DOS config KEMBTK_BUSYB_DU bool "du (default blocksize of 512 bytes)" + default y help du is used to report the amount of disk space used for specified files. @@ -204,6 +275,7 @@ config KEMBTK_BUSYB_FEATURE_DU_DEFAULT_BLOCKSIZE_1K config KEMBTK_BUSYB_ECHO bool "echo (basic SuSv3 version taking no options)" + default y help echo is used to print a specified string to stdout. @@ -217,6 +289,7 @@ config KEMBTK_BUSYB_FEATURE_FANCY_ECHO config KEMBTK_BUSYB_ENV bool "env" + default y help env is used to set an environment variable and run a command; without options it displays the current @@ -224,29 +297,34 @@ config KEMBTK_BUSYB_ENV config KEMBTK_BUSYB_FEATURE_ENV_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_ENV && KEMBTK_BUSYB_LONG_OPTS help Support long options for the env applet. config KEMBTK_BUSYB_EXPAND bool "expand" + default y help By default, convert all tabs to spaces. config KEMBTK_BUSYB_FEATURE_EXPAND_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_EXPAND && KEMBTK_BUSYB_LONG_OPTS help Support long options for the expand applet. config KEMBTK_BUSYB_EXPR bool "expr" + default y help expr is used to calculate numbers and print the result to standard output. config KEMBTK_BUSYB_EXPR_MATH_SUPPORT_64 bool "Extend Posix numbers support to 64 bit" + default y depends on KEMBTK_BUSYB_EXPR help Enable 64-bit math support in the expr applet. This will make @@ -255,71 +333,84 @@ config KEMBTK_BUSYB_EXPR_MATH_SUPPORT_64 config KEMBTK_BUSYB_FALSE bool "false" + default y help false returns an exit code of KEMBTK_BUSYB_FALSE (1). config KEMBTK_BUSYB_FOLD bool "fold" + default y help Wrap text to fit a specific width. config KEMBTK_BUSYB_FSYNC bool "fsync" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help fsync is used to flush file-related cached blocks to disk. config KEMBTK_BUSYB_HEAD bool "head" + default y help head is used to print the first specified number of lines from files. config KEMBTK_BUSYB_FEATURE_FANCY_HEAD bool "Enable head options (-c, -q, and -v)" + default y depends on KEMBTK_BUSYB_HEAD help This enables the head options (-c, -q, and -v). config KEMBTK_BUSYB_HOSTID bool "hostid" + default y help hostid prints the numeric identifier (in hexadecimal) for the current host. config KEMBTK_BUSYB_ID bool "id" + default y help id displays the current user and group KEMBTK_BUSYB_ID names. config KEMBTK_BUSYB_INSTALL bool "install" + default y help Copy files and set attributes. config KEMBTK_BUSYB_FEATURE_INSTALL_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_INSTALL && KEMBTK_BUSYB_LONG_OPTS help Support long options for the install applet. config KEMBTK_BUSYB_LENGTH bool "length" + default y help length is used to print out the length of a specified string. config KEMBTK_BUSYB_LN bool "ln" + default y help ln is used to create hard or soft links between files. config KEMBTK_BUSYB_LOGNAME bool "logname" + default y help logname is used to print the current user's login name. config KEMBTK_BUSYB_LS bool "ls" + default y help ls is used to list the contents of directories. @@ -374,6 +465,7 @@ config KEMBTK_BUSYB_FEATURE_LS_COLOR config KEMBTK_BUSYB_FEATURE_LS_COLOR_IS_DEFAULT bool "Produce colored ls output by default" + default y depends on KEMBTK_BUSYB_FEATURE_LS_COLOR help Saying yes here will turn coloring on by default, @@ -384,104 +476,123 @@ config KEMBTK_BUSYB_FEATURE_LS_COLOR_IS_DEFAULT config KEMBTK_BUSYB_MD5SUM bool "md5sum" + default y help md5sum is used to print or check MD5 checksums. config KEMBTK_BUSYB_MKDIR bool "mkdir" + default y help mkdir is used to create directories with the specified names. config KEMBTK_BUSYB_FEATURE_MKDIR_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_MKDIR && KEMBTK_BUSYB_LONG_OPTS help Support long options for the mkdir applet. config KEMBTK_BUSYB_MKFIFO bool "mkfifo" + default y help mkfifo is used to create FIFOs (named pipes). The `mknod' program can also create FIFOs. config KEMBTK_BUSYB_MKNOD bool "mknod" + default y help mknod is used to create FIFOs or block/character special files with the specified names. config KEMBTK_BUSYB_MV bool "mv" + default y help mv is used to move or rename files or directories. config KEMBTK_BUSYB_FEATURE_MV_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_MV && KEMBTK_BUSYB_LONG_OPTS help Support long options for the mv applet. config KEMBTK_BUSYB_NICE bool "nice" + default y help nice runs a program with modified scheduling priority. config KEMBTK_BUSYB_NOHUP bool "nohup" + default y help run a command immune to hangups, with output to a non-tty. config KEMBTK_BUSYB_OD bool "od" + default y help od is used to dump binary files in octal and other formats. config KEMBTK_BUSYB_PRINTENV bool "printenv" + default y help printenv is used to print all or part of environment. config KEMBTK_BUSYB_PRINTF bool "printf" + default y help printf is used to format and print specified strings. It's similar to `echo' except it has more options. config KEMBTK_BUSYB_PWD bool "pwd" + default y help pwd is used to print the current directory. config KEMBTK_BUSYB_READLINK bool "readlink" + default y help This program reads a symbolic link and returns the name of the file it points to config KEMBTK_BUSYB_FEATURE_READLINK_FOLLOW bool "Enable canonicalization by following all symlinks (-f)" + default y depends on KEMBTK_BUSYB_READLINK help Enable the readlink option (-f). config KEMBTK_BUSYB_REALPATH bool "realpath" + default y help Return the canonicalized absolute pathname. This isn't provided by GNU shellutils, but where else does it belong. config KEMBTK_BUSYB_RM bool "rm" + default y help rm is used to remove files or directories. config KEMBTK_BUSYB_RMDIR bool "rmdir" + default y help rmdir is used to remove empty directories. config KEMBTK_BUSYB_FEATURE_RMDIR_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_RMDIR && KEMBTK_BUSYB_LONG_OPTS help Support long options for the rmdir applet, including @@ -489,28 +600,33 @@ config KEMBTK_BUSYB_FEATURE_RMDIR_LONG_OPTIONS config KEMBTK_BUSYB_SEQ bool "seq" + default y help print a sequence of numbers config KEMBTK_BUSYB_SHA1SUM bool "sha1sum" + default y help Compute and check SHA1 message digest 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 + 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 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 + 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 help Compute and check SHA512 message digest config KEMBTK_BUSYB_SLEEP bool "sleep" + default y help sleep is used to pause for a specified number of seconds. It comes in 3 versions: @@ -524,18 +640,21 @@ config KEMBTK_BUSYB_SLEEP config KEMBTK_BUSYB_FEATURE_FANCY_SLEEP bool "Enable multiple arguments and s/m/h/d suffixes" + default y depends on KEMBTK_BUSYB_SLEEP help Allow sleep to pause for specified minutes, hours, and days. config KEMBTK_BUSYB_FEATURE_FLOAT_SLEEP bool "Enable fractional arguments" + default y depends on KEMBTK_BUSYB_FEATURE_FANCY_SLEEP help Allow for fractional numeric parameters. config KEMBTK_BUSYB_SORT bool "sort" + default y help sort is used to sort lines of text in specified files. @@ -553,11 +672,13 @@ config KEMBTK_BUSYB_FEATURE_SORT_BIG config KEMBTK_BUSYB_SPLIT bool "split" + default y help split a file into pieces. config KEMBTK_BUSYB_FEATURE_SPLIT_FANCY bool "Fancy extensions" + default y depends on KEMBTK_BUSYB_SPLIT help Add support for features not required by KEMBTK_BUSYB_SUSv3. @@ -566,11 +687,13 @@ config KEMBTK_BUSYB_FEATURE_SPLIT_FANCY config KEMBTK_BUSYB_STAT bool "stat" + default y help display file or filesystem status. config KEMBTK_BUSYB_FEATURE_STAT_FORMAT bool "Enable custom formats (-c)" + default y depends on KEMBTK_BUSYB_STAT help Without this, stat will not support the '-c format' option where @@ -579,26 +702,31 @@ config KEMBTK_BUSYB_FEATURE_STAT_FORMAT config KEMBTK_BUSYB_STTY bool "stty" + default y help stty is used to change and print terminal line settings. config KEMBTK_BUSYB_SUM bool "sum" + default y help checksum and count the blocks in a file config KEMBTK_BUSYB_SYNC bool "sync" + default y help sync is used to flush filesystem buffers. config KEMBTK_BUSYB_TAC bool "tac" + default y help tac is used to concatenate and print files in reverse. config KEMBTK_BUSYB_TAIL bool "tail" + default y help tail is used to print the last specified number of lines from files. @@ -611,133 +739,118 @@ config KEMBTK_BUSYB_FEATURE_FANCY_TAIL The options (-q, -s, and -v) are provided by GNU tail, but are not specific in the KEMBTK_BUSYB_SUSv3 standard. + -q Never output headers giving file names + -s SEC Wait SEC seconds between reads with -f + -v Always output headers giving file names + config KEMBTK_BUSYB_TEE bool "tee" + default y help tee is used to read from standard input and write to standard output and files. config KEMBTK_BUSYB_FEATURE_TEE_USE_BLOCK_IO bool "Enable block I/O (larger/faster) instead of byte I/O" + default y depends on KEMBTK_BUSYB_TEE help Enable this option for a faster tee, at expense of size. -config KEMBTK_BUSYB_TEST - bool "test" - help - test is used to check file types and compare values, - returning an appropriate exit code. The bash shell - has test built in, ash can build it in optionally. - -config KEMBTK_BUSYB_FEATURE_TEST_64 - bool "Extend test to 64 bit" - depends on KEMBTK_BUSYB_TEST || KEMBTK_BUSYB_ASH_BUILTIN_TEST || KEMBTK_BUSYB_HUSH - help - Enable 64-bit support in test. - config KEMBTK_BUSYB_TOUCH bool "touch" + default y help touch is used to create or change the access and/or modification timestamp of specified files. -config KEMBTK_BUSYB_TR - bool "tr" - help - tr is used to squeeze, and/or delete characters from standard - input, writing to standard output. - -config KEMBTK_BUSYB_FEATURE_TR_CLASSES - bool "Enable character classes (such as [:upper:])" - depends on KEMBTK_BUSYB_TR - help - Enable character classes, enabling commands such as: - tr [:upper:] [:lower:] to convert input into lowercase. - -config KEMBTK_BUSYB_FEATURE_TR_EQUIV - bool "Enable equivalence classes" - depends on KEMBTK_BUSYB_TR - help - Enable equivalence classes, which essentially add the enclosed - character to the current set. For instance, tr [=a=] xyz would - 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_TRUE bool "true" + default y help true returns an exit code of KEMBTK_BUSYB_TRUE (0). config KEMBTK_BUSYB_TTY bool "tty" + default y help tty is used to print the name of the current terminal to standard output. config KEMBTK_BUSYB_UNAME bool "uname" + default y help uname is used to print system information. config KEMBTK_BUSYB_UNEXPAND bool "unexpand" + default y help By default, convert only leading sequences of blanks to tabs. config KEMBTK_BUSYB_FEATURE_UNEXPAND_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_UNEXPAND && KEMBTK_BUSYB_LONG_OPTS help Support long options for the unexpand applet. config KEMBTK_BUSYB_UNIQ bool "uniq" + default y help uniq is used to remove duplicate lines from a sorted file. config KEMBTK_BUSYB_USLEEP bool "usleep" + default y help usleep is used to pause for a specified number of microseconds. config KEMBTK_BUSYB_UUDECODE bool "uudecode" + default y help uudecode is used to decode a uuencoded file. config KEMBTK_BUSYB_UUENCODE bool "uuencode" + default y help uuencode is used to uuencode a file. config KEMBTK_BUSYB_WC bool "wc" + default y help wc is used to print the number of bytes, words, and lines, in specified files. config KEMBTK_BUSYB_FEATURE_WC_LARGE bool "Support very large files in wc" + default y depends on KEMBTK_BUSYB_WC help Use "unsigned long long" in wc for counter variables. config KEMBTK_BUSYB_WHO bool "who" - select KEMBTK_BUSYB_FEATURE_UTMP + default y + depends on KEMBTK_BUSYB_FEATURE_UTMP help who is used to show who is logged on. config KEMBTK_BUSYB_WHOAMI bool "whoami" + default y help whoami is used to print the username of the current user id (same as id -un). config KEMBTK_BUSYB_YES bool "yes" + default y help yes is used to repeatedly output a specific string, or the default string `y'. @@ -747,6 +860,7 @@ comment "Common options for cp and mv" config KEMBTK_BUSYB_FEATURE_PRESERVE_HARDLINKS bool "Preserve hard links" + default y depends on KEMBTK_BUSYB_CP || KEMBTK_BUSYB_MV help Allow cp and mv to preserve hard links. @@ -770,6 +884,7 @@ comment "Common options for df, du, ls" config KEMBTK_BUSYB_FEATURE_HUMAN_READABLE bool "Support for human readable output (example 13k, 23M, 235G)" + default y depends on KEMBTK_BUSYB_DF || KEMBTK_BUSYB_DU || KEMBTK_BUSYB_LS help Allow df, du, and ls to have human readable output. @@ -779,6 +894,7 @@ comment "Common options for md5sum, sha1sum, sha256sum, sha512sum" config KEMBTK_BUSYB_FEATURE_MD5_SHA1_SUM_CHECK bool "Enable -c, -s and -w options" + default y depends on KEMBTK_BUSYB_MD5SUM || KEMBTK_BUSYB_SHA1SUM || KEMBTK_BUSYB_SHA256SUM || KEMBTK_BUSYB_SHA512SUM help Enabling the -c options allows files to be checked diff --git a/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig index ffe99e0..0eb71d0 100644 --- a/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig @@ -7,18 +7,23 @@ comment "-------------------------------------------------" comment "Debian Utilities" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_MKTEMP bool "mktemp" + default y help mktemp is used to create unique temporary files config KEMBTK_BUSYB_PIPE_PROGRESS bool "pipe_progress" + default y help Display a dot to indicate pipe activity. config KEMBTK_BUSYB_RUN_PARTS bool "run-parts" + default y help run-parts is a utility designed to run all the scripts in a directory. @@ -33,12 +38,14 @@ config KEMBTK_BUSYB_RUN_PARTS config KEMBTK_BUSYB_FEATURE_RUN_PARTS_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_RUN_PARTS && KEMBTK_BUSYB_LONG_OPTS help Support long options for the run-parts applet. config KEMBTK_BUSYB_FEATURE_RUN_PARTS_FANCY bool "Support additional arguments" + default y depends on KEMBTK_BUSYB_RUN_PARTS help Support additional options: @@ -47,6 +54,7 @@ config KEMBTK_BUSYB_FEATURE_RUN_PARTS_FANCY config KEMBTK_BUSYB_START_STOP_DAEMON bool "start-stop-daemon" + default y help start-stop-daemon is used to control the creation and termination of system-level processes, usually the ones @@ -54,6 +62,7 @@ config KEMBTK_BUSYB_START_STOP_DAEMON config KEMBTK_BUSYB_FEATURE_START_STOP_DAEMON_FANCY bool "Support additional arguments" + default y depends on KEMBTK_BUSYB_START_STOP_DAEMON help Support additional arguments. @@ -63,14 +72,15 @@ config KEMBTK_BUSYB_FEATURE_START_STOP_DAEMON_FANCY config KEMBTK_BUSYB_FEATURE_START_STOP_DAEMON_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_START_STOP_DAEMON && KEMBTK_BUSYB_LONG_OPTS help Support long options for the start-stop-daemon applet. config KEMBTK_BUSYB_WHICH bool "which" + default y help which is used to find programs in your PATH and print out their pathnames. - diff --git a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig index 44ae857..2971d64 100644 --- a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig @@ -7,6 +7,8 @@ comment "-------------------------------------------------" comment "Linux Ext2 FS Progs" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_CHATTR bool "chattr" help diff --git a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig index afe5812..268e307 100644 --- a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig @@ -7,13 +7,17 @@ comment "-------------------------------------------------" comment "Linux Ext2 FS Progs" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_CHATTR bool "chattr" + default y help chattr changes the file attributes on a second extended file system. ### config KEMBTK_BUSYB_E2FSCK ### bool "e2fsck" +### default y ### help ### e2fsck is used to check Linux second extended file systems (ext2fs). ### e2fsck also supports ext2 filesystems countaining a journal (ext3). @@ -22,6 +26,7 @@ config KEMBTK_BUSYB_CHATTR config KEMBTK_BUSYB_FSCK bool "fsck" + default y help fsck is used to check and optionally repair one or more filesystems. In actuality, fsck is simply a front-end for the various file system @@ -29,23 +34,26 @@ config KEMBTK_BUSYB_FSCK config KEMBTK_BUSYB_LSATTR bool "lsattr" + default y help lsattr lists the file attributes on a second extended file system. ### config KEMBTK_BUSYB_MKE2FS ### bool "mke2fs" +### default y ### help ### mke2fs is used to create an ext2/ext3 filesystem. The normal compat ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. -### config KEMBTK_BUSYB_TUNE2FS -### bool "tune2fs" -### help -### tune2fs allows the system administrator to adjust various tunable -### filesystem parameters on Linux ext2/ext3 filesystems. +config KEMBTK_BUSYB_TUNE2FS + bool "tune2fs" + help + tune2fs allows the system administrator to adjust various tunable + filesystem parameters on Linux ext2/ext3 filesystems. ### config KEMBTK_BUSYB_E2LABEL ### bool "e2label" +### default y ### depends on KEMBTK_BUSYB_TUNE2FS ### help ### e2label will display or change the filesystem label on the ext2 @@ -54,6 +62,7 @@ config KEMBTK_BUSYB_LSATTR ### NB: this one is now provided by util-linux/volume_id/* ### config KEMBTK_BUSYB_FINDFS ### bool "findfs" +### default y ### depends on KEMBTK_BUSYB_TUNE2FS ### help ### findfs will search the disks in the system looking for a filesystem diff --git a/packages/busybox/busybox-kconfigs/busybox-editors.kconfig b/packages/busybox/busybox-kconfigs/busybox-editors.kconfig index f12eb02..9e2bf49 100644 --- a/packages/busybox/busybox-kconfigs/busybox-editors.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-editors.kconfig @@ -7,14 +7,18 @@ comment "-------------------------------------------------" comment "Editors" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_AWK bool "awk" + default y help Awk is used as a pattern scanning and processing language. This is the BusyBox implementation of that programming language. config KEMBTK_BUSYB_FEATURE_AWK_LIBM bool "Enable math functions (requires libm)" + default y depends on KEMBTK_BUSYB_AWK help Enable math functions of the Awk programming language. @@ -22,12 +26,14 @@ config KEMBTK_BUSYB_FEATURE_AWK_LIBM config KEMBTK_BUSYB_CMP bool "cmp" + default y help cmp is used to compare two files and returns the result to standard output. config KEMBTK_BUSYB_DIFF bool "diff" + default y help diff compares two files or directories and outputs the differences between them in a form that can be given to @@ -39,13 +45,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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help Enable use of long options. @@ -58,15 +65,16 @@ config KEMBTK_BUSYB_FEATURE_DIFF_DIR comparison. config KEMBTK_BUSYB_FEATURE_DIFF_MINIMAL - bool "Enable -d option to find smaller sets of changes" - depends on KEMBTK_BUSYB_DIFF - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X - help - Enabling this option allows the use of -d to make diff - try hard to find the smallest possible set of changes. + bool "Enable -d option to find smaller sets of changes" + depends on KEMBTK_BUSYB_DIFF + depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X + help + Enabling this option allows the use of -d to make diff + try hard to find the smallest possible set of changes. config KEMBTK_BUSYB_ED bool "ed" + default y help The original 1970's Unix text editor, from the days of teletypes. Small, simple, evil. Part of KEMBTK_BUSYB_SUSv3. If you're not already using @@ -74,17 +82,20 @@ config KEMBTK_BUSYB_ED config KEMBTK_BUSYB_PATCH bool "patch" + default y help Apply a unified diff formatted patch. config KEMBTK_BUSYB_SED bool "sed" + default y help sed is used to perform text transformations on a file or input from a pipeline. config KEMBTK_BUSYB_VI bool "vi" + default y help 'vi' is a text editor. More specifically, it is the One True text editor . It does, however, have a rather steep @@ -102,7 +113,6 @@ config KEMBTK_BUSYB_FEATURE_VI_MAX_LEN config KEMBTK_BUSYB_FEATURE_VI_8BIT bool "Allow vi to display 8-bit chars (otherwise shows dots)" - default y depends on KEMBTK_BUSYB_VI help If your terminal can display characters with high bit set, @@ -179,6 +189,19 @@ config KEMBTK_BUSYB_FEATURE_VI_WIN_RESIZE help Make busybox vi behave nicely with terminals that get resized. +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 + 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: + vi positions cursor to 999,999 and asks terminal to report real + cursor position using "ESC [ 6 n" escape sequence, then reads stdin. + + This is not clean but helps a lot on serial lines and such. + config KEMBTK_BUSYB_FEATURE_VI_OPTIMIZE_CURSOR bool "Optimize cursor movement" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig index 3315f55..ddaa865 100644 --- a/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig @@ -9,6 +9,7 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_FIND bool "find" + default y help find is used to search your system to find specified files. @@ -144,6 +145,7 @@ config KEMBTK_BUSYB_FEATURE_FIND_PRUNE config KEMBTK_BUSYB_FEATURE_FIND_DELETE bool "Enable -delete: delete files/dirs" + default y depends on KEMBTK_BUSYB_FIND && KEMBTK_BUSYB_FEATURE_FIND_DEPTH help Support the 'find -delete' option for deleting files and directories. @@ -173,12 +175,13 @@ 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help Support the 'find -links' option for matching number of links. - config KEMBTK_BUSYB_GREP bool "grep" + default y help grep is used to search files for a specified pattern. @@ -208,15 +211,16 @@ config KEMBTK_BUSYB_FEATURE_GREP_CONTEXT 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 KEMBTK_BUSYB_XARGS bool "xargs" + default y help xargs is used to execute a specified command for every item from standard input. config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_CONFIRMATION bool "Enable -p: prompt and confirmation" + default y depends on KEMBTK_BUSYB_XARGS help Support -p: prompt the user whether to run each command @@ -224,12 +228,14 @@ config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_CONFIRMATION config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_QUOTES bool "Enable single and double quotes and backslash" + default y depends on KEMBTK_BUSYB_XARGS help Support quoting in the input. config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_TERMOPT bool "Enable -x: exit if -s or -n is exceeded" + default y depends on KEMBTK_BUSYB_XARGS help Support -x: exit if the command size (see the -s or -n option) @@ -237,6 +243,7 @@ config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_TERMOPT config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_ZERO_TERM bool "Enable -0: NUL-terminated input" + default y depends on KEMBTK_BUSYB_XARGS help Support -0: input items are terminated by a NUL character diff --git a/packages/busybox/busybox-kconfigs/busybox-init.kconfig b/packages/busybox/busybox-kconfigs/busybox-init.kconfig index c22133c..bbcce9f 100644 --- a/packages/busybox/busybox-kconfigs/busybox-init.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-init.kconfig @@ -7,8 +7,49 @@ comment "-------------------------------------------------" comment "Init Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_BOOTCHARTD + bool "bootchartd" + depends on EMBTK_BB_VERSION_1_17_X + default y + help + bootchartd is commonly used to profile the boot process + for the purpose of speeding it up. In this case, it is started + by the kernel as the init process. This is configured by adding + the init=/sbin/bootchartd option to the kernel command line. + + It can also be used to monitor the resource usage of a specific + application or the running system in general. In this case, + bootchartd is started interactively by running bootchartd start + and stopped using bootchartd stop. + +config KEMBTK_BUSYB_FEATURE_BOOTCHARTD_BLOATED_HEADER + bool "Compatible, bloated header" + default y + depends on KEMBTK_BUSYB_BOOTCHARTD + help + Create extended header file compatible with "big" bootchartd. + "Big" bootchartd is a shell script and it dumps some + "convenient" info int the header, such as: + title = Boot chart for `hostname` (`date`) + system.uname = `uname -srvm` + system.release = `cat /etc/DISTRO-release` + system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount) + system.kernel.options = `cat /proc/cmdline` + This data is not mandatory for bootchart graph generation, + and is considered bloat. Nevertheless, this option + makes bootchartd applet to dump a subset of it. + +config KEMBTK_BUSYB_FEATURE_BOOTCHARTD_CONFIG_FILE + bool "Support bootchartd.conf" + default y + depends on KEMBTK_BUSYB_BOOTCHARTD + help + Enable reading and parsing of $PWD/bootchartd.conf + and /etc/bootchartd.conf files. + config KEMBTK_BUSYB_INIT bool "init" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help init is the first program run when the system boots. @@ -22,12 +63,11 @@ config KEMBTK_BUSYB_FEATURE_USE_INITTAB config KEMBTK_BUSYB_FEATURE_KILL_REMOVED bool "Support killing processes that have been removed from inittab" - default y depends on KEMBTK_BUSYB_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. + sent to init, this option will make init kill the processes + that have been removed. config KEMBTK_BUSYB_FEATURE_KILL_DELAY int "How long to wait between TERM and KEMBTK_BUSYB_KILL (0 - send TERM only)" if KEMBTK_BUSYB_FEATURE_KILL_REMOVED @@ -42,6 +82,7 @@ config KEMBTK_BUSYB_FEATURE_KILL_DELAY config KEMBTK_BUSYB_FEATURE_INIT_SCTTY bool "Run commands with leading dash with controlling tty" + default y depends on KEMBTK_BUSYB_INIT help If this option is enabled, init will try to give a controlling @@ -56,6 +97,7 @@ config KEMBTK_BUSYB_FEATURE_INIT_SCTTY config KEMBTK_BUSYB_FEATURE_INIT_SYSLOG bool "Enable init to write to syslog" + default y depends on KEMBTK_BUSYB_INIT config KEMBTK_BUSYB_FEATURE_EXTRA_QUIET @@ -67,6 +109,7 @@ config KEMBTK_BUSYB_FEATURE_EXTRA_QUIET config KEMBTK_BUSYB_FEATURE_INIT_COREDUMPS bool "Support dumping core for child processes (debugging only)" + default y depends on KEMBTK_BUSYB_INIT help If this option is enabled and the file /.init_enable_core @@ -87,13 +130,15 @@ config KEMBTK_BUSYB_FEATURE_INITRD 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 + 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. @@ -112,6 +157,7 @@ config KEMBTK_BUSYB_TELINIT_PATH config KEMBTK_BUSYB_MESG bool "mesg" + default y help Mesg controls access to your terminal by others. It is typically used to allow or disallow other users to write to your terminal diff --git a/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig b/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig index 72d563a..870bcf4 100644 --- a/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig @@ -7,6 +7,8 @@ comment "-------------------------------------------------" comment "Busybox Library Tuning" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_PASSWORD_MINLEN int "Minimum password length" default 6 @@ -30,6 +32,7 @@ config KEMBTK_BUSYB_MD5_SIZE_VS_SPEED config KEMBTK_BUSYB_FEATURE_FAST_TOP bool "Faster /proc scanning code (+100 bytes)" + default y help This option makes top (and ps) ~20% faster (or 20% less KEMBTK_BUSYB_CPU hungry), but code size is slightly bigger. @@ -43,6 +46,7 @@ config KEMBTK_BUSYB_FEATURE_ETC_NETWORKS config KEMBTK_BUSYB_FEATURE_EDITING bool "Command line editing" + default y help Enable line editing (mainly for shell command line). @@ -66,19 +70,21 @@ config KEMBTK_BUSYB_FEATURE_EDITING_VI config KEMBTK_BUSYB_FEATURE_EDITING_HISTORY int "History size" range 0 99999 - default 15 + default 255 depends on KEMBTK_BUSYB_FEATURE_EDITING help Specify command history size. config KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY bool "History saving" + default y depends on KEMBTK_BUSYB_ASH && KEMBTK_BUSYB_FEATURE_EDITING help Enable history saving in ash shell. config KEMBTK_BUSYB_FEATURE_TAB_COMPLETION bool "Tab completion" + default y depends on KEMBTK_BUSYB_FEATURE_EDITING help Enable tab completion. @@ -91,6 +97,7 @@ config KEMBTK_BUSYB_FEATURE_USERNAME_COMPLETION config KEMBTK_BUSYB_FEATURE_EDITING_FANCY_PROMPT bool "Fancy shell prompts" + default y depends on KEMBTK_BUSYB_FEATURE_EDITING help Setting this option allows for prompts to use things like \w and @@ -99,7 +106,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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Allow usage of "ESC [ 6 n" sequence. Terminal answers back with current cursor position. This information is used to make line @@ -110,7 +117,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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y help With this option, "cp file symlink" will delete symlink @@ -144,7 +151,6 @@ config KEMBTK_BUSYB_FEATURE_COPYBUF_KB config KEMBTK_BUSYB_MONOTONIC_SYSCALL bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" - default y 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 6b1ad2b..d0afc38 100644 --- a/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig @@ -7,8 +7,11 @@ comment "-------------------------------------------------" comment "Login/Password Management Utilities" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" + default y help Build support for shadow password in /etc/shadow. This file is only readable by root and thus the encrypted passwords are no longer @@ -16,6 +19,7 @@ config KEMBTK_BUSYB_FEATURE_SHADOWPASSWDS config KEMBTK_BUSYB_USE_BB_PWD_GRP bool "Use internal password and group functions rather than system functions" + default y 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 @@ -81,8 +85,9 @@ config KEMBTK_BUSYB_USE_BB_CRYPT 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 + 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 help Enable this if you have passwords starting with "$5$" or "$6$" in your /etc/passwd or /etc/shadow files. These passwords @@ -93,18 +98,21 @@ config KEMBTK_BUSYB_USE_BB_CRYPT_SHA 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 + 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, @@ -113,11 +121,13 @@ config KEMBTK_BUSYB_FEATURE_ADDUSER_TO_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 help If called with two non-option arguments, deluser @@ -136,11 +146,13 @@ config KEMBTK_BUSYB_FEATURE_CHECK_NAMES 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. @@ -148,7 +160,7 @@ config KEMBTK_BUSYB_FEATURE_ADDUSER_LONG_OPTIONS 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X range 0 64900 default 100 help @@ -157,7 +169,7 @@ 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X range 0 64900 default 999 help @@ -165,31 +177,20 @@ config KEMBTK_BUSYB_LAST_SYSTEM_ID config KEMBTK_BUSYB_DELUSER bool "deluser" + default y help Utility for deleting a user account. config KEMBTK_BUSYB_GETTY bool "getty" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help getty lets you log in on a tty, it is normally invoked by init. -config KEMBTK_BUSYB_FEATURE_UTMP - bool "Support utmp file" - depends on KEMBTK_BUSYB_GETTY || KEMBTK_BUSYB_LOGIN || KEMBTK_BUSYB_SU || KEMBTK_BUSYB_WHO - help - The file /var/run/utmp is used to track who is currently logged in. - -config KEMBTK_BUSYB_FEATURE_WTMP - bool "Support wtmp file" - depends on KEMBTK_BUSYB_GETTY || KEMBTK_BUSYB_LOGIN || KEMBTK_BUSYB_SU || KEMBTK_BUSYB_LAST - select KEMBTK_BUSYB_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 KEMBTK_BUSYB_LOGIN bool "login" + default y select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help @@ -207,6 +208,7 @@ config KEMBTK_BUSYB_PAM config KEMBTK_BUSYB_LOGIN_SCRIPTS bool "Support for login scripts" depends on KEMBTK_BUSYB_LOGIN + default y help Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT just prior to switching from root to logged-in user. @@ -230,6 +232,7 @@ config KEMBTK_BUSYB_FEATURE_SECURETTY config KEMBTK_BUSYB_PASSWD bool "passwd" + default y select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help @@ -250,6 +253,7 @@ config KEMBTK_BUSYB_FEATURE_PASSWD_WEAK_CHECK config KEMBTK_BUSYB_CRYPTPW bool "cryptpw" + default y help Encrypts the given password with the crypt(3) libc function using the given salt. Debian has this utility under mkpasswd @@ -257,12 +261,14 @@ config KEMBTK_BUSYB_CRYPTPW config KEMBTK_BUSYB_CHPASSWD bool "chpasswd" + default y help Reads a file of user name and password pairs from standard input and uses this information to update a group of existing users. config KEMBTK_BUSYB_SU bool "su" + default y select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help @@ -284,6 +290,7 @@ config KEMBTK_BUSYB_FEATURE_SU_CHECKS_SHELLS config KEMBTK_BUSYB_SULOGIN bool "sulogin" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help sulogin is invoked when the system goes into single user @@ -291,6 +298,7 @@ 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-mailutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-mailutils.kconfig index 823bc9a..4b5d6dd 100644 --- a/packages/busybox/busybox-kconfigs/busybox-mailutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-mailutils.kconfig @@ -2,8 +2,11 @@ comment "-------------------------------------------------" comment "Mail Utilities" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_MAKEMIME bool "makemime" + default y help Create MIME-formatted messages. @@ -16,12 +19,14 @@ config KEMBTK_BUSYB_FEATURE_MIME_CHARSET config KEMBTK_BUSYB_POPMAILDIR bool "popmaildir" + default y help Simple yet powerful POP3 mail popper. Delivers content of remote mailboxes to local Maildir. config KEMBTK_BUSYB_FEATURE_POPMAILDIR_DELIVERY bool "Allow message filters and custom delivery program" + default y depends on KEMBTK_BUSYB_POPMAILDIR help Allow to use a custom program to filter the content @@ -31,6 +36,7 @@ config KEMBTK_BUSYB_FEATURE_POPMAILDIR_DELIVERY config KEMBTK_BUSYB_REFORMIME bool "reformime" + default y help Parse MIME-formatted messages. @@ -44,6 +50,7 @@ config KEMBTK_BUSYB_FEATURE_REFORMIME_COMPAT config KEMBTK_BUSYB_SENDMAIL bool "sendmail" + default y help Barebones sendmail. diff --git a/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig index b53075b..506ea45 100644 --- a/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig @@ -7,8 +7,29 @@ comment "-------------------------------------------------" comment "Miscellaneous Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_CONSPY + bool "conspy" + depends on EMBTK_BB_VERSION_1_17_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_UBIATTACH + bool "ubiattach" + depends on EMBTK_BB_VERSION_1_17_X + help + Attach KEMBTK_BUSYB_MTD device to an UBI device. + +config KEMBTK_BUSYB_UBIDETACH + bool "ubidetach" + depends on EMBTK_BB_VERSION_1_17_X + help + Detach KEMBTK_BUSYB_MTD device from an UBI device. + config KEMBTK_BUSYB_ADJTIMEX bool "adjtimex" + default y help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. @@ -21,7 +42,8 @@ config KEMBTK_BUSYB_BBCONFIG config KEMBTK_BUSYB_BEEP bool "beep" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help The beep applets beeps in a given freq/Hz. @@ -43,6 +65,7 @@ config KEMBTK_BUSYB_FEATURE_BEEP_LENGTH_MS config KEMBTK_BUSYB_CHAT bool "chat" + default y help Simple chat utility. @@ -75,6 +98,7 @@ config KEMBTK_BUSYB_FEATURE_CHAT_IMPLICIT_CR config KEMBTK_BUSYB_FEATURE_CHAT_SWALLOW_OPTS bool "Swallow options" depends on KEMBTK_BUSYB_CHAT + default y 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 @@ -83,6 +107,7 @@ config KEMBTK_BUSYB_FEATURE_CHAT_SWALLOW_OPTS config KEMBTK_BUSYB_FEATURE_CHAT_SEND_ESCAPES bool "Support weird SEND escapes" depends on KEMBTK_BUSYB_CHAT + default y help Original chat uses some escape sequences in SEND arguments which are not sent to device but rather performs special actions. @@ -93,23 +118,27 @@ config KEMBTK_BUSYB_FEATURE_CHAT_SEND_ESCAPES config KEMBTK_BUSYB_FEATURE_CHAT_VAR_ABORT_LEN bool "Support variable-length ABORT conditions" depends on KEMBTK_BUSYB_CHAT + default y help Original chat uses fixed 50-bytes length ABORT conditions. Say N here. config KEMBTK_BUSYB_FEATURE_CHAT_CLR_ABORT bool "Support revoking of ABORT conditions" depends on KEMBTK_BUSYB_CHAT + default y help Support CLR_ABORT directive. config KEMBTK_BUSYB_CHRT bool "chrt" + default y help manipulate real-time attributes of a process. This requires sched_{g,s}etparam support in your libc. config KEMBTK_BUSYB_CROND bool "crond" + default y select KEMBTK_BUSYB_FEATURE_SUID select KEMBTK_BUSYB_FEATURE_SYSLOG help @@ -124,11 +153,13 @@ config KEMBTK_BUSYB_CROND config KEMBTK_BUSYB_FEATURE_CROND_D bool "Support option -d to redirect output to stderr" depends on KEMBTK_BUSYB_CROND + default y help -d sets loglevel to 0 (most verbose) and directs all output to stderr. config KEMBTK_BUSYB_FEATURE_CROND_CALL_SENDMAIL bool "Report command output via email (using sendmail)" + default y depends on KEMBTK_BUSYB_CROND help Command output will be sent to corresponding user via email. @@ -137,12 +168,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 + 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 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 @@ -152,12 +184,14 @@ config KEMBTK_BUSYB_CRONTAB config KEMBTK_BUSYB_DC bool "dc" + default y help Dc is a reverse-polish desk calculator which supports unlimited precision arithmetic. config KEMBTK_BUSYB_FEATURE_DC_LIBM bool "Enable power and exp functions (requires libm)" + default y depends on KEMBTK_BUSYB_DC help Enable power and exp functions. @@ -183,6 +217,7 @@ config KEMBTK_BUSYB_DEVFSD config KEMBTK_BUSYB_DEVFSD_MODLOAD bool "Adds support for MODLOAD keyword in devsfd.conf" + default y depends on KEMBTK_BUSYB_DEVFSD help This actually doesn't work with busybox modutils but needs @@ -190,6 +225,7 @@ config KEMBTK_BUSYB_DEVFSD_MODLOAD config KEMBTK_BUSYB_DEVFSD_FG_NP bool "Enables the -fg and -np options" + default y depends on KEMBTK_BUSYB_DEVFSD help -fg Run the daemon in the foreground. @@ -198,6 +234,7 @@ config KEMBTK_BUSYB_DEVFSD_FG_NP config KEMBTK_BUSYB_DEVFSD_VERBOSE bool "Increases logging (and size)" + default y depends on KEMBTK_BUSYB_DEVFSD help Increases logging to stderr or syslog. @@ -215,17 +252,20 @@ config KEMBTK_BUSYB_FEATURE_DEVFS config KEMBTK_BUSYB_DEVMEM bool "devmem" + default y help devmem is a small program that reads and writes from physical memory using /dev/mem. config KEMBTK_BUSYB_EJECT bool "eject" + default y help Used to eject cdroms. (defaults to /dev/cdrom) config KEMBTK_BUSYB_FEATURE_EJECT_SCSI bool "SCSI support" + default y depends on KEMBTK_BUSYB_EJECT help Add the -s option to eject, this allows to eject SCSI-Devices and @@ -233,6 +273,7 @@ config KEMBTK_BUSYB_FEATURE_EJECT_SCSI config KEMBTK_BUSYB_FBSPLASH bool "fbsplash" + default y help Shows splash image and progress bar on framebuffer device. Can be used during boot phase of an embedded device. ~2kb. @@ -253,35 +294,35 @@ config KEMBTK_BUSYB_FBSPLASH config KEMBTK_BUSYB_FLASHCP bool "flashcp" - depends on EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X 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" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X 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 + 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 help Set/set program io scheduling class and priority Requires kernel >= 2.6.13 @@ -294,7 +335,8 @@ config KEMBTK_BUSYB_INOTIFYD config KEMBTK_BUSYB_LAST bool "last" - select KEMBTK_BUSYB_FEATURE_WTMP + default y + depends on KEMBTK_BUSYB_FEATURE_WTMP help 'last' displays a list of the last users that logged into the system. @@ -317,6 +359,7 @@ endchoice config KEMBTK_BUSYB_LESS bool "less" + default y help 'less' is a pager, meaning that it displays text files. It possesses a wide array of features, and is an improvement over 'more'. @@ -346,24 +389,28 @@ config KEMBTK_BUSYB_FEATURE_LESS_FLAGS config KEMBTK_BUSYB_FEATURE_LESS_MARKS bool "Enable marks" + default y depends on KEMBTK_BUSYB_LESS help Marks enable positions in a file to be stored for easy reference. config KEMBTK_BUSYB_FEATURE_LESS_REGEXP bool "Enable regular expressions" + default y depends on KEMBTK_BUSYB_LESS help Enable regular expressions, allowing complex file searches. config KEMBTK_BUSYB_FEATURE_LESS_WINCH bool "Enable automatic resizing on window size changes" + default y depends on KEMBTK_BUSYB_LESS help Makes less track window size changes. config KEMBTK_BUSYB_FEATURE_LESS_DASHCMD bool "Enable flag changes ('-' command)" + default y depends on KEMBTK_BUSYB_LESS help This enables the ability to change command-line flags within @@ -371,12 +418,14 @@ config KEMBTK_BUSYB_FEATURE_LESS_DASHCMD config KEMBTK_BUSYB_FEATURE_LESS_LINENUMS bool "Enable dynamic switching of line numbers" + default y depends on KEMBTK_BUSYB_FEATURE_LESS_DASHCMD help Enable "-N" command. config KEMBTK_BUSYB_HDPARM bool "hdparm" + default y help Get/Set hard drive parameters. Primarily intended for ATA drives. Adds about 13k (or around 30k if you enable the @@ -394,6 +443,7 @@ config KEMBTK_BUSYB_FEATURE_HDPARM_GET_IDENTITY config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_SCAN_HWIF bool "Register an KEMBTK_BUSYB_IDE interface (DANGEROUS)" + default y depends on KEMBTK_BUSYB_HDPARM help Enables the 'hdparm -R' option to register an KEMBTK_BUSYB_IDE interface. @@ -401,6 +451,7 @@ config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_SCAN_HWIF config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF bool "Un-register an KEMBTK_BUSYB_IDE interface (DANGEROUS)" + default y depends on KEMBTK_BUSYB_HDPARM help Enables the 'hdparm -U' option to un-register an KEMBTK_BUSYB_IDE interface. @@ -408,6 +459,7 @@ config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_DRIVE_RESET bool "Perform device reset (DANGEROUS)" + default y depends on KEMBTK_BUSYB_HDPARM help Enables the 'hdparm -w' option to perform a device reset. @@ -415,6 +467,7 @@ config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_DRIVE_RESET config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_TRISTATE_HWIF bool "Tristate device for hotswap (DANGEROUS)" + default y depends on KEMBTK_BUSYB_HDPARM help Enables the 'hdparm -x' option to tristate device for hotswap, @@ -423,12 +476,14 @@ config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_TRISTATE_HWIF config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_GETSET_DMA bool "Get/set using_dma flag" + default y depends on KEMBTK_BUSYB_HDPARM help Enables the 'hdparm -d' option to get/set using_dma flag. config KEMBTK_BUSYB_MAKEDEVS bool "makedevs" + default y help 'makedevs' is a utility used to create a batch of devices with one command. @@ -459,21 +514,25 @@ endchoice config KEMBTK_BUSYB_MAN bool "man" + default y help Format and display manual pages. config KEMBTK_BUSYB_MICROCOM bool "microcom" + default y help The poor man's minicom utility for chatting with serial port devices. config KEMBTK_BUSYB_MOUNTPOINT bool "mountpoint" + default y help mountpoint checks if the directory is a mountpoint. config KEMBTK_BUSYB_MT bool "mt" + default y help 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 @@ -481,12 +540,14 @@ config KEMBTK_BUSYB_MT config KEMBTK_BUSYB_RAIDAUTORUN bool "raidautorun" + default y help raidautorun tells the kernel md driver to search and start RAID arrays. config KEMBTK_BUSYB_READAHEAD bool "readahead" + default y depends on KEMBTK_BUSYB_LFS help Preload the files listed on the command line into RAM cache so that @@ -501,8 +562,20 @@ config KEMBTK_BUSYB_READAHEAD As readahead(2) blocks until each file has been read, it is best to run this applet as a background job. +config KEMBTK_BUSYB_RFKILL + bool "rfkill" + depends on EMBTK_BB_VERSION_1_17_X + help + Enable/disable wireless devices. + + rfkill list : list all wireless devices + rfkill list bluetooth : list all bluetooth devices + rfkill list 1 : list device corresponding to the given index + rfkill block|unblock wlan : block/unblock all wlan(wifi) devices + config KEMBTK_BUSYB_RUNLEVEL bool "runlevel" + default y help find the current and previous system runlevel. @@ -511,16 +584,19 @@ config KEMBTK_BUSYB_RUNLEVEL config KEMBTK_BUSYB_RX bool "rx" + default y help Receive files using the Xmodem protocol. config KEMBTK_BUSYB_SETSID bool "setsid" + default y help setsid runs a program in a new session config KEMBTK_BUSYB_STRINGS bool "strings" + default y help strings prints the printable character sequences for each file specified. @@ -542,6 +618,7 @@ config KEMBTK_BUSYB_FEATURE_TASKSET_FANCY config KEMBTK_BUSYB_TIME bool "time" + default y help The time command runs the specified program with the given arguments. When the command finishes, time writes a message to standard output @@ -549,13 +626,15 @@ 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 + 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 help Runs a program and watches it. If it does not terminate in specified number of seconds, it is sent a signal. config KEMBTK_BUSYB_TTYSIZE bool "ttysize" + default y 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 @@ -564,18 +643,21 @@ config KEMBTK_BUSYB_TTYSIZE config KEMBTK_BUSYB_VOLNAME bool "volname" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help Prints a CD-ROM volume name. config KEMBTK_BUSYB_WALL bool "wall" - depends on EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help Write a message to all users that are logged in. config KEMBTK_BUSYB_WATCHDOG bool "watchdog" + default y 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 677a518..f5b03d1 100644 --- a/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig @@ -7,8 +7,16 @@ comment "-------------------------------------------------" comment "Linux Module Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_MODINFO + bool "modinfo" + depends on EMBTK_BB_VERSION_1_17_X + default y + help + Show information about a Linux Kernel module + config KEMBTK_BUSYB_MODPROBE_SMALL bool "Simplified modutils" + default y help Simplified modutils. @@ -41,12 +49,14 @@ config KEMBTK_BUSYB_MODPROBE_SMALL config KEMBTK_BUSYB_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE bool "Accept module options on modprobe command line" + default y depends on KEMBTK_BUSYB_MODPROBE_SMALL help Allow insmod and modprobe take module options from command line. config KEMBTK_BUSYB_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED bool "Skip loading of already loaded modules" + default y depends on KEMBTK_BUSYB_MODPROBE_SMALL help Check if the module is already loaded. @@ -115,7 +125,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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help This option causes module loading code to try to mmap module first. If it does not work (for example, diff --git a/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig b/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig index 73fba1f..a6f2079 100644 --- a/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig @@ -4,38 +4,40 @@ # config KEMBTK_BUSYB_APP_UDHCPD - bool - default n - help - backward compatibility for busybox-1.1{3,4,5}.x + bool + default n + help + backward compatibility for busybox-1.1{3,4,5}.x config KEMBTK_BUSYB_APP_DHCPRELAY - bool - default n - help - backward compatibility for busybox-1.1{3,4,5}.x + bool + default n + help + backward compatibility for busybox-1.1{3,4,5}.x config KEMBTK_BUSYB_APP_DUMPLEASES - bool - default n - help - backward compatibility for busybox-1.1{3,4,5}.x + bool + default n + help + backward compatibility for busybox-1.1{3,4,5}.x config KEMBTK_BUSYB_APP_UDHCPC - bool - default n - help - backward compatibility for busybox-1.1{3,4,5}.x + bool + default n + help + backward compatibility for busybox-1.1{3,4,5}.x config KEMBTK_BUSYB_UDHCPD bool "udhcp server (udhcpd)" select KEMBTK_BUSYB_APP_UDHCPD + default y help udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. config KEMBTK_BUSYB_DHCPRELAY bool "dhcprelay" + default y depends on KEMBTK_BUSYB_UDHCPD select KEMBTK_BUSYB_APP_DHCPRELAY help @@ -45,6 +47,7 @@ config KEMBTK_BUSYB_DHCPRELAY config KEMBTK_BUSYB_DUMPLEASES bool "Lease display utility (dumpleases)" + default y depends on KEMBTK_BUSYB_UDHCPD select KEMBTK_BUSYB_APP_DUMPLEASES help @@ -54,6 +57,7 @@ config KEMBTK_BUSYB_DUMPLEASES config KEMBTK_BUSYB_FEATURE_UDHCPD_WRITE_LEASES_EARLY bool "Rewrite the lease file at every new acknowledge" + default y depends on KEMBTK_BUSYB_UDHCPD help If selected, udhcpd will write a new file with leases every @@ -72,6 +76,7 @@ config KEMBTK_BUSYB_DHCPD_LEASES_FILE config KEMBTK_BUSYB_UDHCPC bool "udhcp client (udhcpc)" select KEMBTK_BUSYB_APP_UDHCPC + default y help udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -91,16 +96,26 @@ config KEMBTK_BUSYB_FEATURE_UDHCPC_ARPING config KEMBTK_BUSYB_FEATURE_UDHCP_PORT bool "Enable '-P port' option for udhcpd and udhcpc" + default y depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC help 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 0 + 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 help Verbosity can be increased with multiple -v options. This options controls how high it can be cranked up. @@ -110,10 +125,12 @@ config KEMBTK_BUSYB_UDHCP_DEBUG config KEMBTK_BUSYB_FEATURE_UDHCP_RFC3397 bool "Support for RFC3397 domain search (experimental)" + default y depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC help If selected, both client and server will support passing of domain - search lists via option 119, specified in RFC3397. + search lists via option 119, specified in RFC 3397, + and SIP servers option 120, specified in RFC 3361. config KEMBTK_BUSYB_UDHCPC_DEFAULT_SCRIPT string "Absolute path to config script" diff --git a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig index 1caff91..f6a2a1b 100644 --- a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig @@ -7,15 +7,48 @@ comment "-------------------------------------------------" comment "Networking Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_NC + bool "nc" + default y + help + A simple Unix utility which reads and writes data across network + connections. + +config KEMBTK_BUSYB_NC_SERVER + bool "Netcat server options (-l)" + default y + depends on KEMBTK_BUSYB_NC + help + Allow netcat to act as a server. + +config KEMBTK_BUSYB_NC_EXTRA + bool "Netcat extensions (-eiw and filename)" + default y + depends on KEMBTK_BUSYB_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 KEMBTK_BUSYB_NC_110_COMPAT + bool "Netcat 1.10 compatibility (+2.5k)" + depends on KEMBTK_BUSYB_NC + help + This option makes nc closely follow original nc-1.10. + The code is about 2.5k bigger. It enables + -s ADDR, -n, -u, -v, -o FILE, -z options, but loses + busybox-specific extensions: -f FILE and -ll. + config KEMBTK_BUSYB_FEATURE_IPV6 bool "Enable KEMBTK_BUSYB_IPv6 support" + default y help Enable KEMBTK_BUSYB_IPv6 support in busybox. This adds KEMBTK_BUSYB_IPv6 support in the networking applets. 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Enable Unix domain socket support in all busybox networking applets. Address of the form local:/path/to/unix/socket @@ -48,22 +81,26 @@ config KEMBTK_BUSYB_VERBOSE_RESOLUTION_ERRORS config KEMBTK_BUSYB_ARP bool "arp" + default y help Manipulate the system KEMBTK_BUSYB_ARP cache. config KEMBTK_BUSYB_ARPING bool "arping" + default y help Ping hosts by KEMBTK_BUSYB_ARP packets. config KEMBTK_BUSYB_BRCTL bool "brctl" + default y help Manage ethernet bridges. Supports addbr/delbr and addif/delif. config KEMBTK_BUSYB_FEATURE_BRCTL_FANCY bool "Fancy options" + default y depends on KEMBTK_BUSYB_BRCTL help Add support for extended option like: @@ -74,6 +111,7 @@ config KEMBTK_BUSYB_FEATURE_BRCTL_FANCY config KEMBTK_BUSYB_FEATURE_BRCTL_SHOW bool "Support show, showmac and showstp" + default y depends on KEMBTK_BUSYB_BRCTL && KEMBTK_BUSYB_FEATURE_BRCTL_FANCY help Add support for option which prints the current config: @@ -81,16 +119,19 @@ config KEMBTK_BUSYB_FEATURE_BRCTL_SHOW config KEMBTK_BUSYB_DNSD bool "dnsd" + default y help Small and static DNS server daemon. config KEMBTK_BUSYB_ETHER_WAKE bool "ether-wake" + default y help Send a magic packet to wake up sleeping machines. config KEMBTK_BUSYB_FAKEIDENTD bool "fakeidentd" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help fakeidentd listens on the ident port and returns a predefined @@ -98,7 +139,8 @@ 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 + 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 help simple FTP daemon. You have to run it via inetd. @@ -113,42 +155,48 @@ 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help - Some ftp-clients (among them KDE's Konqueror) issue illegal - "LIST -la" requests. This option works around those problems. + Some ftp clients (among them KDE's Konqueror) issue illegal + "LIST -l" requests. This option works around such problems. It might prevent you from listing files starting with "-" and it increases the code size by ~40 bytes. Most other ftp servers seem to behave similar to this. config KEMBTK_BUSYB_FTPGET bool "ftpget" + default y help Retrieve a remote file via FTP. config KEMBTK_BUSYB_FTPPUT bool "ftpput" + default y help Store a remote file via FTP. config KEMBTK_BUSYB_FEATURE_FTPGETPUT_LONG_OPTIONS bool "Enable long options in ftpget/ftpput" + default y depends on KEMBTK_BUSYB_LONG_OPTS && (KEMBTK_BUSYB_FTPGET || KEMBTK_BUSYB_FTPPUT) help Support long options for the ftpget/ftpput applet. config KEMBTK_BUSYB_HOSTNAME bool "hostname" + default y help Show or set the system's host name. config KEMBTK_BUSYB_HTTPD bool "httpd" + default y help Serve web pages via an HTTP server. config KEMBTK_BUSYB_FEATURE_HTTPD_RANGES bool "Support 'Ranges:' header" + default y depends on KEMBTK_BUSYB_HTTPD help Makes httpd emit "Accept-Ranges: bytes" header and understand @@ -157,6 +205,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_RANGES config KEMBTK_BUSYB_FEATURE_HTTPD_USE_SENDFILE bool "Use sendfile system call" + default y depends on KEMBTK_BUSYB_HTTPD help When enabled, httpd will use the kernel sendfile() function @@ -172,6 +221,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP config KEMBTK_BUSYB_FEATURE_HTTPD_SETUID bool "Enable -u option" + default y depends on KEMBTK_BUSYB_HTTPD help This option allows the server to run as a specific user @@ -189,6 +239,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_BASIC_AUTH config KEMBTK_BUSYB_FEATURE_HTTPD_AUTH_MD5 bool "Support MD5 crypted passwords for http Authentication" + default y depends on KEMBTK_BUSYB_FEATURE_HTTPD_BASIC_AUTH help Enables basic per URL authentication from /etc/httpd.conf @@ -212,6 +263,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_CGI config KEMBTK_BUSYB_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR bool "Support for running scripts through an interpreter" + default y depends on KEMBTK_BUSYB_FEATURE_HTTPD_CGI help This option enables support for running scripts through an @@ -222,6 +274,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR config KEMBTK_BUSYB_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV bool "Set REMOTE_PORT environment variable for CGI" + default y depends on KEMBTK_BUSYB_FEATURE_HTTPD_CGI help Use of this option can assist scripts in generating @@ -239,6 +292,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_ENCODE_URL_STR config KEMBTK_BUSYB_FEATURE_HTTPD_ERROR_PAGES bool "Support for custom error pages" + default y depends on KEMBTK_BUSYB_HTTPD help This option allows you to define custom error pages in @@ -250,6 +304,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_ERROR_PAGES config KEMBTK_BUSYB_FEATURE_HTTPD_PROXY bool "Support for reverse proxy" + default y depends on KEMBTK_BUSYB_HTTPD help This option allows you to define URLs that will be forwarded @@ -261,6 +316,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_PROXY config KEMBTK_BUSYB_IFCONFIG bool "ifconfig" + default y help Ifconfig is used to configure the kernel-resident network interfaces. @@ -274,6 +330,7 @@ config KEMBTK_BUSYB_FEATURE_IFCONFIG_STATUS config KEMBTK_BUSYB_FEATURE_IFCONFIG_SLIP bool "Enable slip-specific options \"keepalive\" and \"outfill\"" + default y depends on KEMBTK_BUSYB_IFCONFIG help Allow "keepalive" and "outfill" support for SLIP. If you're not @@ -281,6 +338,7 @@ config KEMBTK_BUSYB_FEATURE_IFCONFIG_SLIP config KEMBTK_BUSYB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ bool "Enable options \"mem_start\", \"io_addr\", and \"irq\"" + default y depends on KEMBTK_BUSYB_IFCONFIG help Allow the start address for shared memory, start address for I/O, @@ -297,6 +355,7 @@ config KEMBTK_BUSYB_FEATURE_IFCONFIG_HW config KEMBTK_BUSYB_FEATURE_IFCONFIG_BROADCAST_PLUS bool "Set the broadcast automatically" + default y depends on KEMBTK_BUSYB_IFCONFIG help Setting this will make ifconfig attempt to find the broadcast @@ -304,18 +363,21 @@ config KEMBTK_BUSYB_FEATURE_IFCONFIG_BROADCAST_PLUS config KEMBTK_BUSYB_IFENSLAVE bool "ifenslave" + default y 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help Network interface plug detection daemon. config KEMBTK_BUSYB_IFUPDOWN bool "ifupdown" + default y help Activate or deactivate the specified interfaces. This applet makes use of either "ifconfig" and "route" or the "ip" command to actually @@ -342,6 +404,7 @@ config KEMBTK_BUSYB_IFUPDOWN_IFSTATE_PATH config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP bool "Use ip applet" + default y depends on KEMBTK_BUSYB_IFUPDOWN help Use the iproute "ip" command to implement "ifup" and "ifdown", rather @@ -363,7 +426,6 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP_BUILTIN config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN bool "Use busybox ifconfig and route applets" - default y depends on KEMBTK_BUSYB_IFUPDOWN && !KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP select KEMBTK_BUSYB_IFCONFIG select KEMBTK_BUSYB_ROUTE @@ -384,6 +446,7 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IPV4 config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IPV6 bool "Support for KEMBTK_BUSYB_IPv6" + default y depends on KEMBTK_BUSYB_IFUPDOWN && KEMBTK_BUSYB_FEATURE_IPV6 help If you need support for KEMBTK_BUSYB_IPv6, turn this option on. @@ -391,6 +454,7 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IPV6 ### UNUSED ###config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IPX ### bool "Support for KEMBTK_BUSYB_IPX" +### default y ### depends on KEMBTK_BUSYB_IFUPDOWN ### help ### If this option is selected you can use busybox to work with KEMBTK_BUSYB_IPX @@ -398,6 +462,7 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IPV6 config KEMBTK_BUSYB_FEATURE_IFUPDOWN_MAPPING bool "Enable mapping support" + default y depends on KEMBTK_BUSYB_IFUPDOWN help This enables support for the "mapping" stanza, unless you have @@ -414,6 +479,7 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_EXTERNAL_DHCP config KEMBTK_BUSYB_INETD bool "inetd" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help Internet superserver daemon @@ -455,6 +521,7 @@ config KEMBTK_BUSYB_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN config KEMBTK_BUSYB_FEATURE_INETD_RPC bool "Support RPC services" + default y depends on KEMBTK_BUSYB_INETD select KEMBTK_BUSYB_FEATURE_HAVE_RPC help @@ -462,6 +529,7 @@ config KEMBTK_BUSYB_FEATURE_INETD_RPC config KEMBTK_BUSYB_IP bool "ip" + default y help The "ip" applet is a TCP/IP interface configuration and routing utility. You generally don't need "ip" to use busybox with @@ -490,18 +558,21 @@ config KEMBTK_BUSYB_FEATURE_IP_ROUTE config KEMBTK_BUSYB_FEATURE_IP_TUNNEL bool "ip tunnel" + default y depends on KEMBTK_BUSYB_IP help Add support for tunneling commands to "ip". config KEMBTK_BUSYB_FEATURE_IP_RULE bool "ip rule" + default y depends on KEMBTK_BUSYB_IP help Add support for rule commands to "ip". config KEMBTK_BUSYB_FEATURE_IP_SHORT_FORMS bool "Support short forms of ip commands" + default y depends on KEMBTK_BUSYB_IP help Also support short-form of ip commands: @@ -550,6 +621,7 @@ config KEMBTK_BUSYB_IPRULE config KEMBTK_BUSYB_IPCALC bool "ipcalc" + default y help ipcalc takes an KEMBTK_BUSYB_IP address and netmask and calculates the resulting broadcast, network, and host range. @@ -564,12 +636,14 @@ config KEMBTK_BUSYB_FEATURE_IPCALC_FANCY config KEMBTK_BUSYB_FEATURE_IPCALC_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_IPCALC && KEMBTK_BUSYB_LONG_OPTS help Support long options for the ipcalc applet. config KEMBTK_BUSYB_NAMEIF bool "nameif" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help nameif is used to rename network interface by its MAC address. @@ -584,6 +658,7 @@ config KEMBTK_BUSYB_NAMEIF config KEMBTK_BUSYB_FEATURE_NAMEIF_EXTENDED bool "Extended nameif" + default y depends on KEMBTK_BUSYB_NAMEIF help This extends the nameif syntax to support the bus_info and driver @@ -594,33 +669,15 @@ config KEMBTK_BUSYB_FEATURE_NAMEIF_EXTENDED new_interface_name mac=00:80:C8:38:91:B5 new_interface_name 00:80:C8:38:91:B5 -config KEMBTK_BUSYB_NC - bool "nc" - help - A simple Unix utility which reads and writes data across network - connections. - -config KEMBTK_BUSYB_NC_SERVER - bool "Netcat server options (-l)" - depends on KEMBTK_BUSYB_NC - help - Allow netcat to act as a server. - -config KEMBTK_BUSYB_NC_EXTRA - bool "Netcat extensions (-eiw and filename)" - depends on KEMBTK_BUSYB_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 KEMBTK_BUSYB_NETSTAT bool "netstat" + default y help netstat prints information about the Linux networking subsystem. config KEMBTK_BUSYB_FEATURE_NETSTAT_WIDE bool "Enable wide netstat output" + default y depends on KEMBTK_BUSYB_NETSTAT help Add support for wide columns. Useful when displaying KEMBTK_BUSYB_IPv6 addresses @@ -628,6 +685,7 @@ config KEMBTK_BUSYB_FEATURE_NETSTAT_WIDE config KEMBTK_BUSYB_FEATURE_NETSTAT_PRG bool "Enable PID/Program name output" + default y depends on KEMBTK_BUSYB_NETSTAT help Add support for -p flag to print out PID and program name. @@ -635,31 +693,35 @@ config KEMBTK_BUSYB_FEATURE_NETSTAT_PRG config KEMBTK_BUSYB_NSLOOKUP bool "nslookup" + default y help nslookup is a tool to query Internet name servers. config KEMBTK_BUSYB_NTPD bool "ntpd" - depends on EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help The NTP client/server daemon. config KEMBTK_BUSYB_FEATURE_NTPD_SERVER - bool "Make ntpd usable as a NTP server" - default y - depends on KEMBTK_BUSYB_NTPD - help + bool "Make ntpd usable as a NTP server" + default y + depends on KEMBTK_BUSYB_NTPD + help Make ntpd usable as a NTP server. If you disable this option ntpd will be usable only as a NTP client. config KEMBTK_BUSYB_PING bool "ping" + default y 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. config KEMBTK_BUSYB_PING6 bool "ping6" + default y depends on KEMBTK_BUSYB_FEATURE_IPV6 && KEMBTK_BUSYB_PING help This will give you a ping that can talk KEMBTK_BUSYB_IPv6. @@ -674,22 +736,26 @@ config KEMBTK_BUSYB_FEATURE_FANCY_PING config KEMBTK_BUSYB_PSCAN bool "pscan" + default y help Simple network port scanner. config KEMBTK_BUSYB_ROUTE bool "route" + default y help Route displays or manipulates the kernel's KEMBTK_BUSYB_IP routing tables. config KEMBTK_BUSYB_SLATTACH bool "slattach" + default y help slattach is a small utility to attach network interfaces to serial lines. #config TC # bool "tc" +# default y # help # show / manipulate traffic control settings # @@ -697,8 +763,16 @@ config KEMBTK_BUSYB_SLATTACH # def_bool n # depends on TC +config KEMBTK_BUSYB_TCPSVD + bool "tcpsvd" + default y + help + tcpsvd listens on a TCP port and runs a program for each new + connection. + config KEMBTK_BUSYB_TELNET bool "telnet" + default y help Telnet is an interface to the KEMBTK_BUSYB_TELNET protocol, but is also commonly used to test other simple protocols. @@ -724,6 +798,7 @@ config KEMBTK_BUSYB_FEATURE_TELNET_AUTOLOGIN config KEMBTK_BUSYB_TELNETD bool "telnetd" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help A daemon for the KEMBTK_BUSYB_TELNET protocol, allowing you to log onto the host @@ -766,14 +841,16 @@ config KEMBTK_BUSYB_TELNETD config KEMBTK_BUSYB_FEATURE_TELNETD_STANDALONE bool "Support standalone telnetd (not inetd only)" + default y depends on KEMBTK_BUSYB_TELNETD help Selecting this will make telnetd able to run standalone. 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help This option allows you to run telnetd in "inet wait" mode. Example inetd.conf line (note "wait", not usual "nowait"): @@ -793,6 +870,7 @@ config KEMBTK_BUSYB_FEATURE_TELNETD_INETD_WAIT config KEMBTK_BUSYB_TFTP bool "tftp" + default y help This enables the Trivial File Transfer Protocol client program. KEMBTK_BUSYB_TFTP is usually used for simple, small transfers such as a root image @@ -800,6 +878,7 @@ config KEMBTK_BUSYB_TFTP config KEMBTK_BUSYB_TFTPD bool "tftpd" + default y help This enables the Trivial File Transfer Protocol server program. It expects that stdin is a datagram socket and a packet @@ -807,8 +886,11 @@ config KEMBTK_BUSYB_TFTPD In other words: it should be run from inetd in nowait mode, or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR" +comment "Common options for tftp/tftpd" + depends on KEMBTK_BUSYB_TFTP || KEMBTK_BUSYB_TFTPD + config KEMBTK_BUSYB_FEATURE_TFTP_GET - bool "Enable \"get\" command" + bool "Enable 'tftp get' and/or tftpd upload code" default y depends on KEMBTK_BUSYB_TFTP || KEMBTK_BUSYB_TFTPD help @@ -816,8 +898,11 @@ config KEMBTK_BUSYB_FEATURE_TFTP_GET a client to retrieve a file from a KEMBTK_BUSYB_TFTP server. Also enable upload support in tftpd, if tftpd is selected. + Note: this option does _not_ make tftpd capable of download + (the usual operation people need from it)! + config KEMBTK_BUSYB_FEATURE_TFTP_PUT - bool "Enable \"put\" command" + bool "Enable 'tftp put' and/or tftpd download code" default y depends on KEMBTK_BUSYB_TFTP || KEMBTK_BUSYB_TFTPD help @@ -827,6 +912,7 @@ config KEMBTK_BUSYB_FEATURE_TFTP_PUT config KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE bool "Enable 'blksize' and 'tsize' protocol options" + default y depends on KEMBTK_BUSYB_TFTP || KEMBTK_BUSYB_TFTPD help Allow tftp to specify block size, and tftpd to understand @@ -834,8 +920,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 help Show progress bar. @@ -848,18 +935,21 @@ config KEMBTK_BUSYB_TFTP_DEBUG config KEMBTK_BUSYB_TRACEROUTE bool "traceroute" + default y help Utility to trace the route of KEMBTK_BUSYB_IP packets. 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Utility to trace the route of KEMBTK_BUSYB_IPv6 packets. config KEMBTK_BUSYB_FEATURE_TRACEROUTE_VERBOSE bool "Enable verbose output" + default y depends on KEMBTK_BUSYB_TRACEROUTE help Add some verbosity to traceroute. This includes among other things @@ -878,25 +968,49 @@ config KEMBTK_BUSYB_FEATURE_TRACEROUTE_USE_ICMP help Add option -I to use ICMP KEMBTK_BUSYB_ECHO instead of UDP datagrams. +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 + help + tunctl creates or deletes tun devices. + +config KEMBTK_BUSYB_FEATURE_TUNCTL_UG + bool "Support owner:group assignment" + default y + depends on KEMBTK_BUSYB_TUNCTL + help + Allow to specify owner and group of newly created interface. + 340 bytes of pure bloat. Say no here. + source packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig 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 + 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 help Command line options to pass to udhcpc from ifup. Intended to alter options not available in /etc/network/interfaces. (IE: --syslog --background etc...) +config KEMBTK_BUSYB_UDPSVD + bool "udpsvd" + default y + help + udpsvd listens on an UDP port and runs a program for each new + connection. + config KEMBTK_BUSYB_VCONFIG bool "vconfig" + default y help Creates, removes, and configures VLAN interfaces config KEMBTK_BUSYB_WGET bool "wget" + default y help wget is a utility for non-interactive download of files from HTTP, HTTPS, and FTP servers. @@ -917,12 +1031,14 @@ config KEMBTK_BUSYB_FEATURE_WGET_AUTHENTICATION config KEMBTK_BUSYB_FEATURE_WGET_LONG_OPTIONS bool "Enable long options" + default y depends on KEMBTK_BUSYB_WGET && KEMBTK_BUSYB_LONG_OPTS help Support long options for the wget applet. config KEMBTK_BUSYB_ZCIP bool "zcip" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help KEMBTK_BUSYB_ZCIP provides ZeroConf KEMBTK_BUSYB_IPv4 address selection, according to RFC 3927. @@ -932,29 +1048,3 @@ config KEMBTK_BUSYB_ZCIP See http://www.zeroconf.org for further details, and "zcip.script" in the busybox examples. -config KEMBTK_BUSYB_TCPSVD - bool "tcpsvd" - help - tcpsvd listens on a TCP port and runs a program for each new - connection. - -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 - help - tunctl creates or deletes tun devices. - -config KEMBTK_BUSYB_FEATURE_TUNCTL_UG - bool "Support owner:group assignment" - depends on KEMBTK_BUSYB_TUNCTL - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X - help - Allow to specify owner and group of newly created interface. - 340 bytes of pure bloat. Say no here. - -config KEMBTK_BUSYB_UDPSVD - bool "udpsvd" - help - udpsvd listens on an UDP port and runs a program for each new - connection. - diff --git a/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig index ac35a51..66fb6fe 100644 --- a/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig @@ -7,18 +7,23 @@ comment "-------------------------------------------------" comment "Print Utilities" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_LPD bool "lpd" + default y help lpd is a print spooling daemon. config KEMBTK_BUSYB_LPR bool "lpr" + default y help lpr sends files (or standard input) to a print spooling daemon. config KEMBTK_BUSYB_LPQ bool "lpq" + default y help lpq is a print spool queue examination and manipulation program. diff --git a/packages/busybox/busybox-kconfigs/busybox-procps.kconfig b/packages/busybox/busybox-kconfigs/busybox-procps.kconfig index 12a3a9a..861fa44 100644 --- a/packages/busybox/busybox-kconfigs/busybox-procps.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-procps.kconfig @@ -7,8 +7,17 @@ comment "-------------------------------------------------" comment "Process Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_SMEMCAP + bool "smemcap" + depends on EMBTK_BB_VERSION_1_17_X + default y + help + smemcap is a tool for capturing process data for smem, + a memory usage statistic tool. + config KEMBTK_BUSYB_FREE bool "free" + default y 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. @@ -16,6 +25,7 @@ config KEMBTK_BUSYB_FREE config KEMBTK_BUSYB_FUSER bool "fuser" + default y help fuser lists all PIDs (Process KEMBTK_BUSYB_IDs) that currently have a given file open. fuser can also list all PIDs that have a given network @@ -23,6 +33,7 @@ config KEMBTK_BUSYB_FUSER config KEMBTK_BUSYB_KILL bool "kill" + default y help The command kill sends the specified signal to the specified process or process group. If no signal is specified, the TERM @@ -30,6 +41,7 @@ config KEMBTK_BUSYB_KILL config KEMBTK_BUSYB_KILLALL bool "killall" + default y depends on KEMBTK_BUSYB_KILL help killall sends a signal to all processes running any of the @@ -38,32 +50,38 @@ config KEMBTK_BUSYB_KILLALL config KEMBTK_BUSYB_KILLALL5 bool "killall5" + default y depends on KEMBTK_BUSYB_KILL config KEMBTK_BUSYB_NMETER bool "nmeter" + default y help Prints selected system stats continuously, one line per update. config KEMBTK_BUSYB_PGREP bool "pgrep" + default y help Look for processes by name. config KEMBTK_BUSYB_PIDOF bool "pidof" + default y help Pidof finds the process id's (pids) of the named programs. It prints those id's on the standard output. config KEMBTK_BUSYB_FEATURE_PIDOF_SINGLE bool "Enable argument for single shot (-s)" + default y depends on KEMBTK_BUSYB_PIDOF help Support argument '-s' for returning only the first pid found. config KEMBTK_BUSYB_FEATURE_PIDOF_OMIT bool "Enable argument for omitting pids (-o)" + default y depends on KEMBTK_BUSYB_PIDOF help Support argument '-o' for omitting the given pids in output. @@ -72,16 +90,19 @@ config KEMBTK_BUSYB_FEATURE_PIDOF_OMIT config KEMBTK_BUSYB_PKILL bool "pkill" + default y help Send signals to processes by name. config KEMBTK_BUSYB_PS bool "ps" + default y help ps gives a snapshot of the current processes. config KEMBTK_BUSYB_FEATURE_PS_WIDE bool "Enable wide output option (-w)" + default y depends on KEMBTK_BUSYB_PS help Support argument 'w' for wide output. @@ -90,14 +111,16 @@ 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 help Support -o time and -o etime output specifiers. 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Support -o rgroup, -o ruser, -o nice output specifiers. @@ -110,17 +133,20 @@ config KEMBTK_BUSYB_FEATURE_PS_UNUSUAL_SYSTEMS config KEMBTK_BUSYB_RENICE bool "renice" + default y help Renice alters the scheduling priority of one or more running processes. config KEMBTK_BUSYB_BB_SYSCTL bool "sysctl" + default y help Configure kernel parameters at runtime. config KEMBTK_BUSYB_TOP bool "top" + default y help The top program provides a dynamic real-time view of a running system. @@ -143,6 +169,7 @@ config KEMBTK_BUSYB_FEATURE_TOP_CPU_GLOBAL_PERCENTS config KEMBTK_BUSYB_FEATURE_TOP_SMP_CPU bool "SMP KEMBTK_BUSYB_CPU usage display ('c' key)" + default y depends on KEMBTK_BUSYB_FEATURE_TOP_CPU_GLOBAL_PERCENTS help Allow 'c' key to switch between individual/cumulative KEMBTK_BUSYB_CPU stats @@ -150,6 +177,7 @@ config KEMBTK_BUSYB_FEATURE_TOP_SMP_CPU config KEMBTK_BUSYB_FEATURE_TOP_DECIMALS bool "Show 1/10th of a percent in KEMBTK_BUSYB_CPU/mem statistics" + default y depends on KEMBTK_BUSYB_FEATURE_TOP_CPU_USAGE_PERCENTAGE help Show 1/10th of a percent in KEMBTK_BUSYB_CPU/mem statistics. @@ -157,6 +185,7 @@ config KEMBTK_BUSYB_FEATURE_TOP_DECIMALS config KEMBTK_BUSYB_FEATURE_TOP_SMP_PROCESS bool "Show KEMBTK_BUSYB_CPU process runs on ('j' field)" + default y depends on KEMBTK_BUSYB_TOP help Show KEMBTK_BUSYB_CPU where process was last found running on. @@ -164,19 +193,22 @@ config KEMBTK_BUSYB_FEATURE_TOP_SMP_PROCESS config KEMBTK_BUSYB_FEATURE_TOPMEM bool "Topmem command ('s' key)" + default y depends on KEMBTK_BUSYB_TOP help Enable 's' in top (gives lots of memory info). 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Enables ps -T option and 'h' command in top config KEMBTK_BUSYB_UPTIME bool "uptime" + default y help uptime gives a one line display of the current time, how long the system has been running, how many users are currently logged @@ -184,6 +216,7 @@ config KEMBTK_BUSYB_UPTIME config KEMBTK_BUSYB_WATCH bool "watch" + default y help watch is used to execute a program periodically, showing output to the screen. diff --git a/packages/busybox/busybox-kconfigs/busybox-runit.kconfig b/packages/busybox/busybox-kconfigs/busybox-runit.kconfig index b693bd5..6fed735 100644 --- a/packages/busybox/busybox-kconfigs/busybox-runit.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-runit.kconfig @@ -7,14 +7,18 @@ comment "-------------------------------------------------" comment "Runit Utilities" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_RUNSV bool "runsv" + default y help runsv starts and monitors a service and optionally an appendant log service. config KEMBTK_BUSYB_RUNSVDIR bool "runsvdir" + default y help runsvdir starts a runsv process for each subdirectory, or symlink to a directory, in the services directory dir, up to a limit of 1000 @@ -30,6 +34,7 @@ config KEMBTK_BUSYB_FEATURE_RUNSVDIR_LOG config KEMBTK_BUSYB_SV bool "sv" + default y help sv reports the current status and controls the state of services monitored by the runsv supervisor. @@ -44,6 +49,7 @@ config KEMBTK_BUSYB_SV_DEFAULT_SERVICE_DIR config KEMBTK_BUSYB_SVLOGD bool "svlogd" + default y help svlogd continuously reads log data from its standard input, optionally filters log messages, and writes the data to one or more automatically @@ -51,28 +57,33 @@ config KEMBTK_BUSYB_SVLOGD config KEMBTK_BUSYB_CHPST bool "chpst" + default y help chpst changes the process state according to the given options, and execs specified program. config KEMBTK_BUSYB_SETUIDGID bool "setuidgid" + default y help Sets soft resource limits as specified by options config KEMBTK_BUSYB_ENVUIDGID bool "envuidgid" + default y help Sets $UID to account's uid and $GID to account's gid config KEMBTK_BUSYB_ENVDIR bool "envdir" + default y help Sets various environment variables as specified by files in the given directory config KEMBTK_BUSYB_SOFTLIMIT bool "softlimit" + default y help Sets soft resource limits as specified by options diff --git a/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig b/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig index 7000850..22c9f15 100644 --- a/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig @@ -3,12 +3,13 @@ # see scripts/kbuild/config-language.txt. # -if KEMBTK_BUSYB_SELINUX comment "-------------------------------------------------" comment "SELinux Utilities" comment "-------------------------------------------------" depends on KEMBTK_BUSYB_SELINUX + + config KEMBTK_BUSYB_CHCON bool "chcon" depends on KEMBTK_BUSYB_SELINUX @@ -108,4 +109,4 @@ config KEMBTK_BUSYB_SESTATUS depends on KEMBTK_BUSYB_SELINUX help Displays the status of SELinux. -endif + diff --git a/packages/busybox/busybox-kconfigs/busybox-shell.kconfig b/packages/busybox/busybox-kconfigs/busybox-shell.kconfig index 84b7124..ba41543 100644 --- a/packages/busybox/busybox-kconfigs/busybox-shell.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-shell.kconfig @@ -7,38 +7,11 @@ comment "-------------------------------------------------" comment "Shells" comment "-------------------------------------------------" -choice - prompt "Choose your default shell" - help - Choose a shell. The ash shell is the most bash compatible - and full featured one. - -config KEMBTK_BUSYB_FEATURE_SH_IS_ASH - select KEMBTK_BUSYB_ASH - bool "ash" - depends on !KEMBTK_BUSYB_NOMMU - -config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH - select KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X - bool "hush" - -####config FEATURE_SH_IS_LASH -#### select KEMBTK_BUSYB_LASH -#### bool "lash" - -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" - -config KEMBTK_BUSYB_FEATURE_SH_IS_NONE - bool "none" -endchoice config KEMBTK_BUSYB_ASH bool "ash" + default y depends on !KEMBTK_BUSYB_NOMMU help Tha 'ash' shell adds about 60k in the default configuration and is @@ -62,21 +35,21 @@ config KEMBTK_BUSYB_ASH_JOB_CONTROL 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. + 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'. + 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" @@ -104,6 +77,7 @@ config KEMBTK_BUSYB_ASH_MATH_SUPPORT_64 config KEMBTK_BUSYB_ASH_GETOPTS bool "Builtin getopt to parse positional parameters" + default y depends on KEMBTK_BUSYB_ASH help Enable getopts builtin in the ash shell. @@ -131,6 +105,7 @@ config KEMBTK_BUSYB_ASH_BUILTIN_TEST config KEMBTK_BUSYB_ASH_CMDCMD bool "'command' command to override shell builtins" + default y depends on KEMBTK_BUSYB_ASH help Enable support for the ash 'command' builtin, which allows @@ -139,7 +114,6 @@ config KEMBTK_BUSYB_ASH_CMDCMD config KEMBTK_BUSYB_ASH_MAIL bool "Check for new mail on interactive shells" - default y depends on KEMBTK_BUSYB_ASH help Enable "check for new mail" in the ash shell. @@ -153,6 +127,7 @@ config KEMBTK_BUSYB_ASH_OPTIMIZE_FOR_SIZE config KEMBTK_BUSYB_ASH_RANDOM_SUPPORT bool "Pseudorandom generator and $RANDOM variable" + default y depends on KEMBTK_BUSYB_ASH help Enable pseudorandom generator and dynamic variable "$RANDOM". @@ -163,6 +138,7 @@ config KEMBTK_BUSYB_ASH_RANDOM_SUPPORT config KEMBTK_BUSYB_ASH_EXPAND_PRMT bool "Expand prompt string" + default y depends on KEMBTK_BUSYB_ASH help "PS#" may contain volatile content, such as backquote commands. @@ -171,6 +147,7 @@ config KEMBTK_BUSYB_ASH_EXPAND_PRMT config KEMBTK_BUSYB_HUSH bool "hush" + default y help hush is a small shell (22k). It handles the normal flow control constructs such as if/then/elif/else/fi, for/in/do/done, while loops, @@ -186,12 +163,13 @@ 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Enable bash-compatible extensions. config KEMBTK_BUSYB_HUSH_HELP bool "help builtin" + default y depends on KEMBTK_BUSYB_HUSH help Enable help builtin in hush. Code size + ~1 kbyte. @@ -208,6 +186,7 @@ config KEMBTK_BUSYB_HUSH_INTERACTIVE config KEMBTK_BUSYB_HUSH_JOB bool "Job control" + default y depends on KEMBTK_BUSYB_HUSH_INTERACTIVE help Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current @@ -218,65 +197,131 @@ config KEMBTK_BUSYB_HUSH_JOB config KEMBTK_BUSYB_HUSH_TICK bool "Process substitution" + default y depends on KEMBTK_BUSYB_HUSH help Enable process substitution `command` and $(command) in hush. config KEMBTK_BUSYB_HUSH_IF bool "Support if/then/elif/else/fi" + default y depends on KEMBTK_BUSYB_HUSH help Enable if/then/elif/else/fi in hush. config KEMBTK_BUSYB_HUSH_LOOPS bool "Support for, while and until loops" + default y depends on KEMBTK_BUSYB_HUSH help Enable for, while and until loops in hush. config KEMBTK_BUSYB_HUSH_CASE bool "Support case ... esac statement" + default y depends on KEMBTK_BUSYB_HUSH help Enable case ... esac statement in hush. +400 bytes. 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 + 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 help Enable support for shell functions in hush. +800 bytes. config KEMBTK_BUSYB_HUSH_LOCAL bool "Support local builtin" + default y depends on KEMBTK_BUSYB_HUSH_FUNCTIONS help Enable support for local variables in functions. config KEMBTK_BUSYB_HUSH_EXPORT_N 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 + 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 help Enable support for export '-n' option in hush. It is a bash extension. 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. + +choice + prompt "Choose which shell is aliased to 'sh' name" + help + Choose which shell you want to be executed by 'sh' alias. + The ash shell is the most bash compatible and full featured one. + +# 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_NOMMU + +config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH + depends on KEMBTK_BUSYB_HUSH + bool "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" + +config KEMBTK_BUSYB_FEATURE_SH_IS_NONE + bool "none" + +endchoice + +choice + prompt "Choose which shell is aliased to 'bash' name" + depends on EMBTK_BB_VERSION_1_17_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. + + Note that selecting this option does not switch on any bash + compatibility code. It merely makes it possible to install + /bin/bash (sym)link and run scripts which start with + #!/bin/bash line. + + Many systems use it in scripts which use bash-specific features, + even simple ones like $RANDOM. Without this option, busybox + can't be used for running them because it won't recongnize + "bash" as a supported applet name. + +config KEMBTK_BUSYB_FEATURE_BASH_IS_ASH + depends on KEMBTK_BUSYB_ASH + bool "ash" + depends on !KEMBTK_BUSYB_NOMMU + +config KEMBTK_BUSYB_FEATURE_BASH_IS_HUSH + depends on KEMBTK_BUSYB_HUSH + bool "hush" + +config KEMBTK_BUSYB_FEATURE_BASH_IS_NONE + bool "none" + +endchoice + + config KEMBTK_BUSYB_LASH - bool "lash (deprecated: aliased to hush)" - select KEMBTK_BUSYB_HUSH if (EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X) + 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)" - select KEMBTK_BUSYB_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. @@ -293,12 +338,13 @@ 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 + 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 help Enable math support in the shell via $((...)) syntax. config KEMBTK_BUSYB_SH_MATH_SUPPORT_64 bool "Extend POSIX math support to 64 bit" + default y depends on KEMBTK_BUSYB_SH_MATH_SUPPORT help Enable 64-bit math support in the shell. This will make the shell @@ -307,6 +353,7 @@ config KEMBTK_BUSYB_SH_MATH_SUPPORT_64 config KEMBTK_BUSYB_FEATURE_SH_EXTRA_QUIET bool "Hide message on interactive shell startup" + default y depends on KEMBTK_BUSYB_MSH || KEMBTK_BUSYB_LASH || KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH help Remove the busybox introduction when starting a shell. @@ -361,6 +408,7 @@ config KEMBTK_BUSYB_FEATURE_SH_NOFORK 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 @@ -373,8 +421,19 @@ config KEMBTK_BUSYB_CTTYHACK 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. Usage example for /etc/inittab - (for busybox init): + 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 d4ec149..c555fa9 100644 --- a/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig @@ -7,8 +7,11 @@ comment "-------------------------------------------------" comment "System Logging Utilities" comment "-------------------------------------------------" + + config KEMBTK_BUSYB_SYSLOGD bool "syslogd" + default y help The syslogd utility is used to record logs of all the significant events that occur on a system. Every @@ -23,6 +26,7 @@ config KEMBTK_BUSYB_SYSLOGD config KEMBTK_BUSYB_FEATURE_ROTATE_LOGFILE bool "Rotate message files" + default y depends on KEMBTK_BUSYB_SYSLOGD help This enables syslogd to rotate the message files @@ -30,6 +34,7 @@ config KEMBTK_BUSYB_FEATURE_ROTATE_LOGFILE config KEMBTK_BUSYB_FEATURE_REMOTE_LOG bool "Remote Log support" + default y depends on KEMBTK_BUSYB_SYSLOGD help When you enable this feature, the syslogd utility can @@ -43,13 +48,26 @@ config KEMBTK_BUSYB_FEATURE_REMOTE_LOG config KEMBTK_BUSYB_FEATURE_SYSLOGD_DUP bool "Support -D (drop dups) option" + default y depends on KEMBTK_BUSYB_SYSLOGD help Option -D instructs syslogd to drop consecutive messages which are totally the same. +config KEMBTK_BUSYB_FEATURE_SYSLOGD_READ_BUFFER_SIZE + int "Read buffer size in bytes" + default 256 + range 256 20000 + depends on KEMBTK_BUSYB_SYSLOGD + depends on EMBTK_BB_VERSION_1_17_X + help + This option sets the size of the syslog read buffer. + Actual memory usage increases around five times the + change done here. + config KEMBTK_BUSYB_FEATURE_IPC_SYSLOG bool "Circular Buffer support" + default y depends on KEMBTK_BUSYB_SYSLOGD help When you enable this feature, the syslogd utility will @@ -82,6 +100,7 @@ config KEMBTK_BUSYB_LOGREAD config KEMBTK_BUSYB_FEATURE_LOGREAD_REDUCED_LOCKING bool "Double buffering" + default y depends on KEMBTK_BUSYB_LOGREAD help 'logread' ouput to slow serial terminals can have @@ -92,6 +111,7 @@ config KEMBTK_BUSYB_FEATURE_LOGREAD_REDUCED_LOCKING config KEMBTK_BUSYB_KLOGD bool "klogd" + default y help klogd is a utility which intercepts and logs all messages from the Linux kernel and sends the messages @@ -101,6 +121,7 @@ config KEMBTK_BUSYB_KLOGD config KEMBTK_BUSYB_LOGGER bool "logger" + default y select KEMBTK_BUSYB_FEATURE_SYSLOG help The logger utility allows you to send arbitrary text @@ -108,4 +129,3 @@ config KEMBTK_BUSYB_LOGGER they can be logged. This is generally used to help locate problems that occur within programs and scripts. - diff --git a/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig b/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig index e835527..0e87dce 100644 --- a/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig @@ -7,9 +7,17 @@ comment "-------------------------------------------------" comment "Linux System Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_REV + bool "rev" + depends on EMBTK_BB_VERSION_1_17_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 + 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 help acpid listens to ACPI events coming either in textual form from /proc/acpi/event (though it is marked deprecated it is still widely @@ -24,12 +32,14 @@ config KEMBTK_BUSYB_ACPID config KEMBTK_BUSYB_FEATURE_ACPID_COMPAT bool "Accept and ignore redundant options" + default y depends on KEMBTK_BUSYB_ACPID help Accept and ignore compatibility options -g -m -s -S -v. config KEMBTK_BUSYB_BLKID bool "blkid" + default y select KEMBTK_BUSYB_VOLUMEID help Lists labels and UUIDs of all filesystems. @@ -38,6 +48,7 @@ config KEMBTK_BUSYB_BLKID config KEMBTK_BUSYB_DMESG bool "dmesg" + default y 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 @@ -70,6 +81,7 @@ config KEMBTK_BUSYB_FEATURE_DMESG_PRETTY config KEMBTK_BUSYB_FBSET bool "fbset" + default y 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 @@ -78,6 +90,7 @@ config KEMBTK_BUSYB_FBSET config KEMBTK_BUSYB_FEATURE_FBSET_FANCY bool "Turn on extra fbset options" + default y depends on KEMBTK_BUSYB_FBSET help This option enables extended fbset options, allowing one to set the @@ -87,6 +100,7 @@ config KEMBTK_BUSYB_FEATURE_FBSET_FANCY config KEMBTK_BUSYB_FEATURE_FBSET_READMODE bool "Turn on fbset readmode support" + default y depends on KEMBTK_BUSYB_FBSET help This option allows fbset to read the video mode database stored by @@ -95,6 +109,7 @@ config KEMBTK_BUSYB_FEATURE_FBSET_READMODE config KEMBTK_BUSYB_FDFLUSH bool "fdflush" + default y help fdflush is only needed when changing media on slightly-broken removable media drives. It is used to make Linux believe that a @@ -106,11 +121,13 @@ config KEMBTK_BUSYB_FDFLUSH config KEMBTK_BUSYB_FDFORMAT bool "fdformat" + default y help fdformat is used to low-level format a floppy disk. config KEMBTK_BUSYB_FDISK bool "fdisk" + default y help The fdisk utility is used to divide hard disks into one or more logical disks, which are generally called partitions. This utility @@ -163,6 +180,7 @@ config KEMBTK_BUSYB_FEATURE_OSF_LABEL config KEMBTK_BUSYB_FEATURE_FDISK_ADVANCED bool "Support expert mode" + default y depends on KEMBTK_BUSYB_FDISK && KEMBTK_BUSYB_FEATURE_FDISK_WRITABLE help Enabling this option allows you to do terribly unsafe things like @@ -172,14 +190,23 @@ config KEMBTK_BUSYB_FEATURE_FDISK_ADVANCED config KEMBTK_BUSYB_FINDFS bool "findfs" + default y select KEMBTK_BUSYB_VOLUMEID help Prints the name of a filesystem with given label or UUID. WARNING: With all submodules selected, it will add ~8k to busybox. +config KEMBTK_BUSYB_FLOCK + bool "flock" + depends on EMBTK_BB_VERSION_1_17_X + default y + help + Manage locks from shell scripts + config KEMBTK_BUSYB_FREERAMDISK bool "freeramdisk" + default y help Linux allows you to create ramdisks. This utility allows you to delete them and completely free all memory that was used for the @@ -190,6 +217,7 @@ config KEMBTK_BUSYB_FREERAMDISK config KEMBTK_BUSYB_FSCK_MINIX bool "fsck_minix" + default y help The minix filesystem is a nice, small, compact, read-write filesystem with little overhead. It is not a journaling filesystem however and @@ -200,20 +228,19 @@ config KEMBTK_BUSYB_FSCK_MINIX config KEMBTK_BUSYB_MKFS_EXT2 bool "mkfs_ext2" - depends on EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help Utility to create EXT2 filesystems. config KEMBTK_BUSYB_MKFS_MINIX bool "mkfs_minix" + default y 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. -comment "Minix filesystem support" - depends on KEMBTK_BUSYB_FSCK_MINIX || KEMBTK_BUSYB_MKFS_MINIX - config KEMBTK_BUSYB_FEATURE_MINIX2 bool "Support Minix fs v2 (fsck_minix/mkfs_minix)" default y @@ -225,18 +252,21 @@ config KEMBTK_BUSYB_FEATURE_MINIX2 config KEMBTK_BUSYB_MKFS_REISER bool "mkfs_reiser" - depends on EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_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 + 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 help Utility to create FAT32 filesystems. config KEMBTK_BUSYB_GETOPT bool "getopt" + default y 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 @@ -249,18 +279,20 @@ 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Enable support for long options (option -l). config KEMBTK_BUSYB_HEXDUMP bool "hexdump" + default y 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 KEMBTK_BUSYB_FEATURE_HEXDUMP_REVERSE bool "Support -R, reverse of 'hexdump -Cv'" + default y depends on KEMBTK_BUSYB_HEXDUMP help The hexdump utility is used to display binary data in an ascii @@ -270,12 +302,14 @@ config KEMBTK_BUSYB_FEATURE_HEXDUMP_REVERSE config KEMBTK_BUSYB_HD bool "hd" - select KEMBTK_BUSYB_HEXDUMP + default y + depends on KEMBTK_BUSYB_HEXDUMP help hd is an alias to hexdump -C. config KEMBTK_BUSYB_HWCLOCK bool "hwclock" + default y 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 @@ -284,6 +318,7 @@ config KEMBTK_BUSYB_HWCLOCK config KEMBTK_BUSYB_FEATURE_HWCLOCK_LONG_OPTIONS bool "Support long options (--hctosys,...)" + default y depends on KEMBTK_BUSYB_HWCLOCK && KEMBTK_BUSYB_LONG_OPTS help By default, the hwclock utility only uses short options. If you @@ -304,6 +339,7 @@ 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 @@ -312,6 +348,7 @@ config KEMBTK_BUSYB_IPCRM config KEMBTK_BUSYB_IPCS bool "ipcs" + default y select KEMBTK_BUSYB_FEATURE_SUID help The ipcs utility is used to provide information on the currently @@ -319,6 +356,7 @@ config KEMBTK_BUSYB_IPCS config KEMBTK_BUSYB_LOSETUP bool "losetup" + default y 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 @@ -326,7 +364,8 @@ config KEMBTK_BUSYB_LOSETUP config KEMBTK_BUSYB_LSPCI bool "lspci" - depends on EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help lspci is a utility for displaying information about PCI buses in the system and devices connected to them. @@ -335,7 +374,8 @@ config KEMBTK_BUSYB_LSPCI config KEMBTK_BUSYB_LSUSB bool "lsusb" - depends on EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help lsusb is a utility for displaying information about USB buses in the system and devices connected to them. @@ -344,6 +384,7 @@ config KEMBTK_BUSYB_LSUSB config KEMBTK_BUSYB_MDEV bool "mdev" + default y help mdev is a mini-udev implementation for dynamically creating device nodes in the /dev directory. @@ -352,6 +393,7 @@ config KEMBTK_BUSYB_MDEV config KEMBTK_BUSYB_FEATURE_MDEV_CONF bool "Support /etc/mdev.conf" + default y depends on KEMBTK_BUSYB_MDEV help Add support for the mdev config file to control ownership and @@ -361,6 +403,7 @@ config KEMBTK_BUSYB_FEATURE_MDEV_CONF config KEMBTK_BUSYB_FEATURE_MDEV_RENAME bool "Support subdirs/symlinks" + default y depends on KEMBTK_BUSYB_FEATURE_MDEV_CONF help Add support for renaming devices and creating symlinks. @@ -369,6 +412,7 @@ config KEMBTK_BUSYB_FEATURE_MDEV_RENAME config KEMBTK_BUSYB_FEATURE_MDEV_RENAME_REGEXP bool "Support regular expressions substitutions when renaming device" + default y depends on KEMBTK_BUSYB_FEATURE_MDEV_RENAME help Add support for regular expressions substitutions when renaming @@ -376,6 +420,7 @@ config KEMBTK_BUSYB_FEATURE_MDEV_RENAME_REGEXP config KEMBTK_BUSYB_FEATURE_MDEV_EXEC bool "Support command execution at device addition/removal" + default y depends on KEMBTK_BUSYB_FEATURE_MDEV_CONF help This adds support for an optional field to /etc/mdev.conf for @@ -385,6 +430,7 @@ config KEMBTK_BUSYB_FEATURE_MDEV_EXEC config KEMBTK_BUSYB_FEATURE_MDEV_LOAD_FIRMWARE bool "Support loading of firmwares" + default y depends on KEMBTK_BUSYB_MDEV help Some devices need to load firmware before they can be usable. @@ -395,6 +441,7 @@ config KEMBTK_BUSYB_FEATURE_MDEV_LOAD_FIRMWARE config KEMBTK_BUSYB_MKSWAP bool "mkswap" + default y 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 @@ -415,13 +462,15 @@ config KEMBTK_BUSYB_FEATURE_MKSWAP_V0 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 + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Generate swap spaces with universally unique identifiers. config KEMBTK_BUSYB_MORE bool "more" + default y 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 @@ -440,193 +489,9 @@ config KEMBTK_BUSYB_FEATURE_USE_TERMIOS will be unable to determine the current screen size, and will be unable to move the cursor. -config KEMBTK_BUSYB_VOLUMEID - bool #No description makes it a hidden option - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_EXT - bool "Ext filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_BTRFS - bool "btrfs filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - depends on EMBTK_BB_VERSION_1_16_X - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_REISERFS - bool "Reiser filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_FAT - bool "fat filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_HFS - bool "hfs filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_JFS - bool "jfs filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_UFS -### bool "ufs filesystem" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_XFS - bool "xfs filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_NTFS - bool "ntfs filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_ISO9660 - bool "iso9660 filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_UDF - bool "udf filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_LUKS - bool "luks filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_LINUXSWAP - bool "linux swap filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_LVM -### bool "lvm" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_CRAMFS - bool "cramfs filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_HPFS -### bool "hpfs filesystem" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_ROMFS - bool "romfs filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_SYSV - bool "sysv filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_MINIX -### bool "minix filesystem" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -### These only detect partition tables - not used (yet?) -### config FEATURE_VOLUMEID_MAC -### bool "mac filesystem" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO -### -### config FEATURE_VOLUMEID_MSDOS -### bool "msdos filesystem" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_OCFS2 - bool "ocfs2 filesystem" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_HIGHPOINTRAID -### bool "highpoint raid" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_ISWRAID -### bool "intel raid" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_LSIRAID -### bool "lsi raid" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_VIARAID -### bool "via raid" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_SILICONRAID -### bool "silicon raid" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_NVIDIARAID -### bool "nvidia raid" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_PROMISERAID -### bool "promise raid" -### depends on KEMBTK_BUSYB_VOLUMEID -### help -### TODO - -config KEMBTK_BUSYB_FEATURE_VOLUMEID_LINUXRAID - bool "linuxraid" - depends on KEMBTK_BUSYB_VOLUMEID - help - TODO - config KEMBTK_BUSYB_MOUNT bool "mount" + default y 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 @@ -637,12 +502,14 @@ config KEMBTK_BUSYB_MOUNT config KEMBTK_BUSYB_FEATURE_MOUNT_FAKE bool "Support option -f" + default y depends on KEMBTK_BUSYB_MOUNT help Enable support for faking a file system mount. config KEMBTK_BUSYB_FEATURE_MOUNT_VERBOSE bool "Support option -v" + default y depends on KEMBTK_BUSYB_MOUNT help Enable multi-level -v[vv...] verbose messages. Useful if you @@ -661,7 +528,8 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_HELPERS The idea is to use such virtual filesystems in /etc/fstab. config KEMBTK_BUSYB_FEATURE_MOUNT_LABEL - bool "Support specifiying devices by label or UUID" + bool "Support specifying devices by label or UUID" + default y depends on KEMBTK_BUSYB_MOUNT select KEMBTK_BUSYB_VOLUMEID help @@ -671,6 +539,7 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_LABEL config KEMBTK_BUSYB_FEATURE_MOUNT_NFS bool "Support mounting NFS file systems" + default y depends on KEMBTK_BUSYB_MOUNT select KEMBTK_BUSYB_FEATURE_HAVE_RPC select KEMBTK_BUSYB_FEATURE_SYSLOG @@ -679,6 +548,7 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_NFS config KEMBTK_BUSYB_FEATURE_MOUNT_CIFS bool "Support mounting CIFS/SMB file systems" + default y depends on KEMBTK_BUSYB_MOUNT help Enable support for samba mounts. @@ -702,6 +572,7 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_FSTAB config KEMBTK_BUSYB_PIVOT_ROOT bool "pivot_root" + default y 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 @@ -713,6 +584,7 @@ config KEMBTK_BUSYB_PIVOT_ROOT config KEMBTK_BUSYB_RDATE bool "rdate" + default y help The rdate utility allows you to synchronize the date and time of your system clock with the date and time of a remote networked system using @@ -720,34 +592,40 @@ config KEMBTK_BUSYB_RDATE systems. config KEMBTK_BUSYB_RDEV - bool "rdev" - help + bool "rdev" + default y + help Print the device node associated with the filesystem mounted at '/'. config KEMBTK_BUSYB_READPROFILE bool "readprofile" + default y help This allows you to parse /proc/profile for basic profiling. config KEMBTK_BUSYB_RTCWAKE bool "rtcwake" + default y help Enter a system sleep state until specified wakeup time. config KEMBTK_BUSYB_SCRIPT bool "script" + default y help The script makes typescript of terminal session. config KEMBTK_BUSYB_SCRIPTREPLAY bool "scriptreplay" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + default y help This program replays a typescript, using timing information given by script -t. config KEMBTK_BUSYB_SETARCH bool "setarch" + default y help The linux32 utility is used to create a 32bit environment for the specified program (usually a shell). It only makes sense to have @@ -756,6 +634,7 @@ config KEMBTK_BUSYB_SETARCH config KEMBTK_BUSYB_SWAPONOFF bool "swaponoff" + default y help This option enables both the 'swapon' and the 'swapoff' utilities. Once you have created some swap space using 'mkswap', you also need @@ -766,12 +645,14 @@ config KEMBTK_BUSYB_SWAPONOFF config KEMBTK_BUSYB_FEATURE_SWAPON_PRI bool "Support priority option -p" + default y depends on KEMBTK_BUSYB_SWAPONOFF help Enable support for setting swap device priority in swapon. config KEMBTK_BUSYB_SWITCH_ROOT bool "switch_root" + default y help The switch_root utility is used from initramfs to select a new root device. Under initramfs, you have to use this instead of @@ -790,6 +671,7 @@ config KEMBTK_BUSYB_SWITCH_ROOT config KEMBTK_BUSYB_UMOUNT bool "umount" + default y help When you want to remove a mounted filesystem from its current mount point, for example when you are shutting down the system, the @@ -798,6 +680,7 @@ config KEMBTK_BUSYB_UMOUNT config KEMBTK_BUSYB_FEATURE_UMOUNT_ALL bool "Support option -a" + default y depends on KEMBTK_BUSYB_UMOUNT help Support -a option to unmount all currently mounted filesystems. @@ -807,6 +690,7 @@ comment "Common options for mount/umount" config KEMBTK_BUSYB_FEATURE_MOUNT_LOOP bool "Support loopback mounts" + default y depends on KEMBTK_BUSYB_MOUNT || KEMBTK_BUSYB_UMOUNT help Enabling this feature allows automatic mounting of files (containing @@ -821,6 +705,19 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_LOOP 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 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 + 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 + must however exist. + + This feature lets mount to try to create next /dev/loopN device + if it does not find a free one. + config KEMBTK_BUSYB_FEATURE_MTAB_SUPPORT bool "Support for the old /etc/mtab file" depends on KEMBTK_BUSYB_MOUNT || KEMBTK_BUSYB_UMOUNT @@ -837,10 +734,230 @@ config KEMBTK_BUSYB_FEATURE_MTAB_SUPPORT If you must use this, keep in mind it's inherently brittle (for example a mount under chroot won't update it), can't handle modern features like separate per-process filesystem namespaces, requires - that your /etc directory be writeable, tends to get easily confused + that your /etc directory be writable, 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.) About the only reason to use this is if you've removed /proc from your kernel. +config KEMBTK_BUSYB_VOLUMEID + bool #No description makes it a hidden option + +comment "-------------------------------------------------" +comment "Filesystem/Volume identification" +comment "-------------------------------------------------" + depends on KEMBTK_BUSYB_VOLUMEID + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_EXT + bool "Ext filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_BTRFS + bool "btrfs filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_REISERFS + bool "Reiser filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_FAT + bool "fat filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_HFS + bool "hfs filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_JFS + bool "jfs filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_UFS +### bool "ufs filesystem" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_XFS + bool "xfs filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_NTFS + bool "ntfs filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_ISO9660 + bool "iso9660 filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_UDF + bool "udf filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_LUKS + bool "luks filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_LINUXSWAP + bool "linux swap filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_LVM +### bool "lvm" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_CRAMFS + bool "cramfs filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_HPFS +### bool "hpfs filesystem" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_ROMFS + bool "romfs filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_SYSV + bool "sysv filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_MINIX +### bool "minix filesystem" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +### These only detect partition tables - not used (yet?) +### config FEATURE_VOLUMEID_MAC +### bool "mac filesystem" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO +### +### config FEATURE_VOLUMEID_MSDOS +### bool "msdos filesystem" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_OCFS2 + bool "ocfs2 filesystem" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_HIGHPOINTRAID +### bool "highpoint raid" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_ISWRAID +### bool "intel raid" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_LSIRAID +### bool "lsi raid" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_VIARAID +### bool "via raid" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_SILICONRAID +### bool "silicon raid" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_NVIDIARAID +### bool "nvidia raid" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_PROMISERAID +### bool "promise raid" +### default y +### depends on KEMBTK_BUSYB_VOLUMEID +### help +### TODO + +config KEMBTK_BUSYB_FEATURE_VOLUMEID_LINUXRAID + bool "linuxraid" + default y + depends on KEMBTK_BUSYB_VOLUMEID + help + TODO + + diff --git a/packages/busybox/busybox-kconfigs/busybox.kconfig b/packages/busybox/busybox-kconfigs/busybox.kconfig index b24aaef..8579b8a 100644 --- a/packages/busybox/busybox-kconfigs/busybox.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox.kconfig @@ -18,6 +18,7 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_DESKTOP bool "Enable options for full-blown desktop systems" + default y help Enable options and features which are not essential. Select this only if you plan to use busybox on full-blown @@ -42,7 +43,7 @@ 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 + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X help Use this option if you are trying to compile busybox with compiler other than gcc. @@ -82,7 +83,8 @@ config KEMBTK_BUSYB_SHOW_USAGE config KEMBTK_BUSYB_FEATURE_VERBOSE_USAGE bool "Show verbose applet usage messages" - select KEMBTK_BUSYB_SHOW_USAGE + default y + depends on KEMBTK_BUSYB_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 @@ -105,6 +107,7 @@ config KEMBTK_BUSYB_FEATURE_COMPRESS_USAGE config KEMBTK_BUSYB_FEATURE_INSTALLER bool "Support --install [-s] to install applet links at runtime" + default y help Enable 'busybox --install [-s]' support. This will allow you to use busybox at runtime to create hard links or symlinks for all the @@ -117,7 +120,14 @@ 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 + +config KEMBTK_BUSYB_UNICODE_SUPPORT bool "Support Unicode" + select KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE + default y help This makes various applets aware that one byte is not one character on screen. @@ -127,11 +137,19 @@ config KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE Probably by the time when busybox will be fully Unicode-clean, other encodings will be mainly of historic interest. +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 + help + With this option on, Unicode support is implemented using libc + routines. Otherwise, internal implementation is used. + Internal implementation is smaller. + config KEMBTK_BUSYB_FEATURE_CHECK_UNICODE_IN_ENV bool "Check $LANG environment variable" - default y - depends on KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE && !KEMBTK_BUSYB_LOCALE_SUPPORT - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X + 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 help With this option on, Unicode support is activated only if LANG variable has the value of the form "xxxx.utf8" @@ -144,10 +162,97 @@ config KEMBTK_BUSYB_GETOPT_LONG help backward compatibility for busybox-1.{13,14}.x +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 + default 63 + help + Typical values are 63 for '?' (works with any output device), + 30 for ASCII substitute control code, + 65533 (0xfffd) for Unicode replacement character. + +config 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 + default 767 + help + Any character with Unicode value bigger than this is assumed + to be non-printable on output device. Many applets replace + such chars with substitution character. + + The idea is that many valid printable Unicode chars are + nevertheless are not displayed correctly. Think about + combining charachers, double-wide hieroglyphs, obscure + characters in dozens of ancient scripts... + Many terminals, terminal emulators, xterms etc will fail + to handle them correctly. Choose the smallest value + which suits your needs. + + Typical values are: + 126 - ASCII only + 767 (0x2ff) - there are no combining chars in [0..767] range + (the range includes Latin 1, Latin Ext. A and B), + code is ~700 bytes smaller for this case. + 4351 (0x10ff) - there are no double-wide chars in [0..4351] range, + code is ~300 bytes smaller for this case. + 12799 (0x31ff) - nearly all non-ideographic characters are + available in [0..12799] range, including + East Asian scripts like katakana, hiragana, hangul, + bopomofo... + 0 - off, any valid printable Unicode character will be printed. + +config 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 + help + With this option off, any Unicode char with width of 0 + is substituted on output. + +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 + help + With this option off, any Unicode char with width > 1 + is substituted on output. + +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 + help + With this option on, right-to-left Unicode characters + are treated differently on input (e.g. cursor movement). + +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 + help + In most cases it's enough to treat only ASCII non-letters + (i.e. punctuation, numbers and space) as characters + with neutral directionality. + With this option on, more extensive (and bigger) table + of neutral chars will be used. + +config 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 + help + With this option on, invalid UTF-8 bytes are not substituted + with the selected substitution character. + For example, this means that entering 'l', 's', ' ', 0xff, [Enter] + at shell prompt will list file named 0xff (single char name + with char value 255), not file named '?'. + config KEMBTK_BUSYB_LONG_OPTS bool "Support for --long-options" - default y select KEMBTK_BUSYB_GETOPT_LONG + 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. @@ -173,14 +278,36 @@ 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 + select KEMBTK_BUSYB_FEATURE_UTMP + help + The file /var/run/wtmp is used to track when users have logged into + and logged out of the system. + With this option on, certain applets (getty, login, telnetd etc) + will append new entries there. + "last" applet requires this option. + config KEMBTK_BUSYB_FEATURE_PIDFILE bool "Support writing pidfiles" + default y help This option makes some applets (e.g. crond, syslogd, inetd) write a pidfile in /var/run. Some applications rely on them. config KEMBTK_BUSYB_FEATURE_SUID bool "Support for KEMBTK_BUSYB_SUID/SGID handling" + default y help With this option you can install the busybox binary belonging to root with the suid bit set, and it will automatically drop @@ -197,6 +324,7 @@ config KEMBTK_BUSYB_FEATURE_SUID config KEMBTK_BUSYB_FEATURE_SUID_CONFIG bool "Runtime KEMBTK_BUSYB_SUID/SGID configuration via /etc/busybox.conf" + default y if KEMBTK_BUSYB_FEATURE_SUID depends on KEMBTK_BUSYB_FEATURE_SUID help Allow the KEMBTK_BUSYB_SUID / SGID state of an applet to be determined at runtime @@ -406,6 +534,7 @@ config KEMBTK_BUSYB_FEATURE_SHARED_BUSYBOX config KEMBTK_BUSYB_LFS bool "Build with Large File Support (for accessing files > 2 GB)" + default y select KEMBTK_BUSYB_FDISK_SUPPORT_LARGE_DISKS help If you want to build BusyBox with large file support, then enable @@ -430,7 +559,7 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX 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 + 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 "" help Additional CFLAGS to pass to the compiler verbatim. diff --git a/packages/busybox/busybox.kconfig b/packages/busybox/busybox.kconfig index af2843e..7007424 100644 --- a/packages/busybox/busybox.kconfig +++ b/packages/busybox/busybox.kconfig @@ -29,6 +29,8 @@ choice Here you can choose which version series of busybox you want to use. + config EMBTK_BB_VERSION_1_17_X + bool "busybox-1.17.x" config EMBTK_BB_VERSION_1_16_X bool "busybox-1.16.x" config EMBTK_BB_VERSION_1_15_X @@ -44,6 +46,10 @@ choice help Here you can choose which version of busybox you want to use. + config EMBTK_BB_VERSION_1_17_4 + bool "busybox-1.17.4" + depends on EMBTK_BB_VERSION_1_17_X + config EMBTK_BB_VERSION_1_16_2 bool "busybox-1.16.2" depends on EMBTK_BB_VERSION_1_16_X @@ -84,6 +90,7 @@ endchoice config EMBTK_BB_VERSION_STRING string + default "1.17.4" if EMBTK_BB_VERSION_1_17_4 default "1.16.2" if EMBTK_BB_VERSION_1_16_2 default "1.16.1" if EMBTK_BB_VERSION_1_16_1 default "1.15.3" if EMBTK_BB_VERSION_1_15_3 diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk index bf6cc51..662617c 100644 --- a/packages/busybox/busybox.mk +++ b/packages/busybox/busybox.mk @@ -35,10 +35,12 @@ $(BB_BUILD_DIR)/.installed: download_busybox $(BB_BUILD_DIR)/.decompressed \ $(BB_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ busybox-$(BB_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(BB_BUILD_DIR) oldconfig - @CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing" \ $(Q)$(MAKE) -C $(BB_BUILD_DIR) \ CROSS_COMPILE=$(TOOLS)/bin/$(STRICT_GNU_TARGET)- \ + CONFIG_PREFIX=$(ROOTFS) oldconfig + @CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing" \ + $(MAKE) -C $(BB_BUILD_DIR) \ + CROSS_COMPILE=$(TOOLS)/bin/$(STRICT_GNU_TARGET)- \ CONFIG_PREFIX=$(ROOTFS) install @touch $@ @@ -55,6 +57,7 @@ $(BB_BUILD_DIR)/.configured: $(call EMBTK_GENERIC_MESSAGE,"Configuring busybox...") @grep "CONFIG_KEMBTK_BUSYB_" $(EMBTK_ROOT)/.config | \ sed -e 's/CONFIG_KEMBTK_BUSYB_*/CONFIG_/g' > $(BB_BUILD_DIR)/.config + @sed -i 's/_1_13_X_1_14_X//g' $(BB_BUILD_DIR)/.config busybox_clean: $(call EMBTK_GENERIC_MESSAGE,"cleanup busybox...") -- cgit v1.2.3