summaryrefslogtreecommitdiff
path: root/package/busybox/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-01-09 12:02:17 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-01-09 12:08:32 -0600
commit86098e08d81361365729c0d65ec320ac48269646 (patch)
tree49a64ac1d875387f8f40390a01e301e4a82cafeb /package/busybox/config
parent2f6b24f42d1ab900fd29b03c0f8b1f15e0303b04 (diff)
update busybox to 2.23.0
add upstream patches. Fix the busybox disable mechanism. When you choose less or lsusb full blown version, be sure busybox applet is disabled.
Diffstat (limited to 'package/busybox/config')
-rw-r--r--package/busybox/config/Config.in46
-rw-r--r--package/busybox/config/coreutils/Config.in32
-rw-r--r--package/busybox/config/editors/Config.in44
-rw-r--r--package/busybox/config/findutils/Config.in18
-rw-r--r--package/busybox/config/loginutils/Config.in7
-rw-r--r--package/busybox/config/networking/Config.in8
-rw-r--r--package/busybox/config/networking/udhcp/Config.in11
-rw-r--r--package/busybox/config/util-linux/Config.in54
8 files changed, 211 insertions, 9 deletions
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index eaf7fc1c4..f743bd59f 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -47,6 +47,14 @@ config BUSYBOX_USE_PORTABLE_CODE
compiler other than gcc.
If you do use gcc, this option may needlessly increase code size.
+config BUSYBOX_INSTALL_NO_USR
+ bool "Don't use /usr"
+ default n
+ help
+ Disable use of /usr. busybox --install and "make install"
+ will install applets only to /bin and /sbin,
+ never to /usr/bin or /usr/sbin.
+
config BUSYBOX_PLATFORM_LINUX
bool "Enable Linux-specific applets and features"
default y
@@ -248,6 +256,26 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN
at shell prompt will list file named 0xff (single char name
with char value 255), not file named '?'.
+config BUSYBOX_PAM
+ bool "Support for PAM (Pluggable Authentication Modules)"
+ default n
+ help
+ Use PAM in some busybox applets (currently login and httpd) instead
+ of direct access to password database.
+
+config BUSYBOX_FEATURE_USE_SENDFILE
+ bool "Use sendfile system call"
+ default y
+ select PLATFORM_LINUX
+ help
+ When enabled, busybox will use the kernel sendfile() function
+ instead of read/write loops to copy data between file descriptors
+ (for example, cp command does this a lot).
+ If sendfile() doesn't work, copying code falls back to read/write
+ loop. sendfile() was originally implemented for faster I/O
+ from files to sockets, but since Linux 2.6.33 it was extended
+ to work for many more file types.
+
config BUSYBOX_LONG_OPTS
bool "Support for --long-options"
default y
@@ -304,6 +332,16 @@ config BUSYBOX_FEATURE_PIDFILE
This option makes some applets (e.g. crond, syslogd, inetd) write
a pidfile in /var/run. Some applications rely on them.
+config BUSYBOX_PID_FILE_PATH
+ string "Path to directory for pidfile"
+ default "/var/run"
+ depends on BUSYBOX_FEATURE_PIDFILE
+ help
+ This is the default path where pidfiles are created. Applets which
+ allow you to set the pidfile path on the command line will override
+ this value. The option has no effect on applets that require you to
+ specify a pidfile path.
+
config BUSYBOX_FEATURE_SUID
bool "Support for SUID/SGID handling"
default y
@@ -653,6 +691,14 @@ config BUSYBOX_DEBUG_PESSIMIZE
in a much bigger executable that more closely matches the source
code.
+config BUSYBOX_UNIT_TEST
+ bool "Build unit tests"
+ default n
+ help
+ Say Y here if you want to build unit tests (both the framework and
+ test cases) as a Busybox applet. This results in bigger code, so you
+ probably don't want this option in production builds.
+
config BUSYBOX_WERROR
bool "Abort compilation on any warning"
default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 923e7cb73..46eccd4f1 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -79,6 +79,13 @@ config BUSYBOX_GROUPS
default y
help
Print the group names associated with current user id.
+
+config BUSYBOX_SHUF
+ bool "shuf"
+ default n
+ help
+ Generate random permutations
+
config BUSYBOX_TEST
bool "test"
default y
@@ -93,6 +100,7 @@ config BUSYBOX_FEATURE_TEST_64
depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH
help
Enable 64-bit support in test.
+
config BUSYBOX_TOUCH
bool "touch"
default y
@@ -100,6 +108,14 @@ config BUSYBOX_TOUCH
touch is used to create or change the access and/or
modification timestamp of specified files.
+config BUSYBOX_FEATURE_TOUCH_NODEREF
+ bool "Add support for -h"
+ default y
+ depends on BUSYBOX_TOUCH
+ help
+ Enable touch to have the -h option.
+ This requires libc support for lutimes() function.
+
config BUSYBOX_FEATURE_TOUCH_SUSV3
bool "Add support for SUSV3 features (-d -t -r)"
default y
@@ -132,6 +148,12 @@ config BUSYBOX_FEATURE_TR_EQUIV
useful for cases when no other way of expressing a character
is possible.
+config BUSYBOX_UNLINK
+ bool "unlink"
+ default y
+ help
+ unlink deletes a file by calling unlink()
+
config BUSYBOX_BASE64
bool "base64"
default y
@@ -883,6 +905,16 @@ config BUSYBOX_YES
yes is used to repeatedly output a specific string, or
the default string `y'.
+comment "Common options"
+
+config BUSYBOX_FEATURE_VERBOSE
+ bool "Support verbose options (usually -v) for various applets"
+ default y
+ help
+ Enable cp -v, rm -v and similar messages.
+ Also enables long option (--verbose) if it exists.
+ Without this option, -v is accepted but ignored.
+
comment "Common options for cp and mv"
depends on BUSYBOX_CP || BUSYBOX_MV
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index cb16bbe34..1c761387c 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -129,6 +129,39 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
This is not clean but helps a lot on serial lines and such.
+config BUSYBOX_FEATURE_VI_UNDO
+ bool "Support undo command 'u'"
+ default y
+ depends on BUSYBOX_VI
+ help
+ Support the 'u' command to undo insertion, deletion, and replacement
+ of text.
+
+config BUSYBOX_FEATURE_VI_UNDO_QUEUE
+ bool "Enable undo operation queuing"
+ default y
+ depends on BUSYBOX_FEATURE_VI_UNDO
+ help
+ The vi undo functions can use an intermediate queue to greatly lower
+ malloc() calls and overhead. When the maximum size of this queue is
+ reached, the contents of the queue are committed to the undo stack.
+ This increases the size of the undo code and allows some undo
+ operations (especially un-typing/backspacing) to be far more useful.
+
+config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
+ int "Maximum undo character queue size"
+ default 256
+ range 32 65536
+ depends on BUSYBOX_FEATURE_VI_UNDO_QUEUE
+ help
+ This option sets the number of bytes used at runtime for the queue.
+ Smaller values will create more undo objects and reduce the amount
+ of typed or backspaced characters that are grouped into one undo
+ operation; larger values increase the potential size of each undo
+ and will generally malloc() larger objects and less frequently.
+ Unless you want more (or less) frequent "undo points" while typing,
+ you should probably leave this unchanged.
+
config BUSYBOX_AWK
bool "awk"
default y
@@ -144,6 +177,17 @@ config BUSYBOX_FEATURE_AWK_LIBM
Enable math functions of the Awk programming language.
NOTE: This will require libm to be present for linking.
+config BUSYBOX_FEATURE_AWK_GNU_EXTENSIONS
+ bool "Enable a few GNU extensions"
+ default y
+ depends on BUSYBOX_AWK
+ help
+ Enable a few features from gawk:
+ * command line option -e AWK_PROGRAM
+ * simultaneous use of -f and -e on the command line.
+ This enables the use of awk library files.
+ Ex: awk -f mylib.awk -e '{print myfunction($1);}' ...
+
config BUSYBOX_CMP
bool "cmp"
default y
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 25d925288..d499d13ee 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -99,6 +99,16 @@ config BUSYBOX_FEATURE_FIND_EXEC
Support the 'find -exec' option for executing commands based upon
the files matched.
+config BUSYBOX_FEATURE_FIND_EXEC_PLUS
+ bool "Enable -exec ... {} +"
+ default y
+ depends on BUSYBOX_FEATURE_FIND_EXEC
+ help
+ Support the 'find -exec ... {} +' option for executing commands
+ for all matched files at once.
+ Without this option, -exec + is a synonym for -exec ;
+ (IOW: it works correctly, but without expected speedup)
+
config BUSYBOX_FEATURE_FIND_USER
bool "Enable -user: username/uid matching"
default y
@@ -221,6 +231,7 @@ 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
@@ -260,4 +271,11 @@ config BUSYBOX_FEATURE_XARGS_SUPPORT_ZERO_TERM
instead of whitespace, and the quotes and backslash
are not special.
+config BUSYBOX_FEATURE_XARGS_SUPPORT_REPL_STR
+ bool "Enable -I STR: string to replace"
+ default y
+ depends on BUSYBOX_XARGS
+ help
+ Support -I STR and -i[STR] options.
+
endmenu
diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index 5538f0139..d58e910b8 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -129,6 +129,13 @@ config BUSYBOX_FEATURE_CHECK_NAMES
For compatibility with Samba machine accounts "$" is also supported
at the end of the user or group name.
+config BUSYBOX_LAST_ID
+ int "Last valid uid or gid for adduser and addgroup"
+ depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
+ default 60000
+ help
+ Last valid uid or gid for adduser and addgroup
+
config BUSYBOX_FIRST_SYSTEM_ID
int "First valid system uid or gid for adduser and addgroup"
depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index a2475a161..6e68fc786 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -767,6 +767,14 @@ config BUSYBOX_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 BUSYBOX_FEATURE_NTPD_CONF
+ bool "Make ntpd understand /etc/ntp.conf"
+ default n
+ depends on BUSYBOX_NTPD
+ help
+ Make ntpd look in /etc/ntp.conf for peers. Only "server address"
+ is supported.
+
config BUSYBOX_PSCAN
bool "pscan"
default n
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index e0f20fc49..35e5ce538 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -89,6 +89,17 @@ config BUSYBOX_FEATURE_UDHCPC_ARPING
will DHCPDECLINE the offer if the address is in use,
and restart the discover process.
+config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT
+ bool "Do not pass malformed host and domain names"
+ default y
+ depends on BUSYBOX_UDHCPC
+ help
+ If selected, udhcpc will check some options (such as option 12 -
+ hostname) and if they don't look like valid hostnames
+ (for example, if they start with dash or contain spaces),
+ they will be replaced with string "bad" when exporting
+ to the environment.
+
config BUSYBOX_FEATURE_UDHCP_PORT
bool "Enable '-P port' option for udhcpd and udhcpc"
default n
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index a82abc8b2..b710555fa 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -12,6 +12,20 @@ config BUSYBOX_BLOCKDEV
help
Performs some ioctls with block devices.
+config BUSYBOX_FATATTR
+ bool "fatattr"
+ default n
+ select PLATFORM_LINUX
+ help
+ fatattr lists or changes the file attributes on a fat file system.
+
+config BUSYBOX_FSTRIM
+ bool "fstrim"
+ default n
+ select PLATFORM_LINUX
+ help
+ Discard unused blocks on a mounted filesystem.
+
config BUSYBOX_MDEV
bool "mdev"
default y
@@ -153,7 +167,6 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
config BUSYBOX_FBSET
bool "fbset"
depends on !BUSYBOX_DISABLE_FBSET
- default y if ADK_TARGET_WITH_VGA
default n
select BUSYBOX_PLATFORM_LINUX
help
@@ -317,6 +330,13 @@ config BUSYBOX_FSCK_MINIX
check for and attempt to repair any corruption that occurs to a minix
filesystem.
+config BUSYBOX_MKFS_EXT2
+ bool "mkfs_ext2"
+ default n
+ select PLATFORM_LINUX
+ help
+ Utility to create EXT2 filesystems.
+
config BUSYBOX_MKFS_MINIX
bool "mkfs_minix"
default n
@@ -345,7 +365,6 @@ config BUSYBOX_MKFS_REISER
config BUSYBOX_MKFS_VFAT
bool "mkfs_vfat"
- default y if ADK_TARGET_WITH_MMC
default n
select BUSYBOX_PLATFORM_LINUX
help
@@ -427,7 +446,7 @@ config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS
config BUSYBOX_IPCRM
bool "ipcrm"
- default y
+ default n
help
The ipcrm utility allows the removal of System V interprocess
communication (IPC) objects and the associated data structures
@@ -435,7 +454,7 @@ config BUSYBOX_IPCRM
config BUSYBOX_IPCS
bool "ipcs"
- default y
+ default n
select BUSYBOX_PLATFORM_LINUX
help
The ipcs utility is used to provide information on the currently
@@ -453,8 +472,6 @@ config BUSYBOX_LOSETUP
config BUSYBOX_LSPCI
bool "lspci"
depends on !BUSYBOX_DISABLE_LSPCI
- default y if ADK_TARGET_WITH_PCI
- default y if ADK_TARGET_WITH_MINIPCI
default n
#select PLATFORM_LINUX
help
@@ -466,7 +483,6 @@ config BUSYBOX_LSPCI
config BUSYBOX_LSUSB
bool "lsusb"
depends on !BUSYBOX_DISABLE_LSUSB
- default y if ADK_TARGET_WITH_USB
default n
#select PLATFORM_LINUX
help
@@ -477,7 +493,7 @@ config BUSYBOX_LSUSB
config BUSYBOX_MKSWAP
bool "mkswap"
- default y
+ default n
help
The mkswap utility is used to configure a file or disk partition as
Linux swap space. This allows Linux to use the entire file or
@@ -609,6 +625,7 @@ config BUSYBOX_PIVOT_ROOT
config BUSYBOX_RDATE
bool "rdate"
+ depends on !BUSYBOX_DISABLE_RDATE
default n
help
The rdate utility allows you to synchronize the date and time of your
@@ -661,7 +678,7 @@ config BUSYBOX_SETARCH
config BUSYBOX_SWAPONOFF
bool "swaponoff"
- default y
+ default n
select BUSYBOX_PLATFORM_LINUX
help
This option enables both the 'swapon' and the 'swapoff' utilities.
@@ -671,6 +688,15 @@ config BUSYBOX_SWAPONOFF
space. If you are not using any swap space, you can leave this
option disabled.
+config BUSYBOX_FEATURE_SWAPON_DISCARD
+ bool "Support discard option -d"
+ default n
+ depends on BUSYBOX_SWAPONOFF
+ help
+ Enable support for discarding swap area blocks at swapon and/or as
+ the kernel frees them. This option enables both the -d option on
+ 'swapon' and the 'discard' option for swap entries in /etc/fstab.
+
config BUSYBOX_FEATURE_SWAPON_PRI
bool "Support priority option -p"
default y
@@ -800,6 +826,16 @@ config BUSYBOX_FEATURE_VOLUMEID_REISERFS
help
TODO
+config BUSYBOX_FEATURE_VOLUMEID_F2FS
+ bool "f2fs filesystem"
+ default y
+ depends on BUSYBOX_VOLUMEID
+ help
+ F2FS (aka Flash-Friendly File System) is a log-structured file system,
+ which is adapted to newer forms of storage. F2FS also remedies some
+ known issues of the older log structured file systems, such as high
+ cleaning overhead.
+
config BUSYBOX_FEATURE_VOLUMEID_FAT
bool "fat filesystem"
default y