diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-19 21:15:51 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-19 21:15:51 +0200 |
| commit | 6aa60425361e75c8eb69682353dc67e9d6aaf476 (patch) | |
| tree | 939de6ce031d417e5c1a4d1fc7e210b820cd0de1 | |
| parent | f953a7cc2eac02733aa3fe945302da2469687fc7 (diff) | |
| download | embtoolkit-6aa60425361e75c8eb69682353dc67e9d6aaf476.tar.gz embtoolkit-6aa60425361e75c8eb69682353dc67e9d6aaf476.tar.bz2 embtoolkit-6aa60425361e75c8eb69682353dc67e9d6aaf476.tar.xz | |
Packages: busybox: Bump busybox-1.20.2 and remove old ones
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
25 files changed, 808 insertions, 738 deletions
diff --git a/packages/busybox/busybox-kconfigs/busybox-archival.kconfig b/packages/busybox/busybox-kconfigs/busybox-archival.kconfig index 2297fca..0cdc646 100644 --- a/packages/busybox/busybox-kconfigs/busybox-archival.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-archival.kconfig @@ -8,10 +8,8 @@ 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 || EMBTK_BB_VERSION_1_18_X default y help Make tar, rpm, modprobe etc understand .xz data. @@ -35,9 +33,9 @@ config KEMBTK_BUSYB_FEATURE_SEAMLESS_GZ Make tar, rpm, modprobe etc understand .gz data. config KEMBTK_BUSYB_FEATURE_SEAMLESS_Z - bool "Make tar and gunzip understand .Z data" + bool "tar, rpm, modprobe etc understand .Z data" help - Make tar and gunzip understand .Z data. + Make tar, rpm, modprobe etc understand .Z data. config KEMBTK_BUSYB_AR bool "ar" @@ -73,7 +71,6 @@ config KEMBTK_BUSYB_FEATURE_AR_LONG_FILENAMES config KEMBTK_BUSYB_FEATURE_AR_CREATE bool "Support archive creation" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_AR help @@ -131,7 +128,6 @@ config KEMBTK_BUSYB_FEATURE_CPIO_P bool "Support for passthrough mode" default y depends on KEMBTK_BUSYB_FEATURE_CPIO_O - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Passthrough mode. Rarely used. @@ -187,9 +183,20 @@ config KEMBTK_BUSYB_FEATURE_GZIP_LONG_OPTIONS help Enable use of long options, increases size by about 106 Bytes +config KEMBTK_BUSYB_GZIP_FAST + int "Trade memory for gzip speed (0:small,slow - 2:fast,big)" + default 0 + range 0 2 + depends on KEMBTK_BUSYB_GZIP + help + Enable big memory options for gzip. + 0: small buffers, small hash-tables + 1: larger buffers, larger hash-tables + 2: larger buffers, largest hash-tables + Larger models may give slightly better compression + config KEMBTK_BUSYB_LZOP bool "lzop" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Lzop compression/decompresion. @@ -282,7 +289,6 @@ config KEMBTK_BUSYB_FEATURE_TAR_LONG_OPTIONS config KEMBTK_BUSYB_FEATURE_TAR_TO_COMMAND bool "Support for writing to an external program" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_FEATURE_TAR_LONG_OPTIONS help @@ -301,7 +307,6 @@ 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 || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_TAR help @@ -311,7 +316,6 @@ config KEMBTK_BUSYB_FEATURE_TAR_NOPRESERVE_TIME config KEMBTK_BUSYB_FEATURE_TAR_SELINUX bool "Support for extracting SELinux labels" depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_SELINUX - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option busybox supports restoring SELinux labels when extracting files from tar archives. @@ -331,15 +335,11 @@ config KEMBTK_BUSYB_UNLZMA is generally considerably better than that achieved by the bzip2 compressors. - The BusyBox unlzma applet is limited to de-compression only. + The BusyBox unlzma applet is limited to decompression only. On an x86 system, this applet adds about 4K. - Unless you have a specific application which requires unlzma, you - should probably say N here. - 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 @@ -347,7 +347,6 @@ config KEMBTK_BUSYB_FEATURE_LZMA_FAST config KEMBTK_BUSYB_LZMA bool "Provide lzma alias which supports only unpacking" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_UNLZMA help @@ -356,14 +355,12 @@ config KEMBTK_BUSYB_LZMA config KEMBTK_BUSYB_UNXZ bool "unxz" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help unxz is a unlzma successor. config KEMBTK_BUSYB_XZ bool "Provide xz alias which supports only unpacking" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_UNXZ help diff --git a/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig b/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig index 500470a..bf81b00 100644 --- a/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-console-tools.kconfig @@ -8,11 +8,10 @@ comment "Console Utilities" comment "-------------------------------------------------" - config KEMBTK_BUSYB_CHVT bool "chvt" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) @@ -20,8 +19,7 @@ config KEMBTK_BUSYB_CHVT config KEMBTK_BUSYB_FGCONSOLE bool "fgconsole" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help This program prints active (foreground) console number. @@ -34,14 +32,14 @@ config KEMBTK_BUSYB_CLEAR config KEMBTK_BUSYB_DEALLOCVT bool "deallocvt" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program deallocates unused virtual consoles. config KEMBTK_BUSYB_DUMPKMAP bool "dumpkmap" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. @@ -49,21 +47,21 @@ config KEMBTK_BUSYB_DUMPKMAP config KEMBTK_BUSYB_KBD_MODE bool "kbd_mode" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program reports and sets keyboard mode. config KEMBTK_BUSYB_LOADFONT bool "loadfont" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program loads a console font from standard input. config KEMBTK_BUSYB_LOADKMAP bool "loadkmap" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program loads a keyboard translation table from standard input. @@ -71,7 +69,7 @@ config KEMBTK_BUSYB_LOADKMAP config KEMBTK_BUSYB_OPENVT bool "openvt" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program is used to start a command on an unused virtual terminal. @@ -103,7 +101,7 @@ config KEMBTK_BUSYB_FEATURE_RESIZE_PRINT config KEMBTK_BUSYB_SETCONSOLE bool "setconsole" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program redirects the system console to another device, like the current tty while logged in via telnet. @@ -118,7 +116,7 @@ config KEMBTK_BUSYB_FEATURE_SETCONSOLE_LONG_OPTIONS config KEMBTK_BUSYB_SETFONT bool "setfont" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Allows to load console screen map. Useful for i18n. @@ -140,7 +138,7 @@ config KEMBTK_BUSYB_DEFAULT_SETFONT_DIR config KEMBTK_BUSYB_SETKEYCODES bool "setkeycodes" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. @@ -148,26 +146,24 @@ config KEMBTK_BUSYB_SETKEYCODES config KEMBTK_BUSYB_SETLOGCONS bool "setlogcons" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This program redirects the output console of kernel messages. config KEMBTK_BUSYB_SHOWKEY bool "showkey" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Shows keys pressed. comment "Common options for loadfont and setfont" depends on KEMBTK_BUSYB_LOADFONT || KEMBTK_BUSYB_SETFONT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X config KEMBTK_BUSYB_FEATURE_LOADFONT_PSF2 bool "Support for KEMBTK_BUSYB_PSF2 console fonts" default y depends on KEMBTK_BUSYB_LOADFONT || KEMBTK_BUSYB_SETFONT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support KEMBTK_BUSYB_PSF2 console fonts. @@ -175,7 +171,6 @@ config KEMBTK_BUSYB_FEATURE_LOADFONT_RAW bool "Support for old (raw) console fonts" default y depends on KEMBTK_BUSYB_LOADFONT || KEMBTK_BUSYB_SETFONT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support old (raw) console fonts. diff --git a/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig index e939b7c..d84ebe4 100644 --- a/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig @@ -38,8 +38,8 @@ config KEMBTK_BUSYB_FEATURE_DATE_ISOFMT # defaults to "no": stat's nanosecond field is a bit non-portable config KEMBTK_BUSYB_FEATURE_DATE_NANO bool "Support %[num]N nanosecond format specifier" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X - depends on KEMBTK_BUSYB_DATE && KEMBTK_BUSYB_PLATFORM_LINUX # syscall(__NR_clock_gettime) + depends on KEMBTK_BUSYB_DATE # syscall(__NR_clock_gettime) + select KEMBTK_BUSYB_PLATFORM_LINUX help Support %[num]N format specifier. Adds ~250 bytes of code. @@ -47,7 +47,6 @@ 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 || EMBTK_BB_VERSION_1_18_X help System time can be set by 'date -s KEMBTK_BUSYB_DATE' and simply 'date KEMBTK_BUSYB_DATE', but formats of KEMBTK_BUSYB_DATE string are different. 'date KEMBTK_BUSYB_DATE' accepts @@ -59,6 +58,22 @@ config KEMBTK_BUSYB_FEATURE_DATE_COMPAT 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_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_GROUPS + bool "groups" + default y + help + Print the group names associated with current user id. config KEMBTK_BUSYB_TEST bool "test" default y @@ -73,6 +88,19 @@ config KEMBTK_BUSYB_FEATURE_TEST_64 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_FEATURE_TOUCH_SUSV3 + bool "Add support for KEMBTK_BUSYB_SUSV3 features (-d -t -r)" + default y + depends on KEMBTK_BUSYB_TOUCH + help + Enable touch to use a reference file or a given date/time argument. config KEMBTK_BUSYB_TR bool "tr" default y @@ -100,10 +128,21 @@ config KEMBTK_BUSYB_FEATURE_TR_EQUIV is possible. config KEMBTK_BUSYB_BASE64 bool "base64" - depends on EMBTK_BB_VERSION_1_18_X default y help Base64 encode and decode +config KEMBTK_BUSYB_WHO + bool "who" + default y + depends on KEMBTK_BUSYB_FEATURE_UTMP + help + who is used to show who is logged on. +config KEMBTK_BUSYB_USERS + bool "users" + default y + depends on KEMBTK_BUSYB_FEATURE_UTMP + help + Print users currently logged on. config KEMBTK_BUSYB_CAL bool "cal" @@ -141,7 +180,6 @@ config KEMBTK_BUSYB_FEATURE_CHOWN_LONG_OPTIONS bool "Enable long options" default y depends on KEMBTK_BUSYB_CHOWN && KEMBTK_BUSYB_LONG_OPTS - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable use of long options @@ -173,7 +211,6 @@ config KEMBTK_BUSYB_CP config KEMBTK_BUSYB_FEATURE_CP_LONG_OPTIONS bool "Enable long options for cp" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y depends on KEMBTK_BUSYB_CP && KEMBTK_BUSYB_LONG_OPTS help @@ -213,7 +250,6 @@ config KEMBTK_BUSYB_FEATURE_DD_THIRD_STATUS_LINE bool "Enable the third status line upon signal" default y depends on KEMBTK_BUSYB_DD && KEMBTK_BUSYB_FEATURE_DD_SIGNAL_HANDLING - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Displays a coreutils-like third status line with transferred bytes, elapsed time and speed. @@ -352,7 +388,6 @@ config KEMBTK_BUSYB_FOLD config KEMBTK_BUSYB_FSYNC bool "fsync" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help fsync is used to flush file-related cached blocks to disk. @@ -371,19 +406,6 @@ config KEMBTK_BUSYB_FEATURE_FANCY_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 @@ -397,11 +419,11 @@ config KEMBTK_BUSYB_FEATURE_INSTALL_LONG_OPTIONS 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 LENGTH +#### bool "length" +#### default y +#### help +#### length is used to print out the length of a specified string. config KEMBTK_BUSYB_LN bool "ln" @@ -619,14 +641,12 @@ config KEMBTK_BUSYB_SHA1SUM config KEMBTK_BUSYB_SHA256SUM bool "sha256sum" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Compute and check SHA256 message digest config KEMBTK_BUSYB_SHA512SUM bool "sha512sum" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Compute and check SHA512 message digest @@ -695,7 +715,7 @@ config KEMBTK_BUSYB_FEATURE_SPLIT_FANCY config KEMBTK_BUSYB_STAT bool "stat" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX # statfs() + select KEMBTK_BUSYB_PLATFORM_LINUX # statfs() help display file or filesystem status. @@ -765,13 +785,6 @@ config KEMBTK_BUSYB_FEATURE_TEE_USE_BLOCK_IO help Enable this option for a faster tee, at expense of size. -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_TRUE bool "true" default y @@ -842,13 +855,6 @@ config KEMBTK_BUSYB_FEATURE_WC_LARGE help Use "unsigned long long" in wc for counter variables. -config KEMBTK_BUSYB_WHO - bool "who" - 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 diff --git a/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig index 0eb71d0..c6316da 100644 --- a/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-debianutils.kconfig @@ -8,7 +8,6 @@ comment "Debian Utilities" comment "-------------------------------------------------" - config KEMBTK_BUSYB_MKTEMP bool "mktemp" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig index 2971d64..4812a14 100644 --- a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs-old_e2fsprogs.kconfig @@ -8,7 +8,6 @@ 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 43e8256..a5c5ed8 100644 --- a/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-e2fsprogs.kconfig @@ -8,7 +8,6 @@ comment "Linux Ext2 FS Progs" comment "-------------------------------------------------" - config KEMBTK_BUSYB_CHATTR bool "chattr" default y @@ -35,7 +34,7 @@ config KEMBTK_BUSYB_FSCK config KEMBTK_BUSYB_LSATTR bool "lsattr" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help lsattr lists the file attributes on a second extended file system. diff --git a/packages/busybox/busybox-kconfigs/busybox-editors.kconfig b/packages/busybox/busybox-kconfigs/busybox-editors.kconfig index 96bc52f..b66480a 100644 --- a/packages/busybox/busybox-kconfigs/busybox-editors.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-editors.kconfig @@ -12,85 +12,6 @@ config KEMBTK_BUSYB_PATCH default y help Apply a unified diff formatted patch. - -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. - NOTE: This will require libm to be present for linking. - -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 - the patch command. - -config KEMBTK_BUSYB_FEATURE_DIFF_BINARY - bool "Enable checks for binary files" - 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 - default y - help - 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" - default y - depends on KEMBTK_BUSYB_DIFF && KEMBTK_BUSYB_LONG_OPTS - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X - help - Enable use of long options. - -config KEMBTK_BUSYB_FEATURE_DIFF_DIR - bool "Enable directory support" - default y - depends on KEMBTK_BUSYB_DIFF - help - This option enables support for directory and subdirectory - 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. - -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 - this, you don't need it. - -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 @@ -142,6 +63,12 @@ config KEMBTK_BUSYB_FEATURE_VI_SEARCH Select this if you wish to be able to do search and replace in busybox vi. +config KEMBTK_BUSYB_FEATURE_VI_REGEX_SEARCH + bool "Enable regex in search and replace" + depends on KEMBTK_BUSYB_FEATURE_VI_SEARCH + help + Use extended regex search. + config KEMBTK_BUSYB_FEATURE_VI_USE_SIGNALS bool "Catch signals" default y @@ -191,12 +118,11 @@ config KEMBTK_BUSYB_FEATURE_VI_ASK_TERMINAL bool "Use 'tell me cursor position' ESC sequence to measure window" default y depends on KEMBTK_BUSYB_VI - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help If terminal size can't be retrieved and $LINES/$COLUMNS are not set, this option makes vi perform a last-ditch effort to find it: - vi positions cursor to 999,999 and asks terminal to report real - cursor position using "ESC [ 6 n" escape sequence, then reads stdin. + position cursor to 999,999 and ask terminal to report real + cursor position using "ESC [ 6 n" escape sequence, then read stdin. This is not clean but helps a lot on serial lines and such. @@ -208,6 +134,66 @@ config KEMBTK_BUSYB_FEATURE_VI_OPTIMIZE_CURSOR This will make the cursor movement faster, but requires more memory and it makes the applet a tiny bit larger. +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. + NOTE: This will require libm to be present for linking. + +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 + the patch command. + +config KEMBTK_BUSYB_FEATURE_DIFF_LONG_OPTIONS + bool "Enable long options" + default y + depends on KEMBTK_BUSYB_DIFF && KEMBTK_BUSYB_LONG_OPTS + help + Enable use of long options. + +config KEMBTK_BUSYB_FEATURE_DIFF_DIR + bool "Enable directory support" + default y + depends on KEMBTK_BUSYB_DIFF + help + This option enables support for directory and subdirectory + comparison. + +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 + this, you don't need it. + +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_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig index ceb9329..cf0c85c 100644 --- a/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-findutils.kconfig @@ -62,11 +62,11 @@ config KEMBTK_BUSYB_FEATURE_FIND_XDEV This option allows find to restrict searches to a single filesystem. config KEMBTK_BUSYB_FEATURE_FIND_MAXDEPTH - bool "Enable -maxdepth N" + bool "Enable -mindepth N and -maxdepth N" default y depends on KEMBTK_BUSYB_FIND help - This option enables -maxdepth N option. + This option enables -mindepth N and -maxdepth N option. config KEMBTK_BUSYB_FEATURE_FIND_NEWER bool "Enable -newer: compare file modification times" @@ -74,7 +74,7 @@ config KEMBTK_BUSYB_FEATURE_FIND_NEWER depends on KEMBTK_BUSYB_FIND help Support the 'find -newer' option for finding any files which have - a modified time that is more recent than the specified FILE. + modification time that is more recent than the specified FILE. config KEMBTK_BUSYB_FEATURE_FIND_INUM bool "Enable -inum: inode number matching" @@ -176,7 +176,6 @@ config KEMBTK_BUSYB_FEATURE_FIND_LINKS bool "Enable -links: link count matching" default y depends on KEMBTK_BUSYB_FIND - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support the 'find -links' option for matching number of links. config KEMBTK_BUSYB_GREP diff --git a/packages/busybox/busybox-kconfigs/busybox-init.kconfig b/packages/busybox/busybox-kconfigs/busybox-init.kconfig index 93757ba..f8485e4 100644 --- a/packages/busybox/busybox-kconfigs/busybox-init.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-init.kconfig @@ -9,7 +9,6 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_BOOTCHARTD bool "bootchartd" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help bootchartd is commonly used to profile the boot process @@ -56,7 +55,6 @@ config KEMBTK_BUSYB_FEATURE_CALL_TELINIT bool "Call telinit on shutdown and reboot" default y depends on KEMBTK_BUSYB_HALT && !KEMBTK_BUSYB_INIT - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Call an external program (normally telinit) to facilitate a switch to a proper runlevel. @@ -157,7 +155,6 @@ config KEMBTK_BUSYB_INIT_TERMINAL_TYPE string "Initial terminal type" default "linux" depends on KEMBTK_BUSYB_INIT - depends on EMBTK_BB_VERSION_1_18_X help This is the initial value set by init for the TERM environment variable. This variable is used by programs which make use of @@ -172,3 +169,15 @@ config KEMBTK_BUSYB_MESG Mesg controls access to your terminal by others. It is typically used to allow or disallow other users to write to your terminal +config KEMBTK_BUSYB_FEATURE_MESG_ENABLE_ONLY_GROUP + bool "Enable writing to tty only by group, not by everybody" + default y + depends on KEMBTK_BUSYB_MESG + help + Usually, ttys are owned by group "tty", and "write" tool is + setgid to this group. This way, "mesg y" only needs to enable + "write by owning group" bit in tty mode. + + If you set this option to N, "mesg y" will enable writing + by anybody at all. This is not recommended. + diff --git a/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig b/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig index 340230c..886dbbc 100644 --- a/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-libbb.kconfig @@ -7,7 +7,20 @@ comment "-------------------------------------------------" comment "Busybox Library Tuning" comment "-------------------------------------------------" - +config KEMBTK_BUSYB_FEATURE_SYSTEMD + bool "Enable systemd support" + default y + help + If you plan to use busybox daemons on a system where daemons + are controlled by systemd, enable this option. + If you don't use systemd, it is still safe to enable it, + but the downside is increased code size. +config KEMBTK_BUSYB_FEATURE_RTMINMAX + bool "Support RTMIN[+n] and RTMAX[-n] signal names" + default y + help + Support RTMIN[+n] and RTMAX[-n] signal names + in kill, killall etc. This costs ~250 bytes. config KEMBTK_BUSYB_PASSWORD_MINLEN int "Minimum password length" @@ -16,9 +29,9 @@ config KEMBTK_BUSYB_PASSWORD_MINLEN help Minimum allowable password length. -config KEMBTK_BUSYB_MD5_SIZE_VS_SPEED +config KEMBTK_BUSYB_MD5_SMALL int "MD5: Trade bytes for speed (0:fast, 3:slow)" - default 2 + default 1 range 0 3 help Trade binary size versus speed for the md5sum algorithm. @@ -80,11 +93,12 @@ config KEMBTK_BUSYB_FEATURE_EDITING_VI config KEMBTK_BUSYB_FEATURE_EDITING_HISTORY int "History size" - range 0 99999 + # Don't allow way too big values here, code uses fixed "char *history[N]" struct member + range 0 9999 default 255 depends on KEMBTK_BUSYB_FEATURE_EDITING help - Specify command history size. + Specify command history size (0 - disable). config KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY bool "History saving" @@ -93,6 +107,20 @@ config KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY help Enable history saving in shells. +config KEMBTK_BUSYB_FEATURE_EDITING_SAVE_ON_EXIT + bool "Save history on shell exit, not after every command" + depends on KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY + help + Save history on shell exit, not after every command. + +config KEMBTK_BUSYB_FEATURE_REVERSE_SEARCH + bool "Reverse history search" + default y + depends on KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY + help + Enable readline-like Ctrl-R combination for reverse history search. + Increases code by about 0.5k. + config KEMBTK_BUSYB_FEATURE_TAB_COMPLETION bool "Tab completion" default y @@ -117,7 +145,6 @@ config KEMBTK_BUSYB_FEATURE_EDITING_FANCY_PROMPT config KEMBTK_BUSYB_FEATURE_EDITING_ASK_TERMINAL bool "Query cursor position from terminal" depends on KEMBTK_BUSYB_FEATURE_EDITING - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Allow usage of "ESC [ 6 n" sequence. Terminal answers back with current cursor position. This information is used to make line @@ -128,14 +155,13 @@ config KEMBTK_BUSYB_FEATURE_EDITING_ASK_TERMINAL config KEMBTK_BUSYB_FEATURE_NON_POSIX_CP bool "Non-POSIX, but safer, copying to special nodes" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help With this option, "cp file symlink" will delete symlink and create a regular file. This does not conform to POSIX, but prevents a symlink attack. Similarly, "cp file device" will not send file's data - to the device. + to the device. (To do that, use "cat file >device") config KEMBTK_BUSYB_FEATURE_VERBOSE_CP_MESSAGE bool "Give more precise messages when copy fails (cp, mv etc)" @@ -155,14 +181,33 @@ config KEMBTK_BUSYB_FEATURE_COPYBUF_KB range 1 1024 default 4 help - Size of buffer used by cp, mv, install etc. + Size of buffer used by cp, mv, install, wget etc. Buffers which are 4 kb or less will be allocated on stack. Bigger buffers will be allocated with mmap, with fallback to 4 kb stack buffer if mmap fails. +config KEMBTK_BUSYB_FEATURE_SKIP_ROOTFS + bool "Skip rootfs in mount table" + default y + help + Ignore rootfs entry in mount table. + + In Linux, kernel has a special filesystem, rootfs, which is initially + mounted on /. It contains initramfs data, if kernel is configured + to have one. Usually, another file system is mounted over / early + in boot process, and therefore most tools which manipulate + mount table, such as df, will skip rootfs entry. + + However, some systems do not mount anything on /. + If you need to configure busybox for one of these systems, + you may find it useful to turn this option off to make df show + initramfs statistics. + + Otherwise, choose Y. + config KEMBTK_BUSYB_MONOTONIC_SYSCALL bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring time intervals (time, ping, traceroute etc need this). diff --git a/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig index 018dcd2..1fa32a4 100644 --- a/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-loginutils.kconfig @@ -9,14 +9,12 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_ADD_SHELL bool "add-shell" - depends on EMBTK_BB_VERSION_1_18_X default y if KEMBTK_BUSYB_DESKTOP help Add shells to /etc/shells. config KEMBTK_BUSYB_REMOVE_SHELL bool "remove-shell" - depends on EMBTK_BB_VERSION_1_18_X default y if KEMBTK_BUSYB_DESKTOP help Remove shells from /etc/shells. @@ -99,7 +97,6 @@ config KEMBTK_BUSYB_USE_BB_CRYPT_SHA bool "Enable SHA256/512 crypt functions" default y depends on KEMBTK_BUSYB_USE_BB_CRYPT - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable this if you have passwords starting with "$5$" or "$6$" in your /etc/passwd or /etc/shadow files. These passwords @@ -135,7 +132,6 @@ config KEMBTK_BUSYB_FEATURE_CHECK_NAMES config KEMBTK_BUSYB_FIRST_SYSTEM_ID int "First valid system uid or gid for adduser and addgroup" depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X range 0 64900 default 100 help @@ -144,7 +140,6 @@ config KEMBTK_BUSYB_FIRST_SYSTEM_ID config KEMBTK_BUSYB_LAST_SYSTEM_ID int "Last valid system uid or gid for adduser and addgroup" depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X range 0 64900 default 999 help @@ -160,7 +155,6 @@ config KEMBTK_BUSYB_FEATURE_ADDGROUP_LONG_OPTIONS bool "Enable long options" default y depends on KEMBTK_BUSYB_ADDGROUP && KEMBTK_BUSYB_LONG_OPTS - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support long options for the addgroup applet. @@ -198,7 +192,19 @@ config KEMBTK_BUSYB_GETTY default y select KEMBTK_BUSYB_FEATURE_SYSLOG help - getty lets you log in on a tty, it is normally invoked by init. + getty lets you log in on a tty. It is normally invoked by init. + + Note that you can save a few bytes by disabling it and + using login applet directly. + If you need to reset tty attributes before calling login, + this script approximates getty: + + exec </dev/$1 >/dev/$1 2>&1 || exit 1 + reset + stty sane; stty ispeed 38400; stty ospeed 38400 + printf "%s login: " "`hostname`" + read -r login + exec /bin/login "$login" config KEMBTK_BUSYB_LOGIN bool "login" @@ -210,6 +216,17 @@ config KEMBTK_BUSYB_LOGIN Note that Busybox binary must be setuid root for this applet to work properly. +config KEMBTK_BUSYB_LOGIN_SESSION_AS_CHILD + bool "Run logged in session in a child process" + default y if KEMBTK_BUSYB_PAM + depends on KEMBTK_BUSYB_LOGIN + help + Run the logged in session in a child process. This allows + login to clean up things such as utmp entries or KEMBTK_BUSYB_PAM sessions + when the login session is complete. If you use KEMBTK_BUSYB_PAM, you + almost always would want this to be set to Y, else KEMBTK_BUSYB_PAM session + will not be cleaned up. + config KEMBTK_BUSYB_PAM bool "Support for KEMBTK_BUSYB_PAM (Pluggable Authentication Modules)" depends on KEMBTK_BUSYB_LOGIN @@ -276,6 +293,13 @@ config KEMBTK_BUSYB_CHPASSWD Reads a file of user name and password pairs from standard input and uses this information to update a group of existing users. +config KEMBTK_BUSYB_FEATURE_DEFAULT_PASSWD_ALGO + string "Default password encryption method (passwd -a, cryptpw -m parameter)" + default "des" + depends on KEMBTK_BUSYB_PASSWD || KEMBTK_BUSYB_CRYPTPW + help + Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". + config KEMBTK_BUSYB_SU bool "su" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-mailutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-mailutils.kconfig index 4b5d6dd..c775d38 100644 --- a/packages/busybox/busybox-kconfigs/busybox-mailutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-mailutils.kconfig @@ -3,7 +3,6 @@ comment "Mail Utilities" comment "-------------------------------------------------" - config KEMBTK_BUSYB_MAKEMIME bool "makemime" default y @@ -54,19 +53,3 @@ config KEMBTK_BUSYB_SENDMAIL help Barebones sendmail. -config KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX - bool "Allow to specify subject, attachments, their charset etc" - default y - depends on KEMBTK_BUSYB_SENDMAIL - depends on EMBTK_BB_VERSION_1_13_X - help - Allow to specify subject, attachments and their charset. - Allow to use custom connection helper. - -config KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILXX - bool "Allow to specify Cc: addresses and some additional headers" - depends on KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX - depends on EMBTK_BB_VERSION_1_13_X - help - Allow to specify Cc: addresses and some additional headers: - Errors-To: diff --git a/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig index 6e41683..4145745 100644 --- a/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-miscutils.kconfig @@ -9,44 +9,153 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_CONSPY bool "conspy" - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + default y + select KEMBTK_BUSYB_PLATFORM_LINUX 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_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'. + +config KEMBTK_BUSYB_FEATURE_LESS_MAXLINES + int "Max number of input lines less will try to eat" + default 9999999 + depends on KEMBTK_BUSYB_LESS + +config KEMBTK_BUSYB_FEATURE_LESS_BRACKETS + bool "Enable bracket searching" + default y + depends on KEMBTK_BUSYB_LESS + help + This option adds the capability to search for matching left and right + brackets, facilitating programming. + +config KEMBTK_BUSYB_FEATURE_LESS_FLAGS + bool "Enable -m/-M" + default y + depends on KEMBTK_BUSYB_LESS + help + The -M/-m flag enables a more sophisticated status line. + +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_ASK_TERMINAL + bool "Use 'tell me cursor position' ESC sequence to measure window" + default y + depends on KEMBTK_BUSYB_FEATURE_LESS_WINCH + help + Makes less track window size changes. + If terminal size can't be retrieved and $LINES/$COLUMNS are not set, + this option makes less perform a last-ditch effort to find it: + position cursor to 999,999 and ask terminal to report real + cursor position using "ESC [ 6 n" escape sequence, then read stdin. + + This is not clean but helps a lot on serial lines and such. + +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 + less itself ('-' keyboard command). + +config KEMBTK_BUSYB_FEATURE_LESS_LINENUMS + bool "Enable dynamic switching of line numbers" + default y + depends on KEMBTK_BUSYB_FEATURE_LESS_DASHCMD + help + Enables "-N" command. config KEMBTK_BUSYB_NANDWRITE bool - depends on KEMBTK_BUSYB_PLATFORM_LINUX default n + select KEMBTK_BUSYB_PLATFORM_LINUX help Write to the specified KEMBTK_BUSYB_MTD device, with bad blocks awareness config KEMBTK_BUSYB_NANDDUMP bool - depends on KEMBTK_BUSYB_PLATFORM_LINUX default n + select KEMBTK_BUSYB_PLATFORM_LINUX help Dump the content of raw NAND chip +config KEMBTK_BUSYB_SETSERIAL + bool "setserial" + default y + select KEMBTK_BUSYB_PLATFORM_LINUX + help + Retrieve or set Linux serial port. config KEMBTK_BUSYB_UBIATTACH bool - depends on KEMBTK_BUSYB_PLATFORM_LINUX default n + select KEMBTK_BUSYB_PLATFORM_LINUX help Attach KEMBTK_BUSYB_MTD device to an UBI device. config KEMBTK_BUSYB_UBIDETACH bool - depends on KEMBTK_BUSYB_PLATFORM_LINUX default n + select KEMBTK_BUSYB_PLATFORM_LINUX help Detach KEMBTK_BUSYB_MTD device from an UBI device. +config KEMBTK_BUSYB_UBIMKVOL + bool + default n + select KEMBTK_BUSYB_PLATFORM_LINUX + help + Create a UBI volume. + +config KEMBTK_BUSYB_UBIRMVOL + bool + default n + select KEMBTK_BUSYB_PLATFORM_LINUX + help + Delete a UBI volume. + +config KEMBTK_BUSYB_UBIRSVOL + bool + default n + select KEMBTK_BUSYB_PLATFORM_LINUX + help + Resize a UBI volume. + +config KEMBTK_BUSYB_UBIUPDATEVOL + bool + default n + select KEMBTK_BUSYB_PLATFORM_LINUX + help + Update a UBI volume. + config KEMBTK_BUSYB_ADJTIMEX bool "adjtimex" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. @@ -61,7 +170,6 @@ config KEMBTK_BUSYB_FEATURE_COMPRESS_BBCONFIG bool "Compress bbconfig data" default y depends on KEMBTK_BUSYB_BBCONFIG - depends on EMBTK_BB_VERSION_1_18_X help Store bbconfig data in compressed form, uncompress them on-the-fly before output. @@ -75,8 +183,7 @@ config KEMBTK_BUSYB_FEATURE_COMPRESS_BBCONFIG config KEMBTK_BUSYB_BEEP bool "beep" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help The beep applets beeps in a given freq/Hz. @@ -200,7 +307,6 @@ config KEMBTK_BUSYB_FEATURE_CROND_DIR string "crond spool directory" default "/var/spool/cron" depends on KEMBTK_BUSYB_CROND || KEMBTK_BUSYB_CRONTAB - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Location of crond spool. @@ -230,7 +336,7 @@ config KEMBTK_BUSYB_FEATURE_DC_LIBM config KEMBTK_BUSYB_DEVFSD bool "devfsd (obsolete)" - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_FEATURE_SYSLOG help This is deprecated and should NOT be used anymore. @@ -273,7 +379,7 @@ config KEMBTK_BUSYB_DEVFSD_VERBOSE config KEMBTK_BUSYB_FEATURE_DEVFS bool "Use devfs names for all devices (obsolete)" - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This is obsolete and should NOT be used anymore. Use linux >= 2.6 (optionally with hotplug) and mdev instead! @@ -292,14 +398,14 @@ config KEMBTK_BUSYB_DEVMEM config KEMBTK_BUSYB_EJECT bool "eject" - default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + default n + select KEMBTK_BUSYB_PLATFORM_LINUX help Used to eject cdroms. (defaults to /dev/cdrom) config KEMBTK_BUSYB_FEATURE_EJECT_SCSI bool "SCSI support" - default y + default n depends on KEMBTK_BUSYB_EJECT help Add the -s option to eject, this allows to eject SCSI-Devices and @@ -308,7 +414,7 @@ config KEMBTK_BUSYB_FEATURE_EJECT_SCSI config KEMBTK_BUSYB_FBSPLASH bool "fbsplash" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Shows splash image and progress bar on framebuffer device. Can be used during boot phase of an embedded device. ~2kb. @@ -358,8 +464,7 @@ config KEMBTK_BUSYB_FLASH_ERASEALL config KEMBTK_BUSYB_IONICE bool "ionice" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help Set/set program io scheduling class and priority Requires kernel >= 2.6.13 @@ -394,76 +499,10 @@ config KEMBTK_BUSYB_FEATURE_LAST_FANCY logged into the system (mimics sysvinit last). +900 bytes. 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'. - -config KEMBTK_BUSYB_FEATURE_LESS_MAXLINES - int "Max number of input lines less will try to eat" - default 9999999 - depends on KEMBTK_BUSYB_LESS - -config KEMBTK_BUSYB_FEATURE_LESS_BRACKETS - bool "Enable bracket searching" - default y - depends on KEMBTK_BUSYB_LESS - help - This option adds the capability to search for matching left and right - brackets, facilitating programming. - -config KEMBTK_BUSYB_FEATURE_LESS_FLAGS - bool "Enable extra flags" - default y - depends on KEMBTK_BUSYB_LESS - help - The extra flags provided do the following: - - The -M flag enables a more sophisticated status line. - The -m flag enables a simpler status line with a percentage. - -config 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 - less itself ('-' keyboard command). - -config KEMBTK_BUSYB_FEATURE_LESS_LINENUMS - bool "Enable dynamic switching of line numbers" - default y - depends on KEMBTK_BUSYB_FEATURE_LESS_DASHCMD - help - Enables "-N" command. - config KEMBTK_BUSYB_HDPARM bool "hdparm" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Get/Set hard drive parameters. Primarily intended for ATA drives. Adds about 13k (or around 30k if you enable the @@ -579,7 +618,7 @@ config KEMBTK_BUSYB_MT config KEMBTK_BUSYB_RAIDAUTORUN bool "raidautorun" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help raidautorun tells the kernel md driver to search and start RAID arrays. @@ -587,7 +626,8 @@ config KEMBTK_BUSYB_RAIDAUTORUN config KEMBTK_BUSYB_READAHEAD bool "readahead" default y - depends on KEMBTK_BUSYB_LFS && KEMBTK_BUSYB_PLATFORM_LINUX + depends on KEMBTK_BUSYB_LFS + select KEMBTK_BUSYB_PLATFORM_LINUX help Preload the files listed on the command line into RAM cache so that subsequent reads on these files will not block on disk I/O. @@ -603,8 +643,7 @@ config KEMBTK_BUSYB_READAHEAD config KEMBTK_BUSYB_RFKILL bool "rfkill" - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help Enable/disable wireless devices. @@ -616,6 +655,7 @@ config KEMBTK_BUSYB_RFKILL config KEMBTK_BUSYB_RUNLEVEL bool "runlevel" default y + depends on KEMBTK_BUSYB_FEATURE_UTMP help find the current and previous system runlevel. @@ -625,7 +665,7 @@ config KEMBTK_BUSYB_RUNLEVEL config KEMBTK_BUSYB_RX bool "rx" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Receive files using the Xmodem protocol. @@ -667,7 +707,6 @@ config KEMBTK_BUSYB_TIME config KEMBTK_BUSYB_TIMEOUT bool "timeout" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Runs a program and watches it. If it does not terminate in @@ -684,22 +723,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 || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Prints a CD-ROM volume name. config KEMBTK_BUSYB_WALL bool "wall" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y + depends on KEMBTK_BUSYB_FEATURE_UTMP help Write a message to all users that are logged in. config KEMBTK_BUSYB_WATCHDOG bool "watchdog" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The watchdog utility is used with hardware or software watchdog device drivers. It opens the specified watchdog device special file diff --git a/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig index f4bdb46..a6e6b25 100644 --- a/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-modutils.kconfig @@ -6,18 +6,18 @@ comment "-------------------------------------------------" comment "Linux Module Utilities" comment "-------------------------------------------------" -depends on KEMBTK_BUSYB_PLATFORM_LINUX config KEMBTK_BUSYB_MODINFO bool "modinfo" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y + select KEMBTK_BUSYB_PLATFORM_LINUX help Show information about a Linux Kernel module config KEMBTK_BUSYB_MODPROBE_SMALL bool "Simplified modutils" default y + select KEMBTK_BUSYB_PLATFORM_LINUX help Simplified modutils. @@ -52,6 +52,7 @@ 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 + select KEMBTK_BUSYB_PLATFORM_LINUX help Allow insmod and modprobe take module options from command line. @@ -65,24 +66,28 @@ config KEMBTK_BUSYB_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED config KEMBTK_BUSYB_INSMOD bool "insmod" depends on !KEMBTK_BUSYB_MODPROBE_SMALL + select KEMBTK_BUSYB_PLATFORM_LINUX help insmod is used to load specified modules in the running kernel. config KEMBTK_BUSYB_RMMOD bool "rmmod" depends on !KEMBTK_BUSYB_MODPROBE_SMALL + select KEMBTK_BUSYB_PLATFORM_LINUX help rmmod is used to unload specified modules from the kernel. config KEMBTK_BUSYB_LSMOD bool "lsmod" depends on !KEMBTK_BUSYB_MODPROBE_SMALL + select KEMBTK_BUSYB_PLATFORM_LINUX help lsmod is used to display a list of loaded modules. config KEMBTK_BUSYB_FEATURE_LSMOD_PRETTY_2_6_OUTPUT bool "Pretty output" depends on KEMBTK_BUSYB_LSMOD + select KEMBTK_BUSYB_PLATFORM_LINUX help This option makes output format of lsmod adjusted to the format of module-init-tools for Linux kernel 2.6. @@ -91,6 +96,7 @@ config KEMBTK_BUSYB_FEATURE_LSMOD_PRETTY_2_6_OUTPUT config KEMBTK_BUSYB_MODPROBE bool "modprobe" depends on !KEMBTK_BUSYB_MODPROBE_SMALL + select KEMBTK_BUSYB_PLATFORM_LINUX help Handle the loading of modules, and their dependencies on a high level. @@ -98,6 +104,7 @@ config KEMBTK_BUSYB_MODPROBE config KEMBTK_BUSYB_FEATURE_MODPROBE_BLACKLIST bool "Blacklist support" depends on KEMBTK_BUSYB_MODPROBE + select KEMBTK_BUSYB_PLATFORM_LINUX help Say 'y' here to enable support for the 'blacklist' command in modprobe.conf. This prevents the alias resolver to resolve @@ -108,6 +115,7 @@ config KEMBTK_BUSYB_FEATURE_MODPROBE_BLACKLIST config KEMBTK_BUSYB_DEPMOD bool "depmod" depends on !KEMBTK_BUSYB_MODPROBE_SMALL + select KEMBTK_BUSYB_PLATFORM_LINUX help depmod generates modules.dep (and potentially modules.alias and modules.symbols) that contain dependency information @@ -118,6 +126,7 @@ comment "Options common to multiple modutils" config KEMBTK_BUSYB_FEATURE_2_4_MODULES bool "Support version 2.2/2.4 Linux kernels" depends on KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_RMMOD || KEMBTK_BUSYB_LSMOD + select KEMBTK_BUSYB_PLATFORM_LINUX help Support module loading for 2.2.x and 2.4.x Linux kernels. This increases size considerably. Say N unless you plan @@ -126,7 +135,7 @@ config KEMBTK_BUSYB_FEATURE_2_4_MODULES config KEMBTK_BUSYB_FEATURE_INSMOD_TRY_MMAP bool "Try to load module from a mmap'ed area" depends on KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_MODPROBE_SMALL - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help This option causes module loading code to try to mmap module first. If it does not work (for example, @@ -142,6 +151,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_TRY_MMAP config KEMBTK_BUSYB_FEATURE_INSMOD_VERSION_CHECKING bool "Enable module version checking" depends on KEMBTK_BUSYB_FEATURE_2_4_MODULES && (KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_MODPROBE) + select KEMBTK_BUSYB_PLATFORM_LINUX help Support checking of versions for modules. This is used to ensure that the kernel and module are made for each other. @@ -149,6 +159,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_VERSION_CHECKING config KEMBTK_BUSYB_FEATURE_INSMOD_KSYMOOPS_SYMBOLS bool "Add module symbols to kernel symbol table" depends on KEMBTK_BUSYB_FEATURE_2_4_MODULES && (KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_MODPROBE) + select KEMBTK_BUSYB_PLATFORM_LINUX help By adding module symbols to the kernel symbol table, Oops messages occuring within kernel modules can be properly debugged. By enabling @@ -159,6 +170,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_KSYMOOPS_SYMBOLS config KEMBTK_BUSYB_FEATURE_INSMOD_LOADINKMEM bool "In kernel memory optimization (uClinux only)" depends on KEMBTK_BUSYB_FEATURE_2_4_MODULES && (KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_MODPROBE) + select KEMBTK_BUSYB_PLATFORM_LINUX help This is a special uClinux only memory optimization that lets insmod load the specified kernel module directly into kernel space, reducing @@ -168,6 +180,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_LOADINKMEM config KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP bool "Enable insmod load map (-m) option" depends on KEMBTK_BUSYB_FEATURE_2_4_MODULES && KEMBTK_BUSYB_INSMOD + select KEMBTK_BUSYB_PLATFORM_LINUX help Enabling this, one would be able to get a load map output on stdout. This makes kernel module debugging @@ -179,6 +192,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP_FULL bool "Symbols in load map" default y depends on KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP && !KEMBTK_BUSYB_MODPROBE_SMALL + select KEMBTK_BUSYB_PLATFORM_LINUX help Without this option, -m will only output section load map. With this option, -m will also output @@ -188,6 +202,7 @@ config KEMBTK_BUSYB_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y depends on (KEMBTK_BUSYB_LSMOD || KEMBTK_BUSYB_FEATURE_2_4_MODULES) && !KEMBTK_BUSYB_MODPROBE_SMALL + select KEMBTK_BUSYB_PLATFORM_LINUX help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your @@ -198,6 +213,7 @@ config KEMBTK_BUSYB_FEATURE_MODUTILS_ALIAS bool "Support for module.aliases file" default y depends on KEMBTK_BUSYB_DEPMOD || KEMBTK_BUSYB_MODPROBE + select KEMBTK_BUSYB_PLATFORM_LINUX help Generate and parse modules.alias containing aliases for bus identifiers: @@ -214,6 +230,7 @@ config KEMBTK_BUSYB_FEATURE_MODUTILS_SYMBOLS bool "Support for module.symbols file" default y depends on KEMBTK_BUSYB_DEPMOD || KEMBTK_BUSYB_MODPROBE + select KEMBTK_BUSYB_PLATFORM_LINUX help Generate and parse modules.symbols containing aliases for symbol_request() kernel calls, such as: diff --git a/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig b/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig index 099c4fa..52c6bb9 100644 --- a/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig @@ -3,35 +3,15 @@ # see scripts/kbuild/config-language.txt. # -config KEMBTK_BUSYB_APP_UDHCPD - bool - default n +config KEMBTK_BUSYB_UDHCPC6 + bool "udhcp client for DHCPv6 (udhcpc6)" 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 - -config KEMBTK_BUSYB_APP_DUMPLEASES - 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 + udhcpc6 is a DHCPv6 client config KEMBTK_BUSYB_UDHCPD bool "udhcp server (udhcpd)" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - select KEMBTK_BUSYB_APP_UDHCPD + select KEMBTK_BUSYB_PLATFORM_LINUX help udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -40,7 +20,6 @@ config KEMBTK_BUSYB_DHCPRELAY bool "dhcprelay" default y depends on KEMBTK_BUSYB_UDHCPD - select KEMBTK_BUSYB_APP_DHCPRELAY help dhcprelay listens for dhcp requests on one or more interfaces and forwards these requests to a different interface or dhcp @@ -50,7 +29,6 @@ config KEMBTK_BUSYB_DUMPLEASES bool "Lease display utility (dumpleases)" default y depends on KEMBTK_BUSYB_UDHCPD - select KEMBTK_BUSYB_APP_DUMPLEASES help dumpleases displays the leases written out by the udhcpd server. Lease times are stored in the file by time remaining in lease, or @@ -64,7 +42,20 @@ config KEMBTK_BUSYB_FEATURE_UDHCPD_WRITE_LEASES_EARLY If selected, udhcpd will write a new file with leases every time a new lease has been accepted, thus eliminating the need to send SIGUSR1 for the initial writing or updating. Any timed - rewriting remains undisturbed + rewriting remains undisturbed. + +config KEMBTK_BUSYB_FEATURE_UDHCPD_BASE_IP_ON_MAC + bool "Select KEMBTK_BUSYB_IP address based on client MAC" + depends on KEMBTK_BUSYB_UDHCPD + help + If selected, udhcpd will base its selection of KEMBTK_BUSYB_IP address to offer + on the client's hardware address. Otherwise udhcpd uses the next + consecutive free address. + + This reduces the frequency of KEMBTK_BUSYB_IP address changes for clients + which let their lease expire, and makes consecutive DHCPOFFERS + for the same client to (almost always) contain the same + KEMBTK_BUSYB_IP address. config KEMBTK_BUSYB_DHCPD_LEASES_FILE string "Absolute path to lease file" @@ -77,8 +68,7 @@ config KEMBTK_BUSYB_DHCPD_LEASES_FILE config KEMBTK_BUSYB_UDHCPC bool "udhcp client (udhcpc)" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - select KEMBTK_BUSYB_APP_UDHCPC + select KEMBTK_BUSYB_PLATFORM_LINUX help udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -86,14 +76,6 @@ config KEMBTK_BUSYB_UDHCPC The udhcp client negotiates a lease with the DHCP server and runs a script when a lease is obtained or lost. -config KEMBTK_BUSYB_UDHCP_DEBUG_1_13_X_1_14_X - bool "Compile udhcp with noisy debugging messages" - default n - depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC || KEMBTK_BUSYB_DHCPRELAY - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X - help - If selected, udhcpd will output extra debugging output. - config KEMBTK_BUSYB_FEATURE_UDHCPC_ARPING bool "Verify that the offered address is free, using KEMBTK_BUSYB_ARP ping" default y @@ -106,7 +88,6 @@ 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. @@ -117,7 +98,6 @@ config KEMBTK_BUSYB_UDHCP_DEBUG 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 || EMBTK_BB_VERSION_1_18_X help Verbosity can be increased with multiple -v options. This option controls how high it can be cranked up. @@ -134,6 +114,14 @@ config KEMBTK_BUSYB_FEATURE_UDHCP_RFC3397 search lists via option 119, specified in RFC 3397, and SIP servers option 120, specified in RFC 3361. +config KEMBTK_BUSYB_FEATURE_UDHCP_8021Q + bool "Support for 802.1Q VLAN parameters" + default y + depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC + help + If selected, both client and server will support passing of VLAN + KEMBTK_BUSYB_ID and priority via options 132 and 133 as per 802.1Q. + config KEMBTK_BUSYB_UDHCPC_DEFAULT_SCRIPT string "Absolute path to config script" default "/usr/share/udhcpc/default.script" diff --git a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig index 7319af4..ba7ea47 100644 --- a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig @@ -7,6 +7,35 @@ comment "-------------------------------------------------" comment "Networking Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_NAMEIF + bool "nameif" + default y + select KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_FEATURE_SYSLOG + help + nameif is used to rename network interface by its MAC address. + Renamed interfaces MUST be in the down state. + It is possible to use a file (default: /etc/mactab) + with list of new interface names and MACs. + Maximum interface name length: IFNAMSIZ = 16 + File fields are separated by space or tab. + File format: + # Comment + new_interface_name XX:XX:XX:XX:XX:XX + +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, driver, + phyaddr selectors. The syntax is compatible to the normal nameif. + File format: + new_interface_name driver=asix bus=usb-0000:00:08.2-3 + new_interface_name bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5 + new_interface_name phy_address=2 00:80:C8:38:91:B5 + new_interface_name mac=00:80:C8:38:91:B5 + new_interface_name 00:80:C8:38:91:B5 config KEMBTK_BUSYB_NBDCLIENT bool "nbd-client" default y @@ -43,6 +72,33 @@ config KEMBTK_BUSYB_NC_110_COMPAT 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_PING + bool "ping" + default y + select KEMBTK_BUSYB_PLATFORM_LINUX + help + ping uses the ICMP protocol's mandatory KEMBTK_BUSYB_ECHO_REQUEST datagram to + elicit an ICMP KEMBTK_BUSYB_ECHO_RESPONSE from a host or gateway. + +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. + +config KEMBTK_BUSYB_FEATURE_FANCY_PING + bool "Enable fancy ping output" + default y + depends on KEMBTK_BUSYB_PING + help + Make the output from the ping applet include statistics, and at the + same time provide full support for ICMP packets. +config KEMBTK_BUSYB_WHOIS + bool "whois" + default y + help + whois is a client for the whois directory service config KEMBTK_BUSYB_FEATURE_IPV6 bool "Enable KEMBTK_BUSYB_IPv6 support" @@ -53,7 +109,6 @@ config KEMBTK_BUSYB_FEATURE_IPV6 config KEMBTK_BUSYB_FEATURE_UNIX_LOCAL bool "Enable Unix domain socket support (usually not needed)" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable Unix domain socket support in all busybox networking applets. Address of the form local:/path/to/unix/socket @@ -87,21 +142,21 @@ config KEMBTK_BUSYB_VERBOSE_RESOLUTION_ERRORS config KEMBTK_BUSYB_ARP bool "arp" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Manipulate the system KEMBTK_BUSYB_ARP cache. config KEMBTK_BUSYB_ARPING bool "arping" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Ping hosts by KEMBTK_BUSYB_ARP packets. config KEMBTK_BUSYB_BRCTL bool "brctl" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Manage ethernet bridges. Supports addbr/delbr and addif/delif. @@ -134,7 +189,7 @@ config KEMBTK_BUSYB_DNSD config KEMBTK_BUSYB_ETHER_WAKE bool "ether-wake" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Send a magic packet to wake up sleeping machines. @@ -148,7 +203,6 @@ config KEMBTK_BUSYB_FAKEIDENTD config KEMBTK_BUSYB_FTPD bool "ftpd" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help simple FTP daemon. You have to run it via inetd. @@ -164,7 +218,6 @@ config KEMBTK_BUSYB_FEATURE_FTPD_ACCEPT_BROKEN_LIST bool "Enable workaround for RFC-violating clients" default y depends on KEMBTK_BUSYB_FTPD - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Some ftp clients (among them KDE's Konqueror) issue illegal "LIST -l" requests. This option works around such problems. @@ -220,14 +273,6 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_USE_SENDFILE When enabled, httpd will use the kernel sendfile() function instead of read/write loop. -config KEMBTK_BUSYB_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP - bool "Support reloading of global config file on HUP signal" - depends on KEMBTK_BUSYB_HTTPD - depends on EMBTK_BB_VERSION_1_13_X - help - This option enables processing of SIGHUP to reload cached - configuration settings. - config KEMBTK_BUSYB_FEATURE_HTTPD_SETUID bool "Enable -u <user> option" default y @@ -245,22 +290,22 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_BASIC_AUTH help Utilizes password settings from /etc/httpd.conf for basic authentication on a per url basis. + Example for httpd.conf file: + /adm:toor:PaSsWd 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 - using md5 passwords. - -config KEMBTK_BUSYB_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES - bool "Support loading additional MIME types at run-time" - depends on KEMBTK_BUSYB_HTTPD - depends on EMBTK_BB_VERSION_1_13_X - help - This option enables support for additional MIME types at - run-time to be specified in the configuration file. + Enables encrypted passwords, and wildcard user/passwords + in httpd.conf file. + User '*' means 'any system user name is ok', + password of '*' means 'use system password for this user' + Examples: + /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0 + /adm:root:* + /wiki:*:* config KEMBTK_BUSYB_FEATURE_HTTPD_CGI bool "Support Common Gateway Interface (CGI)" @@ -277,8 +322,8 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR help This option enables support for running scripts through an interpreter. Turn this on if you want PHP scripts to work - properly. You need to supply an additional line in your httpd - config file: + properly. You need to supply an additional line in your + httpd.conf file: *.php:/path/to/your/php config KEMBTK_BUSYB_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV @@ -327,7 +372,6 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_GZIP bool "Support for KEMBTK_BUSYB_GZIP content encoding" default y depends on KEMBTK_BUSYB_HTTPD - depends on EMBTK_BB_VERSION_1_18_X help Makes httpd send files using KEMBTK_BUSYB_GZIP content encoding if the client supports it and a pre-compressed <file>.gz exists. @@ -335,7 +379,7 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_GZIP config KEMBTK_BUSYB_IFCONFIG bool "ifconfig" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Ifconfig is used to configure the kernel-resident network interfaces. @@ -383,7 +427,7 @@ config KEMBTK_BUSYB_FEATURE_IFCONFIG_BROADCAST_PLUS config KEMBTK_BUSYB_IFENSLAVE bool "ifenslave" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Userspace application to bind several interfaces to a logical interface (use with kernel bonding driver). @@ -391,8 +435,7 @@ config KEMBTK_BUSYB_IFENSLAVE config KEMBTK_BUSYB_IFPLUGD bool "ifplugd" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help Network interface plug detection daemon. @@ -434,7 +477,8 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP_BUILTIN bool "Use busybox ip applet" default y - depends on KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP && KEMBTK_BUSYB_PLATFORM_LINUX + depends on KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP + select KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_IP select KEMBTK_BUSYB_FEATURE_IP_ADDRESS select KEMBTK_BUSYB_FEATURE_IP_LINK @@ -551,7 +595,7 @@ config KEMBTK_BUSYB_FEATURE_INETD_RPC config KEMBTK_BUSYB_IP bool "ip" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The "ip" applet is a TCP/IP interface configuration and routing utility. You generally don't need "ip" to use busybox with @@ -663,39 +707,10 @@ config KEMBTK_BUSYB_FEATURE_IPCALC_LONG_OPTIONS help Support long options for the ipcalc applet. -config KEMBTK_BUSYB_NAMEIF - bool "nameif" - default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - select KEMBTK_BUSYB_FEATURE_SYSLOG - help - nameif is used to rename network interface by its MAC address. - Renamed interfaces MUST be in the down state. - It is possible to use a file (default: /etc/mactab) - with list of new interface names and MACs. - Maximum interface name length: IFNAMSIZ = 16 - File fields are separated by space or tab. - File format: - # Comment - new_interface_name XX:XX:XX:XX:XX:XX - -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 - checks. The syntax is compatible to the normal nameif. - File format: - new_interface_name driver=asix bus=usb-0000:00:08.2-3 - new_interface_name bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5 - new_interface_name mac=00:80:C8:38:91:B5 - new_interface_name 00:80:C8:38:91:B5 - config KEMBTK_BUSYB_NETSTAT bool "netstat" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help netstat prints information about the Linux networking subsystem. @@ -724,8 +739,7 @@ config KEMBTK_BUSYB_NSLOOKUP config KEMBTK_BUSYB_NTPD bool "ntpd" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help The NTP client/server daemon. @@ -737,29 +751,6 @@ config KEMBTK_BUSYB_FEATURE_NTPD_SERVER 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 - depends on KEMBTK_BUSYB_PLATFORM_LINUX - help - ping uses the ICMP protocol's mandatory KEMBTK_BUSYB_ECHO_REQUEST datagram to - elicit an ICMP KEMBTK_BUSYB_ECHO_RESPONSE from a host or gateway. - -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. - -config KEMBTK_BUSYB_FEATURE_FANCY_PING - bool "Enable fancy ping output" - default y - depends on KEMBTK_BUSYB_PING - help - Make the output from the ping applet include statistics, and at the - same time provide full support for ICMP packets. - config KEMBTK_BUSYB_PSCAN bool "pscan" default y @@ -769,14 +760,14 @@ config KEMBTK_BUSYB_PSCAN config KEMBTK_BUSYB_ROUTE bool "route" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Route displays or manipulates the kernel's KEMBTK_BUSYB_IP routing tables. config KEMBTK_BUSYB_SLATTACH bool "slattach" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help slattach is a small utility to attach network interfaces to serial lines. @@ -878,7 +869,6 @@ config KEMBTK_BUSYB_FEATURE_TELNETD_INETD_WAIT bool "Support -w SEC option (inetd wait mode)" default y depends on KEMBTK_BUSYB_FEATURE_TELNETD_STANDALONE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help This option allows you to run telnetd in "inet wait" mode. Example inetd.conf line (note "wait", not usual "nowait"): @@ -950,7 +940,6 @@ config KEMBTK_BUSYB_FEATURE_TFTP_PROGRESS_BAR bool "Enable tftp progress meter" default y depends on KEMBTK_BUSYB_TFTP && KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Show progress bar. @@ -964,7 +953,7 @@ config KEMBTK_BUSYB_TFTP_DEBUG config KEMBTK_BUSYB_TRACEROUTE bool "traceroute" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Utility to trace the route of KEMBTK_BUSYB_IP packets. @@ -972,7 +961,6 @@ config KEMBTK_BUSYB_TRACEROUTE6 bool "traceroute6" default y depends on KEMBTK_BUSYB_FEATURE_IPV6 && KEMBTK_BUSYB_TRACEROUTE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Utility to trace the route of KEMBTK_BUSYB_IPv6 packets. @@ -1000,8 +988,7 @@ config KEMBTK_BUSYB_FEATURE_TRACEROUTE_USE_ICMP config KEMBTK_BUSYB_TUNCTL bool "tunctl" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help tunctl creates or deletes tun devices. @@ -1019,7 +1006,6 @@ config KEMBTK_BUSYB_IFUPDOWN_UDHCPC_CMD_OPTIONS string "ifup udhcpc command line options" default "-R -n" depends on KEMBTK_BUSYB_IFUPDOWN && KEMBTK_BUSYB_UDHCPC - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Command line options to pass to udhcpc from ifup. Intended to alter options not available in /etc/network/interfaces. @@ -1035,7 +1021,7 @@ config KEMBTK_BUSYB_UDPSVD config KEMBTK_BUSYB_VCONFIG bool "vconfig" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Creates, removes, and configures VLAN interfaces @@ -1071,7 +1057,6 @@ config KEMBTK_BUSYB_FEATURE_WGET_TIMEOUT bool "Enable read timeout option -T SEC" default y depends on KEMBTK_BUSYB_WGET - depends on EMBTK_BB_VERSION_1_18_X help Supports network read timeout for wget, so that wget will give up and timeout when reading network data, through the -T command @@ -1083,7 +1068,7 @@ config KEMBTK_BUSYB_FEATURE_WGET_TIMEOUT config KEMBTK_BUSYB_ZCIP bool "zcip" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_FEATURE_SYSLOG help KEMBTK_BUSYB_ZCIP provides ZeroConf KEMBTK_BUSYB_IPv4 address selection, according to RFC 3927. diff --git a/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig b/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig index 66fb6fe..a096fe9 100644 --- a/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-printutils.kconfig @@ -8,7 +8,6 @@ comment "Print Utilities" comment "-------------------------------------------------" - config KEMBTK_BUSYB_LPD bool "lpd" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-procps.kconfig b/packages/busybox/busybox-kconfigs/busybox-procps.kconfig index 14db82a..1fc9bd5 100644 --- a/packages/busybox/busybox-kconfigs/busybox-procps.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-procps.kconfig @@ -9,40 +9,71 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_IOSTAT bool "iostat" - depends on EMBTK_BB_VERSION_1_18_X default y help Report KEMBTK_BUSYB_CPU and I/O statistics +config KEMBTK_BUSYB_LSOF + bool "lsof" + default y + help + Show open files in the format of: + PID <TAB> /path/to/executable <TAB> /path/to/opened/file config KEMBTK_BUSYB_MPSTAT bool "mpstat" - depends on EMBTK_BB_VERSION_1_18_X default y help Per-processor statistics +config KEMBTK_BUSYB_NMETER + bool "nmeter" + default y + help + Prints selected system stats continuously, one line per update. config KEMBTK_BUSYB_PMAP bool "pmap" - depends on EMBTK_BB_VERSION_1_18_X default y help Display processes' memory mappings. config KEMBTK_BUSYB_POWERTOP - bool - depends on EMBTK_BB_VERSION_1_18_X + bool "powertop" default y help Analyze power consumption on Intel-based laptops +config KEMBTK_BUSYB_PSTREE + bool "pstree" + default y + help + Display a tree of processes. +config KEMBTK_BUSYB_PWDX + bool "pwdx" + default y + help + Report current working directory of a process config KEMBTK_BUSYB_SMEMCAP bool "smemcap" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help smemcap is a tool for capturing process data for smem, a memory usage statistic tool. +config KEMBTK_BUSYB_UPTIME + bool "uptime" + default y + select KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() + help + uptime gives a one line display of the current time, how long + the system has been running, how many users are currently logged + on, and the system load averages for the past 1, 5, and 15 minutes. + +config KEMBTK_BUSYB_FEATURE_UPTIME_UTMP_SUPPORT + bool "Support for showing the number of users" + default y + depends on KEMBTK_BUSYB_UPTIME && KEMBTK_BUSYB_FEATURE_UTMP + help + Makes uptime display the number of users currently logged on. config KEMBTK_BUSYB_FREE bool "free" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() + select KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() help free displays the total amount of free and used physical and swap memory in the system, as well as the buffers used by the kernel. @@ -78,12 +109,6 @@ config KEMBTK_BUSYB_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 @@ -128,16 +153,25 @@ config KEMBTK_BUSYB_PS config KEMBTK_BUSYB_FEATURE_PS_WIDE bool "Enable wide output option (-w)" default y - depends on KEMBTK_BUSYB_PS + depends on KEMBTK_BUSYB_PS && !KEMBTK_BUSYB_DESKTOP help Support argument 'w' for wide output. If given once, 132 chars are printed, and if given more than once, the length is unlimited. +config KEMBTK_BUSYB_FEATURE_PS_LONG + bool "Enable long output option (-l)" + default y + depends on KEMBTK_BUSYB_PS && !KEMBTK_BUSYB_DESKTOP + help + Support argument 'l' for long output. + Adds fields PPID, RSS, START, KEMBTK_BUSYB_TIME & KEMBTK_BUSYB_TTY + config KEMBTK_BUSYB_FEATURE_PS_TIME bool "Enable time and elapsed time output" default y - depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP && KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() + depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP + select KEMBTK_BUSYB_PLATFORM_LINUX help Support -o time and -o etime output specifiers. @@ -145,7 +179,6 @@ config KEMBTK_BUSYB_FEATURE_PS_ADDITIONAL_COLUMNS bool "Enable additional ps columns" default y depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Support -o rgroup, -o ruser, -o nice output specifiers. @@ -224,21 +257,12 @@ config KEMBTK_BUSYB_FEATURE_TOPMEM Enable 's' in top (gives lots of memory info). config KEMBTK_BUSYB_FEATURE_SHOW_THREADS - bool "Support for showing threads in ps/top" + bool "Support for showing threads in ps/pstree/top" default y - depends on KEMBTK_BUSYB_PS || KEMBTK_BUSYB_TOP - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + depends on KEMBTK_BUSYB_PS || KEMBTK_BUSYB_TOP || KEMBTK_BUSYB_PSTREE help - Enables ps -T option and 'h' command in top - -config KEMBTK_BUSYB_UPTIME - bool "uptime" - default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX #sysinfo() - help - uptime gives a one line display of the current time, how long - the system has been running, how many users are currently logged - on, and the system load averages for the past 1, 5, and 15 minutes. + Enables the ps -T option, showing of threads in pstree, + and 'h' command in top. config KEMBTK_BUSYB_WATCH bool "watch" diff --git a/packages/busybox/busybox-kconfigs/busybox-runit.kconfig b/packages/busybox/busybox-kconfigs/busybox-runit.kconfig index 6fed735..9233612 100644 --- a/packages/busybox/busybox-kconfigs/busybox-runit.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-runit.kconfig @@ -8,7 +8,6 @@ comment "Runit Utilities" comment "-------------------------------------------------" - config KEMBTK_BUSYB_RUNSV bool "runsv" default y diff --git a/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig b/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig index 22c9f15..8cc9b2e 100644 --- a/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-selinux.kconfig @@ -9,7 +9,6 @@ comment "-------------------------------------------------" depends on KEMBTK_BUSYB_SELINUX - config KEMBTK_BUSYB_CHCON bool "chcon" depends on KEMBTK_BUSYB_SELINUX diff --git a/packages/busybox/busybox-kconfigs/busybox-shell.kconfig b/packages/busybox/busybox-kconfigs/busybox-shell.kconfig index 674beed..65a83d6 100644 --- a/packages/busybox/busybox-kconfigs/busybox-shell.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-shell.kconfig @@ -18,23 +18,6 @@ config KEMBTK_BUSYB_ASH shell (by Herbert Xu), which was created by porting the 'ash' shell (written by Kenneth Almquist) from NetBSD. -config KEMBTK_BUSYB_ASH_READ_NCHARS - bool "'read -n N' and 'read -s' support" - depends on KEMBTK_BUSYB_ASH - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X - help - 'read -n N' will return a value after N characters have been - read. 'read -s' will read without echoing the user's input. - -config KEMBTK_BUSYB_ASH_READ_TIMEOUT - bool "'read -t S' support" - depends on KEMBTK_BUSYB_ASH - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X - help - 'read -t S' will return a value after S seconds have passed. - This implementation will allow fractional seconds, expressed - as a decimal fraction, e.g. 'read -t 2.5 foo'. - config KEMBTK_BUSYB_ASH_BASH_COMPAT bool "bash-compatible extensions" default y @@ -42,6 +25,12 @@ config KEMBTK_BUSYB_ASH_BASH_COMPAT help Enable bash-compatible extensions. +config KEMBTK_BUSYB_ASH_IDLE_TIMEOUT + bool "Idle timeout variable" + depends on KEMBTK_BUSYB_ASH + help + Enables bash-like auto-logout after $TMOUT seconds of idle time. + config KEMBTK_BUSYB_ASH_JOB_CONTROL bool "Job control" default y @@ -50,56 +39,39 @@ config KEMBTK_BUSYB_ASH_JOB_CONTROL Enable job control in the ash shell. config KEMBTK_BUSYB_ASH_ALIAS - bool "alias support" + bool "Alias support" default y depends on KEMBTK_BUSYB_ASH help Enable alias support in the ash shell. -config KEMBTK_BUSYB_ASH_MATH_SUPPORT - bool "Posix math support" - default y - depends on KEMBTK_BUSYB_ASH - depends on EMBTK_BB_VERSION_1_13_X - help - Enable math support in the ash shell. - -config KEMBTK_BUSYB_ASH_MATH_SUPPORT_64 - bool "Extend Posix math support to 64 bit" - depends on KEMBTK_BUSYB_ASH_MATH_SUPPORT - depends on EMBTK_BB_VERSION_1_13_X - help - Enable 64-bit math support in the ash shell. This will make - the shell slightly larger, but will allow computation with very - large numbers. - config 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. + Enable support for getopts builtin in ash. config KEMBTK_BUSYB_ASH_BUILTIN_ECHO bool "Builtin version of 'echo'" default y depends on KEMBTK_BUSYB_ASH help - Enable support for echo, builtin to ash. + Enable support for echo builtin in ash. config KEMBTK_BUSYB_ASH_BUILTIN_PRINTF bool "Builtin version of 'printf'" default y depends on KEMBTK_BUSYB_ASH help - Enable support for printf, builtin to ash. + Enable support for printf builtin in ash. config KEMBTK_BUSYB_ASH_BUILTIN_TEST bool "Builtin version of 'test'" default y depends on KEMBTK_BUSYB_ASH help - Enable support for test, builtin to ash. + Enable support for test builtin in ash. config KEMBTK_BUSYB_ASH_CMDCMD bool "'command' command to override shell builtins" @@ -114,7 +86,7 @@ config KEMBTK_BUSYB_ASH_MAIL bool "Check for new mail on interactive shells" depends on KEMBTK_BUSYB_ASH help - Enable "check for new mail" in the ash shell. + Enable "check for new mail" function in the ash shell. config KEMBTK_BUSYB_ASH_OPTIMIZE_FOR_SIZE bool "Optimize for size instead of speed" @@ -147,18 +119,22 @@ config KEMBTK_BUSYB_CTTYHACK bool "cttyhack" default y help - One common problem reported on the mailing list is "can't access tty; - job control turned off" error message which typically appears when - one tries to use shell with stdin/stdout opened to /dev/console. + One common problem reported on the mailing list is the "can't + access tty; job control turned off" error message, which typically + appears when one tries to use a shell with stdin/stdout on + /dev/console. This device is special - it cannot be a controlling tty. - Proper solution is to use correct device instead of /dev/console. + The proper solution is to use the correct device instead of + /dev/console. - cttyhack provides "quick and dirty" solution to this problem. + cttyhack provides a "quick and dirty" solution to this problem. It analyzes stdin with various ioctls, trying to determine whether it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). - If it detects one, it closes stdin/out/err and reopens that device. - Then it executes given program. Opening the device will make + On Linux it also checks sysfs for a pointer to the active console. + If cttyhack is able to find the real console device, it closes + stdin/out/err and reopens that device. + Then it executes the given program. Opening the device will make that device a controlling tty. This may require cttyhack to be a session leader. @@ -179,6 +155,9 @@ config KEMBTK_BUSYB_CTTYHACK # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1' + Starting getty on a controlling tty from a shell script: + + # getty 115200 $(cttyhack) config KEMBTK_BUSYB_HUSH bool "hush" default y @@ -197,7 +176,6 @@ config KEMBTK_BUSYB_HUSH_BASH_COMPAT bool "bash-compatible extensions" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable bash-compatible extensions. @@ -205,7 +183,6 @@ config KEMBTK_BUSYB_HUSH_BRACE_EXPANSION bool "Brace expansion" default y depends on KEMBTK_BUSYB_HUSH_BASH_COMPAT - depends on EMBTK_BB_VERSION_1_18_X help Enable {abc,def} extension. @@ -230,7 +207,6 @@ config KEMBTK_BUSYB_HUSH_SAVEHISTORY bool "Save command history to .hush_history" default y depends on KEMBTK_BUSYB_HUSH_INTERACTIVE && KEMBTK_BUSYB_FEATURE_EDITING_SAVEHISTORY - depends on EMBTK_BB_VERSION_1_18_X help Enable history saving in hush. @@ -277,7 +253,6 @@ config KEMBTK_BUSYB_HUSH_FUNCTIONS bool "Support funcname() { commands; } syntax" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable support for shell functions in hush. +800 bytes. @@ -292,7 +267,6 @@ config KEMBTK_BUSYB_HUSH_RANDOM_SUPPORT bool "Pseudorandom generator and $RANDOM variable" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. @@ -301,7 +275,6 @@ 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 || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help export -n unexports variables. It is a bash extension. @@ -309,18 +282,18 @@ config KEMBTK_BUSYB_HUSH_MODE_X bool "Support 'hush -x' option and 'set -x' command" default y depends on KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_18_X help This instructs hush to print commands before execution. Adds ~300 bytes. config KEMBTK_BUSYB_MSH bool "msh (deprecated: aliased to hush)" - select KEMBTK_BUSYB_HUSH if EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_HUSH help msh is deprecated and will be removed, please migrate to hush. + choice prompt "Choose which shell is aliased to 'sh' name" help @@ -329,17 +302,13 @@ choice # note: cannot use "select KEMBTK_BUSYB_ASH" here, it breaks "make allnoconfig" config KEMBTK_BUSYB_FEATURE_SH_IS_ASH - bool "ash" depends on KEMBTK_BUSYB_ASH + bool "ash" depends on !KEMBTK_BUSYB_NOMMU config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH - bool "hush" depends on KEMBTK_BUSYB_HUSH - -config KEMBTK_BUSYB_FEATURE_SH_IS_MSH - bool "msh" - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X + bool "hush" config KEMBTK_BUSYB_FEATURE_SH_IS_NONE bool "none" @@ -348,7 +317,6 @@ endchoice choice prompt "Choose which shell is aliased to 'bash' name" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Choose which shell you want to be executed by 'bash' alias. The ash shell is the most bash compatible and full featured one. @@ -377,17 +345,11 @@ config KEMBTK_BUSYB_FEATURE_BASH_IS_NONE endchoice -config KEMBTK_BUSYB_LASH - bool "lash (deprecated)" - select KEMBTK_BUSYB_HUSH if (EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X) - help - lash is deprecated and will be removed, please migrate to hush. config KEMBTK_BUSYB_SH_MATH_SUPPORT bool "POSIX math support" default y depends on KEMBTK_BUSYB_ASH || KEMBTK_BUSYB_HUSH - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable math support in the shell via $((...)) syntax. @@ -403,13 +365,13 @@ 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 + depends on KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH help Remove the busybox introduction when starting a shell. config KEMBTK_BUSYB_FEATURE_SH_STANDALONE bool "Standalone shell" - depends on (KEMBTK_BUSYB_MSH || KEMBTK_BUSYB_LASH || KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH) && KEMBTK_BUSYB_FEATURE_PREFER_APPLETS + depends on (KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH) && KEMBTK_BUSYB_FEATURE_PREFER_APPLETS help This option causes busybox shells to use busybox applets in preference to executables in the PATH whenever possible. For @@ -441,11 +403,11 @@ config KEMBTK_BUSYB_FEATURE_SH_STANDALONE config KEMBTK_BUSYB_FEATURE_SH_NOFORK bool "Run 'nofork' applets directly" - depends on (KEMBTK_BUSYB_MSH || KEMBTK_BUSYB_LASH || KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH) && KEMBTK_BUSYB_FEATURE_PREFER_APPLETS + depends on (KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH) && KEMBTK_BUSYB_FEATURE_PREFER_APPLETS help - This option causes busybox shells [currently only ash] - to not execute typical fork/exec/wait sequence, but call <applet>_main - directly, if possible. (Sometimes it is not possible: for example, + This option causes busybox shells to not execute typical + fork/exec/wait sequence, but call <applet>_main directly, + if possible. (Sometimes it is not possible: for example, this is not possible in pipes). This will be done only for some applets (those which are marked @@ -453,5 +415,16 @@ config KEMBTK_BUSYB_FEATURE_SH_NOFORK This may significantly speed up some shell scripts. - This feature is relatively new. Use with care. + This feature is relatively new. Use with care. Report bugs + to project mailing list. + +config KEMBTK_BUSYB_FEATURE_SH_HISTFILESIZE + bool "Use $HISTFILESIZE" + default y + depends on KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH + help + This option makes busybox shells to use $HISTFILESIZE variable + to set shell history size. Note that its max value is capped + by "History size" setting in library tuning section. + diff --git a/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig b/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig index 1cba376..4bd23fd 100644 --- a/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-sysklogd.kconfig @@ -8,7 +8,6 @@ comment "System Logging Utilities" comment "-------------------------------------------------" - config KEMBTK_BUSYB_SYSLOGD bool "syslogd" default y @@ -54,12 +53,18 @@ config KEMBTK_BUSYB_FEATURE_SYSLOGD_DUP Option -D instructs syslogd to drop consecutive messages which are totally the same. +config KEMBTK_BUSYB_FEATURE_SYSLOGD_CFG + bool "Support syslog.conf" + default y + depends on KEMBTK_BUSYB_SYSLOGD + help + Supports restricted syslogd config. See docs/syslog.conf.txt + 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 || EMBTK_BB_VERSION_1_18_X help This option sets the size of the syslog read buffer. Actual memory usage increases around five times the @@ -122,8 +127,8 @@ config KEMBTK_BUSYB_KLOGD config KEMBTK_BUSYB_FEATURE_KLOGD_KLOGCTL bool "Use the klogctl() interface" default y - depends on KEMBTK_BUSYB_KLOGD && KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_18_X + depends on KEMBTK_BUSYB_KLOGD + select KEMBTK_BUSYB_PLATFORM_LINUX help The klogd applet supports two interfaces for reading kernel messages. Linux provides the klogctl() interface diff --git a/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig b/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig index 7b4fb2c..532945a 100644 --- a/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-util-linux.kconfig @@ -9,13 +9,68 @@ comment "-------------------------------------------------" config KEMBTK_BUSYB_BLOCKDEV bool "blockdev" - depends on EMBTK_BB_VERSION_1_18_X default y help Performs some ioctls with block devices. +config KEMBTK_BUSYB_MDEV + bool "mdev" + default y + select KEMBTK_BUSYB_PLATFORM_LINUX + help + mdev is a mini-udev implementation for dynamically creating device + nodes in the /dev directory. + + For more information, please see docs/mdev.txt + +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 + permissions of the device nodes. + + For more information, please see docs/mdev.txt + +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. + + For more information, please see docs/mdev.txt + +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 + device. + +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 + executing commands when devices are created/removed. + + For more information, please see docs/mdev.txt + +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. + + These devices will request userspace look up the files in + /lib/firmware/ and if it exists, send it to the kernel for + loading into the hardware. config KEMBTK_BUSYB_REV bool "rev" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Reverse lines of a file or files. @@ -23,8 +78,7 @@ config KEMBTK_BUSYB_REV config KEMBTK_BUSYB_ACPID bool "acpid" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help acpid listens to ACPI events coming either in textual form from /proc/acpi/event (though it is marked deprecated it is still widely @@ -47,17 +101,23 @@ config KEMBTK_BUSYB_FEATURE_ACPID_COMPAT config KEMBTK_BUSYB_BLKID bool "blkid" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_VOLUMEID help Lists labels and UUIDs of all filesystems. WARNING: With all submodules selected, it will add ~8k to busybox. +config KEMBTK_BUSYB_FEATURE_BLKID_TYPE + bool "Print filesystem type" + depends on KEMBTK_BUSYB_BLKID + help + Show TYPE="filesystem type" + config KEMBTK_BUSYB_DMESG bool "dmesg" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help dmesg is used to examine or control the kernel ring buffer. When the Linux kernel prints messages to the system log, they are stored in @@ -91,7 +151,7 @@ config KEMBTK_BUSYB_FEATURE_DMESG_PRETTY config KEMBTK_BUSYB_FBSET bool "fbset" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help fbset is used to show or change the settings of a Linux frame buffer device. The frame buffer device provides a simple and unique @@ -120,7 +180,7 @@ config KEMBTK_BUSYB_FEATURE_FBSET_READMODE config KEMBTK_BUSYB_FDFLUSH bool "fdflush" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help fdflush is only needed when changing media on slightly-broken removable media drives. It is used to make Linux believe that a @@ -133,14 +193,14 @@ config KEMBTK_BUSYB_FDFLUSH config KEMBTK_BUSYB_FDFORMAT bool "fdformat" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help fdformat is used to low-level format a floppy disk. config KEMBTK_BUSYB_FDISK bool "fdisk" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The fdisk utility is used to divide hard disks into one or more logical disks, which are generally called partitions. This utility @@ -151,6 +211,7 @@ config KEMBTK_BUSYB_FDISK_SUPPORT_LARGE_DISKS bool "Support over 4GB disks" default y depends on KEMBTK_BUSYB_FDISK + depends on !KEMBTK_BUSYB_LFS # with KEMBTK_BUSYB_LFS no special code is needed help Enable this option to support large disks > 4GB. @@ -194,7 +255,6 @@ config KEMBTK_BUSYB_FEATURE_OSF_LABEL config KEMBTK_BUSYB_FEATURE_GPT_LABEL bool "Support GPT disklabels" depends on KEMBTK_BUSYB_FDISK && KEMBTK_BUSYB_FEATURE_FDISK_WRITABLE - depends on EMBTK_BB_VERSION_1_18_X help Enabling this option allows you to view GUID Partition Table disklabels. @@ -212,7 +272,7 @@ config KEMBTK_BUSYB_FEATURE_FDISK_ADVANCED config KEMBTK_BUSYB_FINDFS bool "findfs" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_VOLUMEID help Prints the name of a filesystem with given label or UUID. @@ -221,7 +281,6 @@ config KEMBTK_BUSYB_FINDFS config KEMBTK_BUSYB_FLOCK bool "flock" - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help Manage locks from shell scripts @@ -229,7 +288,7 @@ config KEMBTK_BUSYB_FLOCK config KEMBTK_BUSYB_FREERAMDISK bool "freeramdisk" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Linux allows you to create ramdisks. This utility allows you to delete them and completely free all memory that was used for the @@ -252,15 +311,14 @@ config KEMBTK_BUSYB_FSCK_MINIX config KEMBTK_BUSYB_MKFS_EXT2 bool "mkfs_ext2" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help Utility to create EXT2 filesystems. config KEMBTK_BUSYB_MKFS_MINIX bool "mkfs_minix" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The minix filesystem is a nice, small, compact, read-write filesystem with little overhead. If you wish to be able to create minix @@ -277,8 +335,7 @@ config KEMBTK_BUSYB_FEATURE_MINIX2 config KEMBTK_BUSYB_MKFS_REISER bool "mkfs_reiser" - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help Utility to create ReiserFS filesystems. Note: this applet needs a lot of testing and polishing. @@ -286,8 +343,7 @@ config KEMBTK_BUSYB_MKFS_REISER config KEMBTK_BUSYB_MKFS_VFAT bool "mkfs_vfat" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + select KEMBTK_BUSYB_PLATFORM_LINUX help Utility to create FAT32 filesystems. @@ -306,7 +362,6 @@ config KEMBTK_BUSYB_FEATURE_GETOPT_LONG bool "Support option -l" default y if KEMBTK_BUSYB_LONG_OPTS depends on KEMBTK_BUSYB_GETOPT - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable support for long options (option -l). @@ -337,7 +392,7 @@ config KEMBTK_BUSYB_HD config KEMBTK_BUSYB_HWCLOCK bool "hwclock" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The hwclock utility is used to read and set the hardware clock on a system. This is primarily used to set the current time on @@ -375,7 +430,7 @@ config KEMBTK_BUSYB_IPCRM config KEMBTK_BUSYB_IPCS bool "ipcs" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The ipcs utility is used to provide information on the currently allocated System V interprocess (KEMBTK_BUSYB_IPC) objects in the system. @@ -383,7 +438,7 @@ config KEMBTK_BUSYB_IPCS config KEMBTK_BUSYB_LOSETUP bool "losetup" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help losetup is used to associate or detach a loop device with a regular file or block device, and to query the status of a loop device. This @@ -392,8 +447,7 @@ config KEMBTK_BUSYB_LOSETUP config KEMBTK_BUSYB_LSPCI bool "lspci" default y - #depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + #select KEMBTK_BUSYB_PLATFORM_LINUX help lspci is a utility for displaying information about PCI buses in the system and devices connected to them. @@ -403,72 +457,13 @@ config KEMBTK_BUSYB_LSPCI config KEMBTK_BUSYB_LSUSB bool "lsusb" default y - #depends on KEMBTK_BUSYB_PLATFORM_LINUX - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + #select KEMBTK_BUSYB_PLATFORM_LINUX help lsusb is a utility for displaying information about USB buses in the system and devices connected to them. This version uses sysfs (/sys/bus/usb/devices) only. -config KEMBTK_BUSYB_MDEV - bool "mdev" - default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX - help - mdev is a mini-udev implementation for dynamically creating device - nodes in the /dev directory. - - For more information, please see docs/mdev.txt - -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 - permissions of the device nodes. - - For more information, please see docs/mdev.txt - -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. - - For more information, please see docs/mdev.txt - -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 - device. - -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 - executing commands when devices are created/removed. - - For more information, please see docs/mdev.txt - -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. - - These devices will request userspace look up the files in - /lib/firmware/ and if it exists, send it to the kernel for - loading into the hardware. - config KEMBTK_BUSYB_MKSWAP bool "mkswap" default y @@ -482,19 +477,10 @@ config KEMBTK_BUSYB_MKSWAP Once you have created swap space using 'mkswap' you need to enable the swap space using the 'swapon' utility. -config KEMBTK_BUSYB_FEATURE_MKSWAP_V0 - bool "Version 0 support" - depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X - help - Enable support for the old v0 style. - If your kernel is older than 2.1.117, then v0 support is the - only option. - config KEMBTK_BUSYB_FEATURE_MKSWAP_UUID bool "UUID support" default y depends on KEMBTK_BUSYB_MKSWAP - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Generate swap spaces with universally unique identifiers. @@ -511,7 +497,7 @@ config KEMBTK_BUSYB_MORE config KEMBTK_BUSYB_MOUNT bool "mount" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help All files and filesystems in Unix are arranged into one big directory tree. The 'mount' utility is used to graft a filesystem onto a @@ -558,13 +544,17 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_LABEL This also enables label or uuid support for swapon. config KEMBTK_BUSYB_FEATURE_MOUNT_NFS - bool "Support mounting NFS file systems" - default y + bool "Support mounting NFS file systems on Linux < 2.6.23" depends on KEMBTK_BUSYB_MOUNT select KEMBTK_BUSYB_FEATURE_HAVE_RPC select KEMBTK_BUSYB_FEATURE_SYSLOG help - Enable mounting of NFS file systems. + Enable mounting of NFS file systems on Linux kernels prior + to version 2.6.23. Note that in this case mounting of NFS + over KEMBTK_BUSYB_IPv6 will not be possible. + + Note that this option links in RPC support from libc, + which is rather large (~10 kbytes on uclibc). config KEMBTK_BUSYB_FEATURE_MOUNT_CIFS bool "Support mounting CIFS/SMB file systems" @@ -593,7 +583,7 @@ config KEMBTK_BUSYB_FEATURE_MOUNT_FSTAB config KEMBTK_BUSYB_PIVOT_ROOT bool "pivot_root" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The pivot_root utility swaps the mount points for the root filesystem with some other mounted filesystem. This allows you to do all sorts @@ -621,14 +611,14 @@ config KEMBTK_BUSYB_RDEV config KEMBTK_BUSYB_READPROFILE bool "readprofile" default y - #depends on KEMBTK_BUSYB_PLATFORM_LINUX + #select KEMBTK_BUSYB_PLATFORM_LINUX help This allows you to parse /proc/profile for basic profiling. config KEMBTK_BUSYB_RTCWAKE bool "rtcwake" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Enter a system sleep state until specified wakeup time. @@ -640,7 +630,6 @@ config KEMBTK_BUSYB_SCRIPT config KEMBTK_BUSYB_SCRIPTREPLAY bool "scriptreplay" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help This program replays a typescript, using timing information @@ -649,7 +638,7 @@ config KEMBTK_BUSYB_SCRIPTREPLAY config KEMBTK_BUSYB_SETARCH bool "setarch" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The linux32 utility is used to create a 32bit environment for the specified program (usually a shell). It only makes sense to have @@ -659,7 +648,7 @@ config KEMBTK_BUSYB_SETARCH config KEMBTK_BUSYB_SWAPONOFF bool "swaponoff" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help This option enables both the 'swapon' and the 'swapoff' utilities. Once you have created some swap space using 'mkswap', you also need @@ -678,7 +667,7 @@ config KEMBTK_BUSYB_FEATURE_SWAPON_PRI config KEMBTK_BUSYB_SWITCH_ROOT bool "switch_root" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help The switch_root utility is used from initramfs to select a new root device. Under initramfs, you have to use this instead of @@ -698,7 +687,7 @@ config KEMBTK_BUSYB_SWITCH_ROOT config KEMBTK_BUSYB_UMOUNT bool "umount" default y - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help When you want to remove a mounted filesystem from its current mount point, for example when you are shutting down the system, the @@ -736,7 +725,6 @@ 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 || EMBTK_BB_VERSION_1_18_X help Linux kernels >= 2.6.24 support unlimited loopback devices. They are allocated for use when trying to use a loop device. The loop device diff --git a/packages/busybox/busybox-kconfigs/busybox.kconfig b/packages/busybox/busybox-kconfigs/busybox.kconfig index 3317df2..b3df6d4 100644 --- a/packages/busybox/busybox-kconfigs/busybox.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox.kconfig @@ -43,14 +43,13 @@ config KEMBTK_BUSYB_INCLUDE_SUSv2 config KEMBTK_BUSYB_USE_PORTABLE_CODE bool "Avoid using GCC-specific code constructs" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Use this option if you are trying to compile busybox with compiler other than gcc. If you do use gcc, this option may needlessly increase code size. config KEMBTK_BUSYB_PLATFORM_LINUX - bool + bool "Enable Linux-specific applets and features" default y help For the most part, busybox requires only POSIX compatibility @@ -84,20 +83,21 @@ config KEMBTK_BUSYB_FEATURE_BUFFERS_GO_IN_BSS endchoice config KEMBTK_BUSYB_SHOW_USAGE - bool "Show terse applet usage messages" + bool "Show applet usage messages" default y help - All BusyBox applets will show help messages when invoked with - wrong arguments. You can turn off printing these terse usage - messages if you say no here. - This will save you up to 7k. + Enabling this option, BusyBox applets will show terse help messages + when invoked with wrong arguments. + If you do not want to show any (helpful) usage message when + issuing wrong command syntax, you can say 'N' here, + saving approximately 7k. config KEMBTK_BUSYB_FEATURE_VERBOSE_USAGE bool "Show verbose applet usage messages" default y depends on KEMBTK_BUSYB_SHOW_USAGE help - All BusyBox applets will show more verbose help messages when + All BusyBox applets will show verbose help messages when busybox is invoked with --help. This will add a lot of text to the busybox binary. In the default configuration, this will add about 13k, but it can add much more depending on your configuration. @@ -107,8 +107,8 @@ config KEMBTK_BUSYB_FEATURE_COMPRESS_USAGE default y depends on KEMBTK_BUSYB_SHOW_USAGE help - Store usage messages in compressed form, uncompress them on-the-fly - when <applet> --help is called. + Store usage messages in .bz compressed form, uncompress them + on-the-fly when <applet> --help is called. If you have a really tiny busybox with few applets enabled (and bunzip2 isn't one of them), the overhead of the decompressor might @@ -137,14 +137,8 @@ config KEMBTK_BUSYB_LOCALE_SUPPORT Enable this if your system has locale support and you would like 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 @@ -158,7 +152,6 @@ config KEMBTK_BUSYB_UNICODE_SUPPORT config KEMBTK_BUSYB_UNICODE_USING_LOCALE bool "Use libc routines for Unicode (else uses internal ones)" depends on KEMBTK_BUSYB_UNICODE_SUPPORT && KEMBTK_BUSYB_LOCALE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option on, Unicode support is implemented using libc routines. Otherwise, internal implementation is used. @@ -166,24 +159,16 @@ config KEMBTK_BUSYB_UNICODE_USING_LOCALE config KEMBTK_BUSYB_FEATURE_CHECK_UNICODE_IN_ENV bool "Check $LANG environment variable" - depends on KEMBTK_BUSYB_UNICODE_SUPPORT && !(KEMBTK_BUSYB_UNICODE_USING_LOCALE || KEMBTK_BUSYB_UNICODE_USING_LOCALE) - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X + depends on KEMBTK_BUSYB_UNICODE_SUPPORT && !KEMBTK_BUSYB_UNICODE_USING_LOCALE help With this option on, Unicode support is activated only if LANG variable has the value of the form "xxxx.utf8" Otherwise, Unicode support will be always enabled and active. -config KEMBTK_BUSYB_GETOPT_LONG - bool - default n - 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 || EMBTK_BB_VERSION_1_18_X default 63 help Typical values are 63 for '?' (works with any output device), @@ -193,7 +178,6 @@ config KEMBTK_BUSYB_SUBST_WCHAR config KEMBTK_BUSYB_LAST_SUPPORTED_WCHAR int "Range of supported Unicode characters" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default 767 help Any character with Unicode value bigger than this is assumed @@ -224,7 +208,6 @@ config KEMBTK_BUSYB_LAST_SUPPORTED_WCHAR config KEMBTK_BUSYB_UNICODE_COMBINING_WCHARS bool "Allow zero-width Unicode characters on output" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option off, any Unicode char with width of 0 is substituted on output. @@ -232,7 +215,6 @@ config KEMBTK_BUSYB_UNICODE_COMBINING_WCHARS config KEMBTK_BUSYB_UNICODE_WIDE_WCHARS bool "Allow wide Unicode characters on output" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option off, any Unicode char with width > 1 is substituted on output. @@ -240,7 +222,6 @@ config KEMBTK_BUSYB_UNICODE_WIDE_WCHARS config KEMBTK_BUSYB_UNICODE_BIDI_SUPPORT bool "Bidirectional character-aware line input" depends on KEMBTK_BUSYB_UNICODE_SUPPORT && !KEMBTK_BUSYB_UNICODE_USING_LOCALE - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help With this option on, right-to-left Unicode characters are treated differently on input (e.g. cursor movement). @@ -248,7 +229,6 @@ config KEMBTK_BUSYB_UNICODE_BIDI_SUPPORT config KEMBTK_BUSYB_UNICODE_NEUTRAL_TABLE bool "In bidi input, support non-ASCII neutral chars too" depends on KEMBTK_BUSYB_UNICODE_BIDI_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help In most cases it's enough to treat only ASCII non-letters (i.e. punctuation, numbers and space) as characters @@ -259,10 +239,10 @@ config KEMBTK_BUSYB_UNICODE_NEUTRAL_TABLE config KEMBTK_BUSYB_UNICODE_PRESERVE_BROKEN bool "Make it possible to enter sequences of chars which are not Unicode" depends on KEMBTK_BUSYB_UNICODE_SUPPORT - depends on EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help - With this option on, invalid UTF-8 bytes are not substituted - with the selected substitution character. + With this option on, on line-editing input (such as used by shells) + invalid UTF-8 bytes are not substituted with the selected + substitution character. For example, this means that entering 'l', 's', ' ', 0xff, [Enter] at shell prompt will list file named 0xff (single char name with char value 255), not file named '?'. @@ -295,10 +275,19 @@ 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 + depends on 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. @@ -306,15 +295,6 @@ config KEMBTK_BUSYB_FEATURE_WTMP will append new entries there. "last" applet requires this option. -config KEMBTK_BUSYB_FEATURE_UTMP - bool "Support utmp file" - default y - help - The file /var/run/utmp is used to track who is currently logged in. - With this option on, certain applets (getty, login, telnetd etc) - will create and delete entries there. - "who" applet requires this option. - config KEMBTK_BUSYB_FEATURE_PIDFILE bool "Support writing pidfiles" default y @@ -339,21 +319,39 @@ config KEMBTK_BUSYB_FEATURE_SUID symlinks pointing to each binary), and only set the suid bit on the one that needs it. - The applets currently marked to need the suid bit are: + The applets which require root rights (need suid bit or + to be run by root) and will refuse to execute otherwise: + crontab, login, passwd, su, vlock, wall. + + The applets which will use root rights if they have them + (via suid bit, or because run by root), but would try to work + without root right nevertheless: + findfs, ping[6], traceroute[6], mount. - crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, - traceroute, vlock. + Note that if you DONT select this option, but DO make busybox + suid root, ALL applets will run under root, which is a huge + security hole (think "cp /some/file /etc/passwd"). config KEMBTK_BUSYB_FEATURE_SUID_CONFIG bool "Runtime KEMBTK_BUSYB_SUID/SGID configuration via /etc/busybox.conf" - default y if KEMBTK_BUSYB_FEATURE_SUID + default y depends on KEMBTK_BUSYB_FEATURE_SUID help Allow the KEMBTK_BUSYB_SUID / SGID state of an applet to be determined at runtime by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) The format of this file is as follows: - <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) + APPLET = [Ssx-][Ssx-][x-] [USER.GROUP] + + s: USER or GROUP is allowed to execute APPLET. + APPLET will run under USER or GROUP + (reagardless of who's running it). + S: USER or GROUP is NOT allowed to execute APPLET. + APPLET will run under USER or GROUP. + This option is not very sensical. + x: USER/GROUP/others are allowed to execute APPLET. + No UID/GID change will be done when it is run. + -: USER/GROUP/others are not allowed to execute APPLET. An example might help: @@ -363,7 +361,8 @@ config KEMBTK_BUSYB_FEATURE_SUID_CONFIG su = ssx # exactly the same mount = sx- root.disk # applet mount can be run by root and members - # of group disk and runs with euid=0 + # of group disk (but not anyone else) + # and runs with euid=0 (egid is not changed) cp = --- # disable applet cp for everyone @@ -388,7 +387,7 @@ config KEMBTK_BUSYB_FEATURE_SUID_CONFIG_QUIET config KEMBTK_BUSYB_SELINUX bool "Support NSA Security Enhanced Linux" - depends on KEMBTK_BUSYB_PLATFORM_LINUX + select KEMBTK_BUSYB_PLATFORM_LINUX help Enable support for SELinux in applets ls, ps, and id. Also provide the option of compiling in SELinux applets. @@ -465,7 +464,10 @@ config KEMBTK_BUSYB_PIE bool "Build BusyBox as a position independent executable" depends on !KEMBTK_BUSYB_STATIC help - (TODO: what is it and why/when is it useful?) + Hardened code option. KEMBTK_BUSYB_PIE binaries are loaded at a different + address at each invocation. This has some overhead, + particularly on x86-32 which is short on registers. + Most people will leave this set to 'N'. config KEMBTK_BUSYB_NOMMU @@ -558,7 +560,6 @@ 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 this option. This will have no effect if your kernel or your C @@ -568,7 +569,7 @@ config KEMBTK_BUSYB_LFS than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'. config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX - string + string "Cross Compiler prefix" default "" help If you want to build BusyBox with a cross compiler, then you @@ -580,13 +581,39 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX Native builds leave this empty. +config KEMBTK_BUSYB_SYSROOT + string + default "" + help + If you want to build BusyBox with a cross compiler, then you + might also need to specify where /usr/include and /usr/lib + will be found. + + For example, BusyBox can be built against an installed + Android NDK, platform version 9, for KEMBTK_BUSYB_ARM ABI with + + CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm + + Native builds leave this empty. + config KEMBTK_BUSYB_EXTRA_CFLAGS string - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default "" help Additional CFLAGS to pass to the compiler verbatim. +config KEMBTK_BUSYB_EXTRA_LDFLAGS + string + default "" + help + Additional LDFLAGS to pass to the linker verbatim. + +config KEMBTK_BUSYB_EXTRA_LDLIBS + string + default "" + help + Additional LDLIBS to pass to the linker with -l. + comment "-------------------------------------------------" comment 'Debugging Options' @@ -660,9 +687,6 @@ config KEMBTK_BUSYB_EFENCE endchoice -### config PARSE -### bool "Uniform config file parser debugging applet: parse" - comment "-------------------------------------------------" comment 'Installation Options ("make install" behavior)' @@ -693,7 +717,6 @@ config KEMBTK_BUSYB_INSTALL_APPLET_SCRIPT_WRAPPERS config KEMBTK_BUSYB_INSTALL_APPLET_DONT bool "not installed" - depends on KEMBTK_BUSYB_FEATURE_INSTALLER || KEMBTK_BUSYB_FEATURE_SH_STANDALONE || KEMBTK_BUSYB_FEATURE_PREFER_APPLETS help Do not install applet links. Useful when you plan to use busybox --install for installing links, or plan to use diff --git a/packages/busybox/busybox.kconfig b/packages/busybox/busybox.kconfig index 4dbac15..2b91baf 100644 --- a/packages/busybox/busybox.kconfig +++ b/packages/busybox/busybox.kconfig @@ -29,10 +29,8 @@ choice Here you can choose which version series of busybox you want to use. - config EMBTK_BB_VERSION_1_18_X - bool "busybox-1.18.x" - config EMBTK_BB_VERSION_1_17_X - bool "busybox-1.17.x" + config EMBTK_BB_VERSION_1_20_X + bool "busybox-1.20.x" endchoice choice @@ -40,21 +38,14 @@ choice help Here you can choose which version of busybox you want to use. - config EMBTK_BB_VERSION_1_18_5 - bool "busybox-1.18.5" - depends on EMBTK_BB_VERSION_1_18_X - select EMBTK_BB_NEED_PATCH - - config EMBTK_BB_VERSION_1_17_4 - bool "busybox-1.17.4" - select EMBTK_BB_NEED_PATCH - depends on EMBTK_BB_VERSION_1_17_X + config EMBTK_BB_VERSION_1_20_2 + bool "busybox-1.20.2" + depends on EMBTK_BB_VERSION_1_20_X endchoice config EMBTK_BB_VERSION_STRING string - default "1.18.5" if EMBTK_BB_VERSION_1_18_5 - default "1.17.4" if EMBTK_BB_VERSION_1_17_4 + default "1.20.2" if EMBTK_BB_VERSION_1_20_2 config EMBTK_BB_NEED_PATCH bool |