aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/config/util-linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-09-18 23:26:26 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-09-20 22:37:02 +0200
commit06fa1c46fc32644a54393a7a0125eba5dd9dbb3f (patch)
treea2979d89cba346afa14d6ce8e0f38cca2800ce7b /package/utils/busybox/config/util-linux
parentef64c8694ba1615223db933f03ec2c5e14facea5 (diff)
downloadupstream-06fa1c46fc32644a54393a7a0125eba5dd9dbb3f.tar.gz
upstream-06fa1c46fc32644a54393a7a0125eba5dd9dbb3f.tar.bz2
upstream-06fa1c46fc32644a54393a7a0125eba5dd9dbb3f.zip
busybox: update to version 1.25.0
The following patches were removed: 010-networking-fix-uninitialized-memory-when-displaying-.patch https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e 030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f 204-udhcpc_src_ip_rebind.patch https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90 230-ntpd_delayed_resolve.patch https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11 260-arping_missing_includes.patch Not needed any more, still builds with musl for me. Add in 92fd6e6f1a "busybox: fix arping applet building on musl" The Kconfig files were updated with these commands: cd config ../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0 cd .. ./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/utils/busybox/config/util-linux')
-rw-r--r--package/utils/busybox/config/util-linux/Config.in45
-rw-r--r--package/utils/busybox/config/util-linux/volume_id/Config.in8
2 files changed, 43 insertions, 10 deletions
diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in
index 017b1196a0..08bddf819a 100644
--- a/package/utils/busybox/config/util-linux/Config.in
+++ b/package/utils/busybox/config/util-linux/Config.in
@@ -6,6 +6,11 @@
menu "Linux System Utilities"
+config BUSYBOX_CONFIG_BLKDISCARD
+ bool "blkdiscard"
+ default BUSYBOX_DEFAULT_BLKDISCARD
+ help
+ blkdiscard discards sectors on a given device.
config BUSYBOX_CONFIG_BLOCKDEV
bool "blockdev"
default BUSYBOX_DEFAULT_BLOCKDEV
@@ -174,11 +179,34 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_OTHERTAB
default BUSYBOX_DEFAULT_FEATURE_MOUNT_OTHERTAB
help
Support mount -T (specifying an alternate fstab)
+config BUSYBOX_CONFIG_NSENTER
+ bool "nsenter"
+ default BUSYBOX_DEFAULT_NSENTER
+ select BUSYBOX_CONFIG_PLATFORM_LINUX
+ help
+ Run program with namespaces of other processes.
+
+config BUSYBOX_CONFIG_FEATURE_NSENTER_LONG_OPTS
+ bool "Enable long options"
+ default BUSYBOX_DEFAULT_FEATURE_NSENTER_LONG_OPTS
+ depends on BUSYBOX_CONFIG_NSENTER && BUSYBOX_CONFIG_LONG_OPTS
+ help
+ Support long options for the nsenter applet. This makes
+ the busybox implementation more compatible with upstream.
config BUSYBOX_CONFIG_REV
bool "rev"
default BUSYBOX_DEFAULT_REV
help
Reverse lines of a file or files.
+config BUSYBOX_CONFIG_SETARCH
+ bool "setarch"
+ default BUSYBOX_DEFAULT_SETARCH
+ select BUSYBOX_CONFIG_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
+ this util on a system that supports both 64bit and 32bit userland
+ (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
config BUSYBOX_CONFIG_UEVENT
bool "uevent"
default BUSYBOX_DEFAULT_UEVENT
@@ -186,6 +214,13 @@ config BUSYBOX_CONFIG_UEVENT
help
uevent is a netlink listener for kernel uevent notifications
sent via netlink. It is usually used for dynamic device creation.
+config BUSYBOX_CONFIG_UNSHARE
+ bool "unshare"
+ default BUSYBOX_DEFAULT_UNSHARE
+ depends on BUSYBOX_CONFIG_LONG_OPTS && !BUSYBOX_CONFIG_NOMMU
+ select BUSYBOX_CONFIG_PLATFORM_LINUX
+ help
+ Run program with some namespaces unshared from parent.
config BUSYBOX_CONFIG_ACPID
bool "acpid"
@@ -669,16 +704,6 @@ config BUSYBOX_CONFIG_SCRIPTREPLAY
This program replays a typescript, using timing information
given by script -t.
-config BUSYBOX_CONFIG_SETARCH
- bool "setarch"
- default BUSYBOX_DEFAULT_SETARCH
- select BUSYBOX_CONFIG_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
- this util on a system that supports both 64bit and 32bit userland
- (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
-
config BUSYBOX_CONFIG_SWAPONOFF
bool "swaponoff"
default BUSYBOX_DEFAULT_SWAPONOFF
diff --git a/package/utils/busybox/config/util-linux/volume_id/Config.in b/package/utils/busybox/config/util-linux/volume_id/Config.in
index 306550b7b8..6153314d6f 100644
--- a/package/utils/busybox/config/util-linux/volume_id/Config.in
+++ b/package/utils/busybox/config/util-linux/volume_id/Config.in
@@ -12,6 +12,14 @@ menu "Filesystem/Volume identification"
depends on BUSYBOX_CONFIG_VOLUMEID
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_BCACHE
+ bool "bcache filesystem"
+ default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BCACHE
+ depends on BUSYBOX_CONFIG_VOLUMEID
+ help
+ TODO
+
+
config BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS
bool "btrfs filesystem"
default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BTRFS