diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-09-18 23:26:26 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-09-20 22:37:02 +0200 |
commit | 06fa1c46fc32644a54393a7a0125eba5dd9dbb3f (patch) | |
tree | a2979d89cba346afa14d6ce8e0f38cca2800ce7b /package/utils/busybox/config/coreutils/Config.in | |
parent | ef64c8694ba1615223db933f03ec2c5e14facea5 (diff) | |
download | upstream-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/coreutils/Config.in')
-rw-r--r-- | package/utils/busybox/config/coreutils/Config.in | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/package/utils/busybox/config/coreutils/Config.in b/package/utils/busybox/config/coreutils/Config.in index 2f9473857b..ec5611bdfd 100644 --- a/package/utils/busybox/config/coreutils/Config.in +++ b/package/utils/busybox/config/coreutils/Config.in @@ -123,6 +123,29 @@ config BUSYBOX_CONFIG_SHUF default BUSYBOX_DEFAULT_SHUF help Generate random permutations +config BUSYBOX_CONFIG_STAT + bool "stat" + default BUSYBOX_DEFAULT_STAT + help + display file or filesystem status. + +config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT + bool "Enable custom formats (-c)" + default BUSYBOX_DEFAULT_FEATURE_STAT_FORMAT + depends on BUSYBOX_CONFIG_STAT + help + Without this, stat will not support the '-c format' option where + users can pass a custom format string for output. This adds about + 7k to a nonstatic build on amd64. + +config BUSYBOX_CONFIG_FEATURE_STAT_FILESYSTEM + bool "Enable display of filesystem status (-f)" + default BUSYBOX_DEFAULT_FEATURE_STAT_FILESYSTEM + depends on BUSYBOX_CONFIG_STAT + select BUSYBOX_CONFIG_PLATFORM_LINUX # statfs() + help + Without this, stat will not support the '-f' option to display + information about filesystem status. config BUSYBOX_CONFIG_SYNC bool "sync" default BUSYBOX_DEFAULT_SYNC @@ -760,22 +783,6 @@ config BUSYBOX_CONFIG_FEATURE_SPLIT_FANCY Supports additional suffixes 'b' for 512 bytes, 'g' for 1GiB for the -b option. -config BUSYBOX_CONFIG_STAT - bool "stat" - default BUSYBOX_DEFAULT_STAT - select BUSYBOX_CONFIG_PLATFORM_LINUX # statfs() - help - display file or filesystem status. - -config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT - bool "Enable custom formats (-c)" - default BUSYBOX_DEFAULT_FEATURE_STAT_FORMAT - depends on BUSYBOX_CONFIG_STAT - help - Without this, stat will not support the '-c format' option where - users can pass a custom format string for output. This adds about - 7k to a nonstatic build on amd64. - config BUSYBOX_CONFIG_STTY bool "stty" default BUSYBOX_DEFAULT_STTY |