From 46b42b19c7dec20400c1c7621d09277bf3d92874 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Aug 2012 10:20:41 +0200 Subject: update busybox to latest stable version, refresh all Config.in files --- package/busybox/Makefile | 4 +- package/busybox/config/Config.in | 141 ++- package/busybox/config/archival/Config.in | 70 +- package/busybox/config/console-tools/Config.in | 50 +- package/busybox/config/coreutils/Config.in | 348 +++--- package/busybox/config/debianutils/Config.in | 13 +- package/busybox/config/e2fsprogs/Config.in | 27 +- .../config/e2fsprogs/old_e2fsprogs/Config.in | 72 +- package/busybox/config/editors/Config.in | 139 ++- package/busybox/config/findutils/Config.in | 33 +- package/busybox/config/init/Config.in | 76 +- package/busybox/config/libbb/Config.in | 86 +- package/busybox/config/loginutils/Config.in | 142 ++- package/busybox/config/mailutils/Config.in | 4 +- package/busybox/config/miscutils/Config.in | 263 ++-- package/busybox/config/modutils/Config.in | 30 +- package/busybox/config/networking/Config.in | 370 +++--- package/busybox/config/networking/udhcp/Config.in | 49 +- package/busybox/config/printutils/Config.in | 2 + package/busybox/config/procps/Config.in | 156 ++- package/busybox/config/runit/Config.in | 2 + package/busybox/config/selinux/Config.in | 3 +- package/busybox/config/shell/Config.in | 261 ++-- package/busybox/config/sysklogd/Config.in | 19 +- package/busybox/config/util-linux/Config.in | 820 ++++++------ package/busybox/patches/001-ipkg.patch | 1303 ++++++++++---------- package/busybox/patches/003-defaults.patch | 119 +- 27 files changed, 2459 insertions(+), 2143 deletions(-) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 65f7a95ef..5180e6ede 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.19.4 +PKG_VERSION:= 1.20.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9c0cae5a0379228e7b55e5b29528df8e +PKG_MD5SUM:= e025414bc6cd79579cc7a32a45d3ae1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base PKG_BUILDDEP:= libtirpc diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 5a0e5a285..3a5e340ae 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -32,7 +32,7 @@ config BUSYBOX_EXTRA_COMPAT config BUSYBOX_INCLUDE_SUSv2 bool "Enable obsolete features removed before SUSv3" - default y + default n help This option will enable backwards compatibility with SuSv2, specifically, old-style numeric options ('command -1 ') @@ -83,20 +83,21 @@ config BUSYBOX_FEATURE_BUFFERS_GO_IN_BSS endchoice config BUSYBOX_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 BUSYBOX_FEATURE_VERBOSE_USAGE bool "Show verbose applet usage messages" default y - select BUSYBOX_SHOW_USAGE + depends on BUSYBOX_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. @@ -106,8 +107,8 @@ config BUSYBOX_FEATURE_COMPRESS_USAGE default y depends on BUSYBOX_SHOW_USAGE help - Store usage messages in compressed form, uncompress them on-the-fly - when --help is called. + Store usage messages in .bz compressed form, uncompress them + on-the-fly when --help is called. If you have a really tiny busybox with few applets enabled (and bunzip2 isn't one of them), the overhead of the decompressor might @@ -153,8 +154,8 @@ config BUSYBOX_UNICODE_USING_LOCALE config BUSYBOX_FEATURE_CHECK_UNICODE_IN_ENV bool "Check $LANG environment variable" - default y - depends on BUSYBOX_FEATURE_ASSUME_UNICODE && !BUSYBOX_LOCALE_SUPPORT + default n + depends on BUSYBOX_UNICODE_SUPPORT && !BUSYBOX_UNICODE_USING_LOCALE help With this option on, Unicode support is activated only if LANG variable has the value of the form "xxxx.utf8" @@ -240,8 +241,9 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN default n depends on BUSYBOX_UNICODE_SUPPORT 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 '?'. @@ -275,6 +277,26 @@ config BUSYBOX_FEATURE_CLEAN_UP Don't enable this unless you have a really good reason to clean things up manually. +config BUSYBOX_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 BUSYBOX_FEATURE_WTMP + bool "Support wtmp file" + default y + depends on BUSYBOX_FEATURE_UTMP + help + The file /var/run/wtmp is used to track when users have logged into + and logged out of the system. + With this option on, certain applets (getty, login, telnetd etc) + will append new entries there. + "last" applet requires this option. + config BUSYBOX_FEATURE_PIDFILE bool "Support writing pidfiles" default y @@ -284,7 +306,7 @@ config BUSYBOX_FEATURE_PIDFILE config BUSYBOX_FEATURE_SUID bool "Support for SUID/SGID handling" - default n + default y help With this option you can install the busybox binary belonging to root with the suid bit set, enabling some applets to perform @@ -299,21 +321,39 @@ config BUSYBOX_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 BUSYBOX_FEATURE_SUID_CONFIG bool "Runtime SUID/SGID configuration via /etc/busybox.conf" - default n if BUSYBOX_FEATURE_SUID + default y depends on BUSYBOX_FEATURE_SUID help Allow the SUID / SGID state of an applet to be determined at runtime by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) The format of this file is as follows: - = [Ssx-][Ssx-][x-] (|).(|) + 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: @@ -323,7 +363,8 @@ config BUSYBOX_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 @@ -349,7 +390,7 @@ config BUSYBOX_FEATURE_SUID_CONFIG_QUIET config BUSYBOX_SELINUX bool "Support NSA Security Enhanced Linux" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Enable support for SELinux in applets ls, ps, and id. Also provide the option of compiling in SELinux applets. @@ -430,7 +471,10 @@ config BUSYBOX_PIE default n depends on !BUSYBOX_STATIC help - (TODO: what is it and why/when is it useful?) + Hardened code option. PIE binaries are loaded at a different + address at each invocation. This has some overhead, + particularly on x86-32 which is short on registers. + Most people will leave this set to 'N'. config BUSYBOX_NOMMU @@ -480,7 +524,7 @@ config BUSYBOX_BUILD_LIBBUSYBOX config BUSYBOX_FEATURE_INDIVIDUAL bool "Produce a binary for each applet, linked against libbusybox" - default n + default y depends on BUSYBOX_BUILD_LIBBUSYBOX help If your CPU architecture doesn't allow for sharing text/rodata @@ -498,7 +542,7 @@ config BUSYBOX_FEATURE_INDIVIDUAL config BUSYBOX_FEATURE_SHARED_BUSYBOX bool "Produce additional busybox binary linked against libbusybox" - default n + default y depends on BUSYBOX_BUILD_LIBBUSYBOX help Build busybox, dynamically linked against libbusybox.so.N.N.N. @@ -527,7 +571,6 @@ config BUSYBOX_FEATURE_SHARED_BUSYBOX config BUSYBOX_LFS bool "Build with Large File Support (for accessing files > 2 GB)" default y - select BUSYBOX_FDISK_SUPPORT_LARGE_DISKS help If you want to build BusyBox with large file support, then enable this option. This will have no effect if your kernel or your C @@ -549,12 +592,39 @@ config BUSYBOX_CROSS_COMPILER_PREFIX Native builds leave this empty. +config BUSYBOX_SYSROOT + string "Path to sysroot" + 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 ARM ABI with + + CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm + + Native builds leave this empty. + config BUSYBOX_EXTRA_CFLAGS string "Additional CFLAGS" default "" help Additional CFLAGS to pass to the compiler verbatim. +config BUSYBOX_EXTRA_LDFLAGS + string "Additional LDFLAGS" + default "" + help + Additional LDFLAGS to pass to the linker verbatim. + +config BUSYBOX_EXTRA_LDLIBS + string "Additional LDLIBS" + default "" + help + Additional LDLIBS to pass to the linker with -l. + endmenu menu 'Debugging Options' @@ -631,25 +701,13 @@ config BUSYBOX_EFENCE endchoice -### config PARSE -### bool "Uniform config file parser debugging applet: parse" - endmenu menu 'Installation Options ("make install" behavior)' -config BUSYBOX_INSTALL_NO_USR - bool "Don't use /usr" - default n - depends on BUSYBOX_FEATURE_INSTALLER - help - Disable use of /usr. busybox --install and "make install" - will install applets only to /bin and /sbin, - never to /usr/bin or /usr/sbin. - choice prompt "What kind of applet links to install" - default BUSYBOX_INSTALL_APPLET_SYMLINKS + default INSTALL_APPLET_SYMLINKS help Choose what kind of links to applets are created by "make install". @@ -673,7 +731,6 @@ config BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS config BUSYBOX_INSTALL_APPLET_DONT bool "not installed" - depends on BUSYBOX_FEATURE_INSTALLER || BUSYBOX_FEATURE_SH_STANDALONE || BUSYBOX_FEATURE_PREFER_APPLETS help Do not install applet links. Useful when you plan to use busybox --install for installing links, or plan to use @@ -701,8 +758,8 @@ config BUSYBOX_INSTALL_SH_APPLET_HARDLINK config BUSYBOX_INSTALL_SH_APPLET_SCRIPT_WRAPPER bool "as script wrapper" help - Install /bin/sh applet as script wrapper that call the busybox - binary. + Install /bin/sh applet as script wrapper that calls + the busybox binary. endchoice diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index aac6578f3..eaa576bff 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,7 @@ menu "Archival Utilities" + config BUSYBOX_FEATURE_SEAMLESS_XZ bool "Make tar, rpm, modprobe etc understand .xz data" default y @@ -30,15 +32,15 @@ config BUSYBOX_FEATURE_SEAMLESS_GZ Make tar, rpm, modprobe etc understand .gz data. config BUSYBOX_FEATURE_SEAMLESS_Z - bool "Make tar and gunzip understand .Z data" + bool "tar, rpm, modprobe etc understand .Z data" default n help - Make tar and gunzip understand .Z data. + Make tar, rpm, modprobe etc understand .Z data. config BUSYBOX_AR bool "ar" - default y depends on !ADK_PACKAGE_BINUTILS + default n # needs to be improved to be able to replace binutils ar help ar is an archival utility program used to create, modify, and extract contents from archives. An archive is a single file holding @@ -61,7 +63,7 @@ config BUSYBOX_AR config BUSYBOX_FEATURE_AR_LONG_FILENAMES bool "Support for long filenames (not needed for debs)" - default n + default y depends on BUSYBOX_AR help By default the ar format can only store the first 15 characters @@ -71,7 +73,7 @@ config BUSYBOX_FEATURE_AR_LONG_FILENAMES config BUSYBOX_FEATURE_AR_CREATE bool "Support archive creation" - default n + default y depends on BUSYBOX_AR help This enables archive creation (-c and -r) with busybox ar. @@ -79,7 +81,7 @@ config BUSYBOX_FEATURE_AR_CREATE config BUSYBOX_BUNZIP2 bool "bunzip2" depends on !ADK_PACKAGE_BZIP2 - default y + default n help bunzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -93,7 +95,7 @@ config BUSYBOX_BUNZIP2 config BUSYBOX_BZIP2 bool "bzip2" depends on !ADK_PACKAGE_BZIP2 - default y + default n help bzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -121,7 +123,7 @@ config BUSYBOX_CPIO config BUSYBOX_FEATURE_CPIO_O bool "Support for archive creation" - default n + default y depends on BUSYBOX_CPIO help This implementation of cpio can create cpio archives in the "newc" @@ -129,7 +131,7 @@ config BUSYBOX_FEATURE_CPIO_O config BUSYBOX_FEATURE_CPIO_P bool "Support for passthrough mode" - default n + default y depends on BUSYBOX_FEATURE_CPIO_O help Passthrough mode. Rarely used. @@ -184,11 +186,23 @@ config BUSYBOX_GZIP config BUSYBOX_FEATURE_GZIP_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_GZIP && BUSYBOX_LONG_OPTS help Enable use of long options, increases size by about 106 Bytes +config BUSYBOX_GZIP_FAST + int "Trade memory for gzip speed (0:small,slow - 2:fast,big)" + default 0 + range 0 2 + depends on BUSYBOX_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 BUSYBOX_LZOP bool "lzop" default n @@ -196,7 +210,7 @@ config BUSYBOX_LZOP Lzop compression/decompresion. config BUSYBOX_LZOP_COMPR_HIGH - bool "lzop complession levels 7,8,9 (not very useful)" + bool "lzop compression levels 7,8,9 (not very useful)" default n depends on BUSYBOX_LZOP help @@ -216,7 +230,7 @@ config BUSYBOX_RPM2CPIO depends on !ADK_PACKAGE_RPM default n help - Converts an RPM file into a CPIO archive. + Converts a RPM file into a CPIO archive. config BUSYBOX_RPM bool "rpm" @@ -227,14 +241,13 @@ config BUSYBOX_RPM config BUSYBOX_TAR bool "tar" + depends on !ADK_PACKAGE_TAR default y help tar is an archiving program. It's commonly used with gzip to create compressed archives. It's probably the most widely used UNIX archive program. -if BUSYBOX_TAR - config BUSYBOX_FEATURE_TAR_CREATE bool "Enable archive creation" default y @@ -246,7 +259,7 @@ config BUSYBOX_FEATURE_TAR_CREATE config BUSYBOX_FEATURE_TAR_AUTODETECT bool "Autodetect compressed tarballs" default y - depends on BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA + depends on BUSYBOX_TAR && (BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA || BUSYBOX_FEATURE_SEAMLESS_XZ) help With this option tar can automatically detect compressed tarballs. Currently it works only on files (not pipes etc). @@ -261,8 +274,8 @@ config BUSYBOX_FEATURE_TAR_FROM config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY bool "Support for old tar header format" - default n - depends on BUSYBOX_TAR + default y + depends on BUSYBOX_TAR || BUSYBOX_DPKG help This option is required to unpack archives created in the old GNU format; help to kill this old format by @@ -270,8 +283,8 @@ config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY bool "Enable untarring of tarballs with checksums produced by buggy Sun tar" - default n - depends on BUSYBOX_TAR + default y + depends on BUSYBOX_TAR || BUSYBOX_DPKG help This option is required to unpack archives created by some old version of Sun's tar (it was calculating checksum using signed @@ -281,14 +294,14 @@ config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS bool "Support for GNU tar extensions (long filenames)" default y - depends on BUSYBOX_TAR + depends on BUSYBOX_TAR || BUSYBOX_DPKG help With this option busybox supports GNU long filenames and linknames. config BUSYBOX_FEATURE_TAR_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS help Enable use of long options, increases size by about 400 Bytes @@ -313,7 +326,7 @@ config BUSYBOX_FEATURE_TAR_UNAME_GNAME config BUSYBOX_FEATURE_TAR_NOPRESERVE_TIME bool "Enable -m (do not preserve time) option" - default n + default y depends on BUSYBOX_TAR help With this option busybox supports GNU tar -m @@ -327,8 +340,6 @@ config BUSYBOX_FEATURE_TAR_SELINUX With this option busybox supports restoring SELinux labels when extracting files from tar archives. -endif #tar - config BUSYBOX_UNCOMPRESS bool "uncompress" default n @@ -338,20 +349,16 @@ config BUSYBOX_UNCOMPRESS config BUSYBOX_UNLZMA bool "unlzma" - depends on !ADK_PACKAGE_XZ - default y + default n help unlzma is a compression utility using the Lempel-Ziv-Markov chain compression algorithm, and range coding. Compression 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 BUSYBOX_FEATURE_LZMA_FAST bool "Optimize unlzma for speed" default n @@ -371,12 +378,13 @@ config BUSYBOX_LZMA config BUSYBOX_UNXZ bool "unxz" depends on !ADK_PACKAGE_XZ - default y + default n help unxz is a unlzma successor. config BUSYBOX_XZ bool "Provide xz alias which supports only unpacking" + depends on !ADK_PACKAGE_XZ default n depends on BUSYBOX_UNXZ help diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in index 03d277111..5a1dc29c4 100644 --- a/package/busybox/config/console-tools/Config.in +++ b/package/busybox/config/console-tools/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,10 +6,11 @@ menu "Console Utilities" + config BUSYBOX_CHVT bool "chvt" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) @@ -16,7 +18,7 @@ config BUSYBOX_CHVT config BUSYBOX_FGCONSOLE bool "fgconsole" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program prints active (foreground) console number. @@ -29,30 +31,30 @@ config BUSYBOX_CLEAR config BUSYBOX_DEALLOCVT bool "deallocvt" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program deallocates unused virtual consoles. config BUSYBOX_DUMPKMAP bool "dumpkmap" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_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. config BUSYBOX_KBD_MODE bool "kbd_mode" - default y if ADK_TARGET_WITH_INPUT default n - depends on BUSYBOX_PLATFORM_LINUX + default y if ADK_TARGET_WITH_INPUT + select BUSYBOX_PLATFORM_LINUX help This program reports and sets keyboard mode. config BUSYBOX_LOADFONT bool "loadfont" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program loads a console font from standard input. @@ -60,15 +62,15 @@ config BUSYBOX_LOADKMAP bool "loadkmap" default y if ADK_TARGET_WITH_INPUT default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program loads a keyboard translation table from standard input. config BUSYBOX_OPENVT bool "openvt" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program is used to start a command on an unused virtual terminal. @@ -82,14 +84,14 @@ config BUSYBOX_RESET config BUSYBOX_RESIZE bool "resize" - default n + default y help This program is used to (re)set the width and height of your current terminal. config BUSYBOX_FEATURE_RESIZE_PRINT bool "Print environment variables" - default n + default y depends on BUSYBOX_RESIZE help Prints the newly set size (number of columns and rows) of @@ -99,15 +101,15 @@ config BUSYBOX_FEATURE_RESIZE_PRINT config BUSYBOX_SETCONSOLE bool "setconsole" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program redirects the system console to another device, like the current tty while logged in via telnet. config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_SETCONSOLE && BUSYBOX_LONG_OPTS help Support long options for the setconsole applet. @@ -115,13 +117,13 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS config BUSYBOX_SETFONT bool "setfont" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Allows to load console screen map. Useful for i18n. config BUSYBOX_FEATURE_SETFONT_TEXTUAL_MAP bool "Support reading textual screen maps" - default n + default y depends on BUSYBOX_SETFONT help Support reading textual screen maps. @@ -136,23 +138,23 @@ config BUSYBOX_DEFAULT_SETFONT_DIR config BUSYBOX_SETKEYCODES bool "setkeycodes" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. config BUSYBOX_SETLOGCONS bool "setlogcons" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program redirects the output console of kernel messages. config BUSYBOX_SHOWKEY bool "showkey" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help Shows keys pressed. diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 1b2d9d5fd..6393c1c14 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,12 +6,6 @@ menu "Coreutils" -config BUSYBOX_BASE64 - bool "base64" - default y - help - Base64 encode and decode - config BUSYBOX_BASENAME bool "basename" default y @@ -18,23 +13,146 @@ config BUSYBOX_BASENAME basename is used to strip the directory and suffix from filenames, leaving just the filename itself. Enable this option if you wish to enable the 'basename' utility. - -config BUSYBOX_CAL - bool "cal" - default n - help - cal is used to display a monthly calender. - config BUSYBOX_CAT bool "cat" default y help cat is used to concatenate files and print them to the standard output. Enable this option if you wish to enable the 'cat' utility. +config BUSYBOX_DATE + bool "date" + default y + help + date is used to set the system date or display the + current time in the given format. + +config BUSYBOX_FEATURE_DATE_ISOFMT + bool "Enable ISO date format output (-I)" + default y + depends on BUSYBOX_DATE + help + Enable option (-I) to output an ISO-8601 compliant + date/time string. + +# defaults to "no": stat's nanosecond field is a bit non-portable +config BUSYBOX_FEATURE_DATE_NANO + bool "Support %[num]N nanosecond format specifier" + default n + depends on BUSYBOX_DATE # syscall(__NR_clock_gettime) + select BUSYBOX_PLATFORM_LINUX + help + Support %[num]N format specifier. Adds ~250 bytes of code. + +config BUSYBOX_FEATURE_DATE_COMPAT + bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format" + default y + depends on BUSYBOX_DATE + help + System time can be set by 'date -s DATE' and simply 'date DATE', + but formats of DATE string are different. 'date DATE' accepts + a rather weird MMDDhhmm[[YY]YY][.ss] format with completely + unnatural placement of year between minutes and seconds. + date -s (and other commands like touch -d) use more sensible + formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss). + + With this option off, 'date DATE' is 'date -s DATE' support + the same format. With it on, 'date DATE' additionally supports + MMDDhhmm[[YY]YY][.ss] format. +config BUSYBOX_HOSTID + bool "hostid" + default y + help + hostid prints the numeric identifier (in hexadecimal) for + the current host. +config BUSYBOX_ID + bool "id" + default y + help + id displays the current user and group ID names. +config BUSYBOX_GROUPS + bool "groups" + default y + help + Print the group names associated with current user id. +config BUSYBOX_TEST + bool "test" + default y + help + test is used to check file types and compare values, + returning an appropriate exit code. The bash shell + has test built in, ash can build it in optionally. + +config BUSYBOX_FEATURE_TEST_64 + bool "Extend test to 64 bit" + default y + depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH + help + Enable 64-bit support in test. +config BUSYBOX_TOUCH + bool "touch" + default y + help + touch is used to create or change the access and/or + modification timestamp of specified files. + +config BUSYBOX_FEATURE_TOUCH_SUSV3 + bool "Add support for SUSV3 features (-d -t -r)" + default y + depends on BUSYBOX_TOUCH + help + Enable touch to use a reference file or a given date/time argument. +config BUSYBOX_TR + bool "tr" + default y + help + tr is used to squeeze, and/or delete characters from standard + input, writing to standard output. + +config BUSYBOX_FEATURE_TR_CLASSES + bool "Enable character classes (such as [:upper:])" + default y + depends on BUSYBOX_TR + help + Enable character classes, enabling commands such as: + tr [:upper:] [:lower:] to convert input into lowercase. + +config BUSYBOX_FEATURE_TR_EQUIV + bool "Enable equivalence classes" + default y + depends on BUSYBOX_TR + help + Enable equivalence classes, which essentially add the enclosed + character to the current set. For instance, tr [=a=] xyz would + replace all instances of 'a' with 'xyz'. This option is mainly + useful for cases when no other way of expressing a character + is possible. +config BUSYBOX_BASE64 + bool "base64" + default y + help + Base64 encode and decode +config BUSYBOX_WHO + bool "who" + default y + depends on BUSYBOX_FEATURE_UTMP + help + who is used to show who is logged on. +config BUSYBOX_USERS + bool "users" + default y + depends on BUSYBOX_FEATURE_UTMP + help + Print users currently logged on. + +config BUSYBOX_CAL + bool "cal" + default y + help + cal is used to display a monthly calender. config BUSYBOX_CATV bool "catv" - default n + default y help Display nonprinting characters as escape sequences (like some implementations' cat -v option). @@ -60,7 +178,7 @@ config BUSYBOX_CHOWN config BUSYBOX_FEATURE_CHOWN_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_CHOWN && BUSYBOX_LONG_OPTS help Enable use of long options @@ -74,7 +192,7 @@ config BUSYBOX_CHROOT config BUSYBOX_CKSUM bool "cksum" - default n + default y help cksum is used to calculate the CRC32 checksum of a file. @@ -93,7 +211,7 @@ config BUSYBOX_CP config BUSYBOX_FEATURE_CP_LONG_OPTIONS bool "Enable long options for cp" - default n + default y depends on BUSYBOX_CP && BUSYBOX_LONG_OPTS help Enable long options for cp. @@ -106,45 +224,6 @@ config BUSYBOX_CUT cut is used to print selected parts of lines from each file to stdout. -config BUSYBOX_DATE - bool "date" - default y - help - date is used to set the system date or display the - current time in the given format. - -config BUSYBOX_FEATURE_DATE_ISOFMT - bool "Enable ISO date format output (-I)" - default y - depends on BUSYBOX_DATE - help - Enable option (-I) to output an ISO-8601 compliant - date/time string. - -# defaults to "no": stat's nanosecond field is a bit non-portable -config BUSYBOX_FEATURE_DATE_NANO - bool "Support %[num]N nanosecond format specifier" - default n - depends on BUSYBOX_DATE && BUSYBOX_PLATFORM_LINUX # syscall(__NR_clock_gettime) - help - Support %[num]N format specifier. Adds ~250 bytes of code. - -config BUSYBOX_FEATURE_DATE_COMPAT - bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format" - default y - depends on BUSYBOX_DATE - help - System time can be set by 'date -s DATE' and simply 'date DATE', - but formats of DATE string are different. 'date DATE' accepts - a rather weird MMDDhhmm[[YY]YY][.ss] format with completely - unnatural placement of year between minutes and seconds. - date -s (and other commands like touch -d) use more sensible - formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss). - - With this option off, 'date DATE' is 'date -s DATE' support - the same format. With it on, 'date DATE' additionally supports - MMDDhhmm[[YY]YY][.ss] format. - config BUSYBOX_DD bool "dd" default y @@ -169,7 +248,7 @@ config BUSYBOX_FEATURE_DD_SIGNAL_HANDLING config BUSYBOX_FEATURE_DD_THIRD_STATUS_LINE bool "Enable the third status line upon signal" - default n + default y depends on BUSYBOX_DD && BUSYBOX_FEATURE_DD_SIGNAL_HANDLING help Displays a coreutils-like third status line with transferred bytes, @@ -177,7 +256,7 @@ config BUSYBOX_FEATURE_DD_THIRD_STATUS_LINE config BUSYBOX_FEATURE_DD_IBS_OBS bool "Enable ibs, obs and conv options" - default n + default y depends on BUSYBOX_DD help Enables support for writing a certain number of bytes in and out, @@ -192,7 +271,7 @@ config BUSYBOX_DF config BUSYBOX_FEATURE_DF_FANCY bool "Enable -a, -i, -B" - default n + default y depends on BUSYBOX_DF help This option enables -a, -i and -B. @@ -210,7 +289,7 @@ config BUSYBOX_DIRNAME config BUSYBOX_DOS2UNIX bool "dos2unix/unix2dos" - default n + default y help dos2unix is used to convert a text file from DOS format to UNIX format, and vice versa. @@ -261,20 +340,20 @@ config BUSYBOX_ENV config BUSYBOX_FEATURE_ENV_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_ENV && BUSYBOX_LONG_OPTS help Support long options for the env applet. config BUSYBOX_EXPAND bool "expand" - default n + default y help By default, convert all tabs to spaces. config BUSYBOX_FEATURE_EXPAND_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_EXPAND && BUSYBOX_LONG_OPTS help Support long options for the expand applet. @@ -288,7 +367,7 @@ config BUSYBOX_EXPR config BUSYBOX_EXPR_MATH_SUPPORT_64 bool "Extend Posix numbers support to 64 bit" - default n + default y depends on BUSYBOX_EXPR help Enable 64-bit math support in the expr applet. This will make @@ -303,13 +382,13 @@ config BUSYBOX_FALSE config BUSYBOX_FOLD bool "fold" - default n + default y help Wrap text to fit a specific width. config BUSYBOX_FSYNC bool "fsync" - default n + default y help fsync is used to flush file-related cached blocks to disk. @@ -322,24 +401,11 @@ config BUSYBOX_HEAD config BUSYBOX_FEATURE_FANCY_HEAD bool "Enable head options (-c, -q, and -v)" - default n + default y depends on BUSYBOX_HEAD help This enables the head options (-c, -q, and -v). -config BUSYBOX_HOSTID - bool "hostid" - default n - help - hostid prints the numeric identifier (in hexadecimal) for - the current host. - -config BUSYBOX_ID - bool "id" - default y - help - id displays the current user and group ID names. - config BUSYBOX_INSTALL bool "install" default y @@ -348,16 +414,16 @@ config BUSYBOX_INSTALL config BUSYBOX_FEATURE_INSTALL_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_INSTALL && BUSYBOX_LONG_OPTS help Support long options for the install applet. -config BUSYBOX_LENGTH - bool "length" - default n - 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 BUSYBOX_LN bool "ln" @@ -367,7 +433,7 @@ config BUSYBOX_LN config BUSYBOX_LOGNAME bool "logname" - default n + default y help logname is used to print the current user's login name. @@ -421,14 +487,14 @@ config BUSYBOX_FEATURE_LS_USERNAME config BUSYBOX_FEATURE_LS_COLOR bool "Allow use of color to identify file types" - default n + default y depends on BUSYBOX_LS && BUSYBOX_LONG_OPTS help This enables the --color option to ls. config BUSYBOX_FEATURE_LS_COLOR_IS_DEFAULT bool "Produce colored ls output by default" - default n + default y depends on BUSYBOX_FEATURE_LS_COLOR help Saying yes here will turn coloring on by default, @@ -451,7 +517,7 @@ config BUSYBOX_MKDIR config BUSYBOX_FEATURE_MKDIR_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_MKDIR && BUSYBOX_LONG_OPTS help Support long options for the mkdir applet. @@ -478,20 +544,20 @@ config BUSYBOX_MV config BUSYBOX_FEATURE_MV_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_MV && BUSYBOX_LONG_OPTS help Support long options for the mv applet. config BUSYBOX_NICE bool "nice" - default n + default y help nice runs a program with modified scheduling priority. config BUSYBOX_NOHUP bool "nohup" - default n + default y help run a command immune to hangups, with output to a non-tty. @@ -503,7 +569,7 @@ config BUSYBOX_OD config BUSYBOX_PRINTENV bool "printenv" - default n + default y help printenv is used to print all or part of environment. @@ -536,7 +602,7 @@ config BUSYBOX_FEATURE_READLINK_FOLLOW config BUSYBOX_REALPATH bool "realpath" - default n + default y help Return the canonicalized absolute pathname. This isn't provided by GNU shellutils, but where else does it belong. @@ -555,7 +621,7 @@ config BUSYBOX_RMDIR config BUSYBOX_FEATURE_RMDIR_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_RMDIR && BUSYBOX_LONG_OPTS help Support long options for the rmdir applet, including @@ -569,19 +635,19 @@ config BUSYBOX_SEQ config BUSYBOX_SHA1SUM bool "sha1sum" - default n + default y help Compute and check SHA1 message digest config BUSYBOX_SHA256SUM bool "sha256sum" - default n + default y help Compute and check SHA256 message digest config BUSYBOX_SHA512SUM bool "sha512sum" - default n + default y help Compute and check SHA512 message digest @@ -601,7 +667,7 @@ config BUSYBOX_SLEEP config BUSYBOX_FEATURE_FANCY_SLEEP bool "Enable multiple arguments and s/m/h/d suffixes" - default n + default y depends on BUSYBOX_SLEEP help Allow sleep to pause for specified minutes, hours, and days. @@ -639,7 +705,7 @@ config BUSYBOX_SPLIT config BUSYBOX_FEATURE_SPLIT_FANCY bool "Fancy extensions" - default n + default y depends on BUSYBOX_SPLIT help Add support for features not required by SUSv3. @@ -649,13 +715,13 @@ config BUSYBOX_FEATURE_SPLIT_FANCY config BUSYBOX_STAT bool "stat" default y - depends on BUSYBOX_PLATFORM_LINUX # statfs() + select BUSYBOX_PLATFORM_LINUX # statfs() help display file or filesystem status. config BUSYBOX_FEATURE_STAT_FORMAT bool "Enable custom formats (-c)" - default n + default y depends on BUSYBOX_STAT help Without this, stat will not support the '-c format' option where @@ -664,13 +730,13 @@ config BUSYBOX_FEATURE_STAT_FORMAT config BUSYBOX_STTY bool "stty" - default n + default y help stty is used to change and print terminal line settings. config BUSYBOX_SUM bool "sum" - default n + default y help checksum and count the blocks in a file @@ -705,7 +771,6 @@ config BUSYBOX_FEATURE_FANCY_TAIL -s SEC Wait SEC seconds between reads with -f -v Always output headers giving file names - config BUSYBOX_TEE bool "tee" default y @@ -715,59 +780,11 @@ config BUSYBOX_TEE config BUSYBOX_FEATURE_TEE_USE_BLOCK_IO bool "Enable block I/O (larger/faster) instead of byte I/O" - default n + default y depends on BUSYBOX_TEE help Enable this option for a faster tee, at expense of size. -config BUSYBOX_TEST - bool "test" - default y - help - test is used to check file types and compare values, - returning an appropriate exit code. The bash shell - has test built in, ash can build it in optionally. - -config BUSYBOX_FEATURE_TEST_64 - bool "Extend test to 64 bit" - default n - depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH - help - Enable 64-bit support in test. - -config BUSYBOX_TOUCH - bool "touch" - default y - help - touch is used to create or change the access and/or - modification timestamp of specified files. - -config BUSYBOX_TR - bool "tr" - default y - help - tr is used to squeeze, and/or delete characters from standard - input, writing to standard output. - -config BUSYBOX_FEATURE_TR_CLASSES - bool "Enable character classes (such as [:upper:])" - default y - depends on BUSYBOX_TR - help - Enable character classes, enabling commands such as: - tr [:upper:] [:lower:] to convert input into lowercase. - -config BUSYBOX_FEATURE_TR_EQUIV - bool "Enable equivalence classes" - default y - depends on BUSYBOX_TR - help - Enable equivalence classes, which essentially add the enclosed - character to the current set. For instance, tr [=a=] xyz would - replace all instances of 'a' with 'xyz'. This option is mainly - useful for cases when no other way of expressing a character - is possible. - config BUSYBOX_TRUE bool "true" default y @@ -789,13 +806,13 @@ config BUSYBOX_UNAME config BUSYBOX_UNEXPAND bool "unexpand" - default n + default y help By default, convert only leading sequences of blanks to tabs. config BUSYBOX_FEATURE_UNEXPAND_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_UNEXPAND && BUSYBOX_LONG_OPTS help Support long options for the unexpand applet. @@ -808,19 +825,19 @@ config BUSYBOX_UNIQ config BUSYBOX_USLEEP bool "usleep" - default n + default y help usleep is used to pause for a specified number of microseconds. config BUSYBOX_UUDECODE bool "uudecode" - default n + default y help uudecode is used to decode a uuencoded file. config BUSYBOX_UUENCODE bool "uuencode" - default n + default y help uuencode is used to uuencode a file. @@ -833,18 +850,11 @@ config BUSYBOX_WC config BUSYBOX_FEATURE_WC_LARGE bool "Support very large files in wc" - default n + default y depends on BUSYBOX_WC help Use "unsigned long long" in wc for counter variables. -config BUSYBOX_WHO - bool "who" - default n - select BUSYBOX_FEATURE_UTMP - help - who is used to show who is logged on. - config BUSYBOX_WHOAMI bool "whoami" default y @@ -898,7 +908,7 @@ comment "Common options for md5sum, sha1sum, sha256sum, sha512sum" config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK bool "Enable -c, -s and -w options" - default n + default y depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM help Enabling the -c options allows files to be checked diff --git a/package/busybox/config/debianutils/Config.in b/package/busybox/config/debianutils/Config.in index 891d194e0..55ff438ad 100644 --- a/package/busybox/config/debianutils/Config.in +++ b/package/busybox/config/debianutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,7 @@ menu "Debian Utilities" + config BUSYBOX_MKTEMP bool "mktemp" default y @@ -13,7 +15,7 @@ config BUSYBOX_MKTEMP config BUSYBOX_PIPE_PROGRESS bool "pipe_progress" - default n + default y help Display a dot to indicate pipe activity. @@ -34,14 +36,14 @@ config BUSYBOX_RUN_PARTS config BUSYBOX_FEATURE_RUN_PARTS_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_RUN_PARTS && BUSYBOX_LONG_OPTS help Support long options for the run-parts applet. config BUSYBOX_FEATURE_RUN_PARTS_FANCY bool "Support additional arguments" - default n + default y depends on BUSYBOX_RUN_PARTS help Support additional options: @@ -58,7 +60,7 @@ config BUSYBOX_START_STOP_DAEMON config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY bool "Support additional arguments" - default n + default y depends on BUSYBOX_START_STOP_DAEMON help Support additional arguments. @@ -68,7 +70,7 @@ config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_START_STOP_DAEMON && BUSYBOX_LONG_OPTS help Support long options for the start-stop-daemon applet. @@ -81,4 +83,3 @@ config BUSYBOX_WHICH print out their pathnames. endmenu - diff --git a/package/busybox/config/e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/Config.in index ab5012e66..830994b89 100644 --- a/package/busybox/config/e2fsprogs/Config.in +++ b/package/busybox/config/e2fsprogs/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,15 +6,16 @@ menu "Linux Ext2 FS Progs" + config BUSYBOX_CHATTR bool "chattr" - default n + default y help chattr changes the file attributes on a second extended file system. ### config E2FSCK ### bool "e2fsck" -### default n +### default y ### help ### e2fsck is used to check Linux second extended file systems (ext2fs). ### e2fsck also supports ext2 filesystems countaining a journal (ext3). @@ -30,27 +32,28 @@ config BUSYBOX_FSCK config BUSYBOX_LSATTR bool "lsattr" - default n + default y + select BUSYBOX_PLATFORM_LINUX help lsattr lists the file attributes on a second extended file system. ### config MKE2FS ### bool "mke2fs" -### default n +### default y ### help ### mke2fs is used to create an ext2/ext3 filesystem. The normal compat ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. -### config TUNE2FS -### bool "tune2fs" -### default n -### help -### tune2fs allows the system administrator to adjust various tunable -### filesystem parameters on Linux ext2/ext3 filesystems. +config BUSYBOX_TUNE2FS + bool "tune2fs" + default n # off: it is too limited compared to upstream version + help + tune2fs allows the system administrator to adjust various tunable + filesystem parameters on Linux ext2/ext3 filesystems. ### config E2LABEL ### bool "e2label" -### default n +### default y ### depends on BUSYBOX_TUNE2FS ### help ### e2label will display or change the filesystem label on the ext2 @@ -59,7 +62,7 @@ config BUSYBOX_LSATTR ### NB: this one is now provided by util-linux/volume_id/* ### config FINDFS ### bool "findfs" -### default n +### default y ### depends on BUSYBOX_TUNE2FS ### help ### findfs will search the disks in the system looking for a filesystem diff --git a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in index e7e376c0d..2146bb9a9 100644 --- a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in +++ b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,21 +6,22 @@ menu "Linux Ext2 FS Progs" + config BUSYBOX_CHATTR bool "chattr" default n help chattr changes the file attributes on a second extended file system. -#config BUSYBOX_E2FSCK -# bool "e2fsck" -# default n -# help -## e2fsck is used to check Linux second extended file systems (ext2fs). -# e2fsck also supports ext2 filesystems countaining a journal (ext3). -# The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also -# provided. -# +config BUSYBOX_E2FSCK + bool "e2fsck" + default n + help + e2fsck is used to check Linux second extended file systems (ext2fs). + e2fsck also supports ext2 filesystems countaining a journal (ext3). + The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also + provided. + config BUSYBOX_FSCK bool "fsck" default n @@ -34,34 +36,34 @@ config BUSYBOX_LSATTR help lsattr lists the file attributes on a second extended file system. -#config BUSYBOX_MKE2FS -# bool "mke2fs" -# default n -# help -# mke2fs is used to create an ext2/ext3 filesystem. The normal compat -# symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. +config BUSYBOX_MKE2FS + bool "mke2fs" + default n + help + mke2fs is used to create an ext2/ext3 filesystem. The normal compat + symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. -#config BUSYBOX_TUNE2FS -# bool "tune2fs" -# default n -# help -## tune2fs allows the system administrator to adjust various tunable -# filesystem parameters on Linux ext2/ext3 filesystems. +config BUSYBOX_TUNE2FS + bool "tune2fs" + default n + help + tune2fs allows the system administrator to adjust various tunable + filesystem parameters on Linux ext2/ext3 filesystems. -#config BUSYBOX_E2LABEL -# bool "e2label" -# default n -# depends on BUSYBOX_TUNE2FS -# help -# e2label will display or change the filesystem label on the ext2 -# filesystem located on device. +config BUSYBOX_E2LABEL + bool "e2label" + default n + depends on BUSYBOX_TUNE2FS + help + e2label will display or change the filesystem label on the ext2 + filesystem located on device. -#config BUSYBOX_FINDFS -# bool "findfs" -# default n -# depends on BUSYBOX_TUNE2FS -# help -# findfs will search the disks in the system looking for a filesystem -# which has a label matching label or a UUID equal to uuid. +config BUSYBOX_FINDFS + bool "findfs" + default n + depends on BUSYBOX_TUNE2FS + help + findfs will search the disks in the system looking for a filesystem + which has a label matching label or a UUID equal to uuid. endmenu diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 1a86ce9bd..f6e29ac34 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,75 +6,12 @@ menu "Editors" -config BUSYBOX_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 BUSYBOX_FEATURE_AWK_LIBM - bool "Enable math functions (requires libm)" - default n - depends on BUSYBOX_AWK - help - Enable math functions of the Awk programming language. - NOTE: This will require libm to be present for linking. - -config BUSYBOX_CMP - bool "cmp" - default y - help - cmp is used to compare two files and returns the result - to standard output. - -config BUSYBOX_DIFF - bool "diff" - depends on !ADK_PACKAGE_DIFFUTILS - default n - 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 BUSYBOX_FEATURE_DIFF_LONG_OPTIONS - bool "Enable long options" - default n - depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS - help - Enable use of long options. - -config BUSYBOX_FEATURE_DIFF_DIR - bool "Enable directory support" - default y - depends on BUSYBOX_DIFF - help - This option enables support for directory and subdirectory - comparison. - -config BUSYBOX_ED - bool "ed" - default n - help - The original 1970's Unix text editor, from the days of teletypes. - Small, simple, evil. Part of SUSv3. If you're not already using - this, you don't need it. - config BUSYBOX_PATCH bool "patch" depends on !ADK_PACKAGE_PATCH default n help Apply a unified diff formatted patch. - -config BUSYBOX_SED - bool "sed" - depends on !ADK_PACKAGE_SED - default y - help - sed is used to perform text transformations on a file - or input from a pipeline. - config BUSYBOX_VI bool "vi" default y @@ -94,7 +32,7 @@ config BUSYBOX_FEATURE_VI_MAX_LEN config BUSYBOX_FEATURE_VI_8BIT bool "Allow vi to display 8-bit chars (otherwise shows dots)" - default y + default n depends on BUSYBOX_VI help If your terminal can display characters with high bit set, @@ -126,6 +64,13 @@ config BUSYBOX_FEATURE_VI_SEARCH Select this if you wish to be able to do search and replace in busybox vi. +config BUSYBOX_FEATURE_VI_REGEX_SEARCH + bool "Enable regex in search and replace" + default n # Uses GNU regex, which may be unavailable. FIXME + depends on BUSYBOX_FEATURE_VI_SEARCH + help + Use extended regex search. + config BUSYBOX_FEATURE_VI_USE_SIGNALS bool "Catch signals" default y @@ -178,8 +123,8 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL 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. @@ -191,6 +136,68 @@ config BUSYBOX_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 BUSYBOX_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 BUSYBOX_FEATURE_AWK_LIBM + bool "Enable math functions (requires libm)" + default y + depends on BUSYBOX_AWK + help + Enable math functions of the Awk programming language. + NOTE: This will require libm to be present for linking. + +config BUSYBOX_CMP + bool "cmp" + default y + help + cmp is used to compare two files and returns the result + to standard output. + +config BUSYBOX_DIFF + bool "diff" + depends on !ADK_PACKAGE_DIFFUTILS + default n + 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 BUSYBOX_FEATURE_DIFF_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS + help + Enable use of long options. + +config BUSYBOX_FEATURE_DIFF_DIR + bool "Enable directory support" + default y + depends on BUSYBOX_DIFF + help + This option enables support for directory and subdirectory + comparison. + +config BUSYBOX_ED + bool "ed" + default y + help + The original 1970's Unix text editor, from the days of teletypes. + Small, simple, evil. Part of SUSv3. If you're not already using + this, you don't need it. + +config BUSYBOX_SED + bool "sed" + depends on !ADK_PACKAGE_SED + default y + help + sed is used to perform text transformations on a file + or input from a pipeline. + config BUSYBOX_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" default y diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in index e60537448..072f01bfc 100644 --- a/package/busybox/config/findutils/Config.in +++ b/package/busybox/config/findutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -12,14 +13,6 @@ config BUSYBOX_FIND help find is used to search your system to find specified files. -config BUSYBOX_FEATURE_FIND_EMPTY - bool "Enable -empty option matching empty files and directories" - default y - depends on BUSYBOX_FIND - help - Support the 'find -empty' option for searching empty files - and directories. - config BUSYBOX_FEATURE_FIND_PRINT0 bool "Enable -print0: NUL-terminated output" default y @@ -69,11 +62,11 @@ config BUSYBOX_FEATURE_FIND_XDEV This option allows find to restrict searches to a single filesystem. config BUSYBOX_FEATURE_FIND_MAXDEPTH - bool "Enable -maxdepth N" + bool "Enable -mindepth N and -maxdepth N" default y depends on BUSYBOX_FIND help - This option enables -maxdepth N option. + This option enables -mindepth N and -maxdepth N option. config BUSYBOX_FEATURE_FIND_NEWER bool "Enable -newer: compare file modification times" @@ -81,7 +74,7 @@ config BUSYBOX_FEATURE_FIND_NEWER depends on BUSYBOX_FIND help Support the 'find -newer' option for finding any files which have - a modified time that is more recent than the specified FILE. + modification time that is more recent than the specified FILE. config BUSYBOX_FEATURE_FIND_INUM bool "Enable -inum: inode number matching" @@ -90,6 +83,14 @@ config BUSYBOX_FEATURE_FIND_INUM help Support the 'find -inum' option for searching by inode number. +config BUSYBOX_FEATURE_FIND_EMPTY + bool "Enable -empty option matching empty files and directories" + default y + depends on BUSYBOX_FIND + help + Support the 'find -empty' option for searching empty files + and directories. + config BUSYBOX_FEATURE_FIND_EXEC bool "Enable -exec: execute commands" default y @@ -182,11 +183,10 @@ config BUSYBOX_FEATURE_FIND_CONTEXT config BUSYBOX_FEATURE_FIND_LINKS bool "Enable -links: link count matching" - default n + default y depends on BUSYBOX_FIND help Support the 'find -links' option for matching number of links. - config BUSYBOX_GREP bool "grep" depends on !ADK_PACKAGE_GREP @@ -220,7 +220,6 @@ config BUSYBOX_FEATURE_GREP_CONTEXT Print the specified number of leading (-B) and/or trailing (-A) context surrounding our matching lines. Print the specified number of context lines (-C). - config BUSYBOX_XARGS bool "xargs" default y @@ -230,7 +229,7 @@ config BUSYBOX_XARGS config BUSYBOX_FEATURE_XARGS_SUPPORT_CONFIRMATION bool "Enable -p: prompt and confirmation" - default n + default y depends on BUSYBOX_XARGS help Support -p: prompt the user whether to run each command @@ -238,14 +237,14 @@ config BUSYBOX_FEATURE_XARGS_SUPPORT_CONFIRMATION config BUSYBOX_FEATURE_XARGS_SUPPORT_QUOTES bool "Enable single and double quotes and backslash" - default n + default y depends on BUSYBOX_XARGS help Support quoting in the input. config BUSYBOX_FEATURE_XARGS_SUPPORT_TERMOPT bool "Enable -x: exit if -s or -n is exceeded" - default n + default y depends on BUSYBOX_XARGS help Support -x: exit if the command size (see the -s or -n option) diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in index 3858d14c5..d8b4a449e 100644 --- a/package/busybox/config/init/Config.in +++ b/package/busybox/config/init/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -20,9 +21,9 @@ config BUSYBOX_BOOTCHARTD and stopped using bootchartd stop. config BUSYBOX_FEATURE_BOOTCHARTD_BLOATED_HEADER - bool "bootchartd" + bool "Compatible, bloated header" default y - depends on BOOTCHARTD + depends on BUSYBOX_BOOTCHARTD help Create extended header file compatible with "big" bootchartd. "Big" bootchartd is a shell script and it dumps some @@ -37,13 +38,37 @@ config BUSYBOX_FEATURE_BOOTCHARTD_BLOATED_HEADER makes bootchartd applet to dump a subset of it. config BUSYBOX_FEATURE_BOOTCHARTD_CONFIG_FILE - bool "bootchartd" + bool "Support bootchartd.conf" default y - depends on BOOTCHARTD + depends on BUSYBOX_BOOTCHARTD help Enable reading and parsing of $PWD/bootchartd.conf and /etc/bootchartd.conf files. +config BUSYBOX_HALT + bool "poweroff, halt, and reboot" + default y + help + Stop all processes and either halt, reboot, or power off the system. + +config BUSYBOX_FEATURE_CALL_TELINIT + bool "Call telinit on shutdown and reboot" + default n + depends on BUSYBOX_HALT && !BUSYBOX_INIT + help + Call an external program (normally telinit) to facilitate + a switch to a proper runlevel. + This option is only available if you selected halt and friends, + but did not select init. + +config BUSYBOX_TELINIT_PATH + string "Path to telinit executable" + default "/sbin/telinit" + depends on BUSYBOX_FEATURE_CALL_TELINIT + help + When busybox halt and friends have to call external telinit + to facilitate proper shutdown, this path is to be used when + locating telinit executable. config BUSYBOX_INIT bool "init" default y @@ -64,8 +89,8 @@ config BUSYBOX_FEATURE_KILL_REMOVED depends on BUSYBOX_FEATURE_USE_INITTAB help When respawn entries are removed from inittab and a SIGHUP is - sent to init, this feature will kill the processes that have - been removed. + sent to init, this option will make init kill the processes + that have been removed. config BUSYBOX_FEATURE_KILL_DELAY int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED @@ -126,32 +151,6 @@ config BUSYBOX_FEATURE_INITRD This does not apply to initramfs, which runs /init as PID 1 and requires no special support. -config BUSYBOX_HALT - bool "poweroff, halt, and reboot" - default y - help - Stop all processes and either halt, reboot, or power off the system. - -config BUSYBOX_FEATURE_CALL_TELINIT - bool "Call telinit on shutdown and reboot" - default n - depends on BUSYBOX_HALT && !BUSYBOX_INIT - help - Call an external program (normally telinit) to facilitate - a switch to a proper runlevel. - - This option is only available if you selected halt and friends, - but did not select init. - -config BUSYBOX_TELINIT_PATH - string "Path to telinit executable" - default "/sbin/telinit" - depends on BUSYBOX_FEATURE_CALL_TELINIT - help - When busybox halt and friends have to call external telinit - to facilitate proper shutdown, this path is to be used when - locating telinit executable. - config BUSYBOX_INIT_TERMINAL_TYPE string "Initial terminal type" default "linux" @@ -163,7 +162,6 @@ config BUSYBOX_INIT_TERMINAL_TYPE Note that on Linux, init attempts to detect serial terminal and sets TERM to "vt102" if one is found. - config BUSYBOX_MESG bool "mesg" default n @@ -171,4 +169,16 @@ config BUSYBOX_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 BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP + bool "Enable writing to tty only by group, not by everybody" + default y + depends on BUSYBOX_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. + endmenu diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in index c42a93bbb..ff06540cc 100644 --- a/package/busybox/config/libbb/Config.in +++ b/package/busybox/config/libbb/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,21 @@ menu "Busybox Library Tuning" +config BUSYBOX_FEATURE_SYSTEMD + bool "Enable systemd support" + default n + 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 BUSYBOX_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 BUSYBOX_PASSWORD_MINLEN int "Minimum password length" default 6 @@ -12,9 +28,9 @@ config BUSYBOX_PASSWORD_MINLEN help Minimum allowable password length. -config BUSYBOX_MD5_SIZE_VS_SPEED +config BUSYBOX_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. @@ -28,7 +44,7 @@ config BUSYBOX_MD5_SIZE_VS_SPEED config BUSYBOX_FEATURE_FAST_TOP bool "Faster /proc scanning code (+100 bytes)" - default n + default y help This option makes top (and ps) ~20% faster (or 20% less CPU hungry), but code size is slightly bigger. @@ -41,6 +57,17 @@ config BUSYBOX_FEATURE_ETC_NETWORKS a rarely used feature which allows you to use names instead of IP/mask pairs in route command. +config BUSYBOX_FEATURE_USE_TERMIOS + bool "Use termios to manipulate the screen" + default y + depends on BUSYBOX_MORE || BUSYBOX_TOP || BUSYBOX_POWERTOP + help + This option allows utilities such as 'more' and 'top' to determine + the size of the screen. If you leave this disabled, your utilities + that display things on the screen will be especially primitive and + will be unable to determine the c