summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-06-15 12:20:15 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-06-15 12:30:08 +0200
commit61a0f08d5e0f76df8562642315b922343f162bcf (patch)
tree76503ef0094d51f8cc0b895b7be76a5417efdafb /config
parent0c95a6603e3e52c2bba8172ba055211f5f12fd1d (diff)
downloadptxdist-61a0f08d5e0f76df8562642315b922343f162bcf.tar.gz
ptxdist-61a0f08d5e0f76df8562642315b922343f162bcf.tar.xz
busybox: version bump 1.20.2 -> 1.21.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'config')
-rw-r--r--config/busybox/Config.in15
-rw-r--r--config/busybox/coreutils/Config.in12
-rw-r--r--config/busybox/editors/Config.in8
-rw-r--r--config/busybox/libbb/Config.in10
-rw-r--r--config/busybox/networking/Config.in8
-rw-r--r--config/busybox/networking/udhcp/Config.in9
-rw-r--r--config/busybox/procps/Config.in107
-rw-r--r--config/busybox/sysklogd/Config.in16
-rw-r--r--config/busybox/util-linux/Config.in26
9 files changed, 136 insertions, 75 deletions
diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index c5ad60002..8cf459da7 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -310,7 +310,18 @@ config BUSYBOX_FEATURE_PIDFILE
default y
help
This option makes some applets (e.g. crond, syslogd, inetd) write
- a pidfile in /var/run. Some applications rely on them.
+ a pidfile at the configured PID_FILE_PATH. It has no effect
+ on applets which require pidfiles to run.
+
+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"
@@ -321,7 +332,7 @@ config BUSYBOX_FEATURE_SUID
root-level operations even when run by ordinary users
(for example, mounting of user mounts in fstab needs this).
- Busybox will automatically drop priviledges for applets
+ Busybox will automatically drop privileges for applets
that don't need root access.
If you are really paranoid and don't want to do this, build two
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 6393c1c14..36e51e043 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -651,6 +651,12 @@ config BUSYBOX_SHA512SUM
help
Compute and check SHA512 message digest
+config BUSYBOX_SHA3SUM
+ bool "sha3sum"
+ default y
+ help
+ Compute and check SHA3 (512-bit) message digest
+
config BUSYBOX_SLEEP
bool "sleep"
default y
@@ -903,13 +909,13 @@ config BUSYBOX_FEATURE_HUMAN_READABLE
help
Allow df, du, and ls to have human readable output.
-comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
- depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
+ depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
bool "Enable -c, -s and -w options"
default y
- depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+ depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
help
Enabling the -c options allows files to be checked
against pre-calculated hash values.
diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index 39a1e0cc8..a3840d4a2 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -127,14 +127,6 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
This is not clean but helps a lot on serial lines and such.
-config BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR
- bool "Optimize cursor movement"
- default y
- depends on BUSYBOX_VI
- help
- 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
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 032d746b1..cfa483935 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -42,6 +42,16 @@ config BUSYBOX_MD5_SMALL
2 3.0 5088
3 (smallest) 5.1 4912
+config BUSYBOX_SHA3_SMALL
+ int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
+ default 1
+ range 0 1
+ help
+ Trade binary size versus speed for the sha3sum algorithm.
+ SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+ 64-bit x86: +270 bytes of code, 45% faster
+ 32-bit x86: +450 bytes of code, 75% faster
+
config BUSYBOX_FEATURE_FAST_TOP
bool "Faster /proc scanning code (+100 bytes)"
default y
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index f62356774..7e6cc25fe 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -175,12 +175,12 @@ config BUSYBOX_FEATURE_BRCTL_FANCY
This adds about 600 bytes.
config BUSYBOX_FEATURE_BRCTL_SHOW
- bool "Support show, showmac and showstp"
+ bool "Support show"
default y
depends on BUSYBOX_BRCTL && BUSYBOX_FEATURE_BRCTL_FANCY
help
Add support for option which prints the current config:
- showmacs, showstp, show
+ show
config BUSYBOX_DNSD
bool "dnsd"
@@ -1038,8 +1038,8 @@ config BUSYBOX_WGET
bool "wget"
default y
help
- wget is a utility for non-interactive download of files from HTTP,
- HTTPS, and FTP servers.
+ wget is a utility for non-interactive download of files from HTTP
+ and FTP servers.
config BUSYBOX_FEATURE_WGET_STATUSBAR
bool "Enable a nifty process meter (+2k)"
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index 6ece73097..58a7d48d5 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -5,10 +5,11 @@
#
config BUSYBOX_UDHCPC6
- bool "udhcp client for DHCPv6 (udhcpc6)"
- default n # not yet ready
- help
- udhcpc6 is a DHCPv6 client
+ bool "udhcp client for DHCPv6 (udhcpc6)"
+ default n # not yet ready
+ depends on BUSYBOX_FEATURE_IPV6
+ help
+ udhcpc6 is a DHCPv6 client
config BUSYBOX_UDHCPD
bool "udhcp server (udhcpd)"
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index 2e11bd0ef..56b915059 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -53,6 +53,59 @@ config BUSYBOX_SMEMCAP
help
smemcap is a tool for capturing process data for smem,
a memory usage statistic tool.
+config BUSYBOX_TOP
+ bool "top"
+ default y
+ help
+ The top program provides a dynamic real-time view of a running
+ system.
+
+config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+ bool "Show CPU per-process usage percentage"
+ default y
+ depends on BUSYBOX_TOP
+ help
+ Make top display CPU usage for each process.
+ This adds about 2k.
+
+config BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+ bool "Show CPU global usage percentage"
+ default y
+ depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+ help
+ Makes top display "CPU: NN% usr NN% sys..." line.
+ This adds about 0.5k.
+
+config BUSYBOX_FEATURE_TOP_SMP_CPU
+ bool "SMP CPU usage display ('c' key)"
+ default y
+ depends on BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+ help
+ Allow 'c' key to switch between individual/cumulative CPU stats
+ This adds about 0.5k.
+
+config BUSYBOX_FEATURE_TOP_DECIMALS
+ bool "Show 1/10th of a percent in CPU/mem statistics"
+ default y
+ depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+ help
+ Show 1/10th of a percent in CPU/mem statistics.
+ This adds about 0.3k.
+
+config BUSYBOX_FEATURE_TOP_SMP_PROCESS
+ bool "Show CPU process runs on ('j' field)"
+ default y
+ depends on BUSYBOX_TOP
+ help
+ Show CPU where process was last found running on.
+ This is the 'j' field.
+
+config BUSYBOX_FEATURE_TOPMEM
+ bool "Topmem command ('s' key)"
+ default y
+ depends on BUSYBOX_TOP
+ help
+ Enable 's' in top (gives lots of memory info).
config BUSYBOX_UPTIME
bool "uptime"
default y
@@ -202,60 +255,6 @@ config BUSYBOX_BB_SYSCTL
help
Configure kernel parameters at runtime.
-config BUSYBOX_TOP
- bool "top"
- default y
- help
- The top program provides a dynamic real-time view of a running
- system.
-
-config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
- bool "Show CPU per-process usage percentage"
- default y
- depends on BUSYBOX_TOP
- help
- Make top display CPU usage for each process.
- This adds about 2k.
-
-config BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
- bool "Show CPU global usage percentage"
- default y
- depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
- help
- Makes top display "CPU: NN% usr NN% sys..." line.
- This adds about 0.5k.
-
-config BUSYBOX_FEATURE_TOP_SMP_CPU
- bool "SMP CPU usage display ('c' key)"
- default y
- depends on BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
- help
- Allow 'c' key to switch between individual/cumulative CPU stats
- This adds about 0.5k.
-
-config BUSYBOX_FEATURE_TOP_DECIMALS
- bool "Show 1/10th of a percent in CPU/mem statistics"
- default y
- depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
- help
- Show 1/10th of a percent in CPU/mem statistics.
- This adds about 0.3k.
-
-config BUSYBOX_FEATURE_TOP_SMP_PROCESS
- bool "Show CPU process runs on ('j' field)"
- default y
- depends on BUSYBOX_TOP
- help
- Show CPU where process was last found running on.
- This is the 'j' field.
-
-config BUSYBOX_FEATURE_TOPMEM
- bool "Topmem command ('s' key)"
- default y
- depends on BUSYBOX_TOP
- help
- Enable 's' in top (gives lots of memory info).
-
config BUSYBOX_FEATURE_SHOW_THREADS
bool "Support for showing threads in ps/pstree/top"
default y
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 13c9dce2c..e6e9cbb30 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -113,6 +113,19 @@ config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING
from circular buffer, minimizing semaphore
contention at some minor memory expense.
+config BUSYBOX_FEATURE_KMSG_SYSLOG
+ bool "Linux kernel printk buffer support"
+ default y
+ depends on BUSYBOX_SYSLOGD
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ When you enable this feature, the syslogd utility will
+ write system log message to the Linux kernel's printk buffer.
+ This can be used as a smaller alternative to the syslogd IPC
+ support, as klogd and logread aren't needed.
+
+ NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+
config BUSYBOX_KLOGD
bool "klogd"
default y
@@ -123,6 +136,9 @@ config BUSYBOX_KLOGD
you wish to record the messages produced by the kernel,
you should enable this option.
+comment "klogd should not be used together with syslog to kernel printk buffer"
+ depends on BUSYBOX_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG
+
config BUSYBOX_FEATURE_KLOGD_KLOGCTL
bool "Use the klogctl() interface"
default y
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index e865b6b0c..87d7d3c3f 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -801,6 +801,15 @@ config BUSYBOX_FEATURE_VOLUMEID_FAT
help
TODO
+config BUSYBOX_FEATURE_VOLUMEID_EXFAT
+ bool "exFAT filesystem"
+ default y
+ depends on BUSYBOX_VOLUMEID
+ help
+ exFAT (extended FAT) is a proprietary file system designed especially
+ for flash drives. It has many features from NTFS, but with less
+ overhead. exFAT is used on most SDXC cards for consumer electronics.
+
config BUSYBOX_FEATURE_VOLUMEID_HFS
bool "hfs filesystem"
default y
@@ -829,6 +838,13 @@ config BUSYBOX_FEATURE_VOLUMEID_XFS
help
TODO
+config BUSYBOX_FEATURE_VOLUMEID_NILFS
+ bool "nilfs filesystem"
+ default y
+ depends on BUSYBOX_VOLUMEID
+ help
+ TODO
+
config BUSYBOX_FEATURE_VOLUMEID_NTFS
bool "ntfs filesystem"
default y
@@ -892,6 +908,16 @@ config BUSYBOX_FEATURE_VOLUMEID_ROMFS
help
TODO
+config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS
+ bool "SquashFS filesystem"
+ default y
+ depends on BUSYBOX_VOLUMEID && BUSYBOX_FEATURE_BLKID_TYPE
+ help
+ Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+ intended for general read-only filesystem use and in constrained block
+ device/memory systems (e.g. embedded systems) where low overhead is
+ needed.
+
config BUSYBOX_FEATURE_VOLUMEID_SYSV
bool "sysv filesystem"
default y