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/archival | |
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/archival')
-rw-r--r-- | package/utils/busybox/config/archival/Config.in | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/package/utils/busybox/config/archival/Config.in b/package/utils/busybox/config/archival/Config.in index 1ca610cad6..ff4c2cf6bd 100644 --- a/package/utils/busybox/config/archival/Config.in +++ b/package/utils/busybox/config/archival/Config.in @@ -32,7 +32,7 @@ config BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ config BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z bool "tar, rpm, modprobe etc understand .Z data" - default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_Z + default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_Z # it is ancient help Make tar, rpm, modprobe etc understand .Z data. @@ -41,23 +41,13 @@ config BUSYBOX_CONFIG_AR default BUSYBOX_DEFAULT_AR # 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 - a collection of other files in a structure that makes it possible to - retrieve the original individual files (called archive members). - The original files' contents, mode (permissions), timestamp, owner, - and group are preserved in the archive, and can be restored on - extraction. - - The stored filename is limited to 15 characters. (for more information - see long filename support). - ar has 60 bytes of overheads for every stored file. - - This implementation of ar can extract archives, it cannot create or - modify them. + extract contents from archives. In practice, it is used exclusively + for object module archives used by compilers. + On an x86 system, the ar applet adds about 1K. Unless you have a specific application which requires ar, you should - probably say N here. + probably say N here: most compilers come with their own ar utility. config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES bool "Support for long filenames (not needed for debs)" @@ -77,7 +67,7 @@ config BUSYBOX_CONFIG_FEATURE_AR_CREATE This enables archive creation (-c and -r) with busybox ar. config BUSYBOX_CONFIG_UNCOMPRESS bool "uncompress" - default BUSYBOX_DEFAULT_UNCOMPRESS + default BUSYBOX_DEFAULT_UNCOMPRESS # ancient help uncompress is used to decompress archives created by compress. Not much used anymore, replaced by gzip/gunzip. @@ -88,6 +78,13 @@ config BUSYBOX_CONFIG_GUNZIP gunzip is used to decompress archives created by gzip. You can use the `-t' option to test the integrity of an archive, without decompressing it. + +config BUSYBOX_CONFIG_FEATURE_GUNZIP_LONG_OPTIONS + bool "Enable long options" + default BUSYBOX_DEFAULT_FEATURE_GUNZIP_LONG_OPTIONS + depends on BUSYBOX_CONFIG_GUNZIP && BUSYBOX_CONFIG_LONG_OPTS + help + Enable use of long options. config BUSYBOX_CONFIG_BUNZIP2 bool "bunzip2" default BUSYBOX_DEFAULT_BUNZIP2 |