update busybox and default config

1 files changed, 41 insertions, 17 deletions

diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index 9f043927a..0140b7631 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -7,25 +7,25 @@ menu "Archival Utilities"
 
 config BUSYBOX_FEATURE_SEAMLESS_LZMA
 	bool "Make tar, rpm, modprobe etc understand .lzma data"
-	default y
+	default n
 	help
 	  Make tar, rpm, modprobe etc understand .lzma data.
 
 config BUSYBOX_FEATURE_SEAMLESS_BZ2
 	bool "Make tar, rpm, modprobe etc understand .bz2 data"
-	default y
+	default n
 	help
 	  Make tar, rpm, modprobe etc understand .bz2 data.
 
 config BUSYBOX_FEATURE_SEAMLESS_GZ
 	bool "Make tar, rpm, modprobe etc understand .gz data"
-	default y
+	default n
 	help
 	  Make tar, rpm, modprobe etc understand .gz data.
 
 config BUSYBOX_FEATURE_SEAMLESS_Z
 	bool "Make tar and gunzip understand .Z data"
-	default y
+	default n
 	help
 	  Make tar and gunzip understand .Z data.
 
@@ -53,18 +53,19 @@ config BUSYBOX_AR
 	  probably say N here.
 
 config BUSYBOX_FEATURE_AR_LONG_FILENAMES
-	bool "Support for long filenames (not need for debs)"
+	bool "Support for long filenames (not needed for debs)"
 	default n
 	depends on BUSYBOX_AR
 	help
-	  By default the ar format can only store the first 15 characters of
-	  the filename, this option removes that limitation.
+	  By default the ar format can only store the first 15 characters
+	  of the filename, this option removes that limitation.
 	  It supports the GNU ar long filename method which moves multiple long
 	  filenames into a the data section of a new ar entry.
 
 config BUSYBOX_BUNZIP2
 	bool "bunzip2"
-	default y
+	depends on !ADK_PACKAGE_BZIP2
+	default n
 	help
 	  bunzip2 is a compression utility using the Burrows-Wheeler block
 	  sorting text compression algorithm, and Huffman coding. Compression
@@ -77,8 +78,8 @@ config BUSYBOX_BUNZIP2
 
 config BUSYBOX_BZIP2
 	bool "bzip2"
-	default n
 	depends on !ADK_PACKAGE_BZIP2
+	default n
 	help
 	  bzip2 is a compression utility using the Burrows-Wheeler block
 	  sorting text compression algorithm, and Huffman coding. Compression
@@ -91,8 +92,8 @@ config BUSYBOX_BZIP2
 
 config BUSYBOX_CPIO
 	bool "cpio"
-	default y if !ADK_PACKAGE_CPIO
 	depends on !ADK_PACKAGE_CPIO
+	default n
 	help
 	  cpio is an archival utility program used to create, modify, and
 	  extract contents from archives.
@@ -112,6 +113,13 @@ config BUSYBOX_FEATURE_CPIO_O
 	  This implementation of cpio can create cpio archives in the "newc"
 	  format only.
 
+config BUSYBOX_FEATURE_CPIO_P
+	bool "Support for passthrough mode"
+	default n
+	depends on BUSYBOX_FEATURE_CPIO_O
+	help
+	  Passthrough mode. Rarely used.
+
 config BUSYBOX_DPKG
 	bool "dpkg"
 	default n
@@ -155,14 +163,29 @@ config BUSYBOX_GUNZIP
 
 config BUSYBOX_GZIP
 	bool "gzip"
-	default y
+	default n
 	help
 	  gzip is used to compress files.
 	  It's probably the most widely used UNIX compression program.
 
+config BUSYBOX_LZOP
+	bool "lzop"
+	default n
+	help
+	  Lzop compression/decompresion.
+
+config BUSYBOX_LZOP_COMPR_HIGH
+	bool "lzop complession levels 7,8,9 (not very useful)"
+	default n
+	depends on BUSYBOX_LZOP
+	help
+	  High levels (7,8,9) of lzop compression. These levels
+	  are actually slower than gzip at equivalent compression ratios
+	  and take up 3.2K of code.
+
 config BUSYBOX_IPKG
 	bool "ipkg"
-	default y
+	default n
 	select BUSYBOX_MD5SUM
 	select BUSYBOX_WGET
 	help
@@ -170,6 +193,7 @@ config BUSYBOX_IPKG
 
 config BUSYBOX_RPM2CPIO
 	bool "rpm2cpio"
+	depends on !ADK_PACKAGE_RPM
 	default n
 	help
 	  Converts an RPM file into a CPIO archive.
@@ -183,8 +207,8 @@ config BUSYBOX_RPM
 
 config BUSYBOX_TAR
 	bool "tar"
-	default y
 	depends on !ADK_PACKAGE_TAR
+	default y
 	help
 	  tar is an archiving program. It's commonly used with gzip to
 	  create compressed archives. It's probably the most widely used
@@ -201,11 +225,11 @@ config BUSYBOX_FEATURE_TAR_CREATE
 	  tar archives using the `-c' option.
 
 config BUSYBOX_FEATURE_TAR_AUTODETECT
-	bool "Autodetect gz/bz2 compressed tarballs"
+	bool "Autodetect compressed tarballs"
 	default n
 	depends on BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA
 	help
-	  With this option tar can automatically detect gzip/bzip2 compressed
+	  With this option tar can automatically detect compressed
 	  tarballs. Currently it works only on files (not pipes etc).
 
 config BUSYBOX_FEATURE_TAR_FROM
@@ -246,7 +270,7 @@ config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS
 config BUSYBOX_FEATURE_TAR_LONG_OPTIONS
 	bool "Enable long options"
 	default n
-	depends on BUSYBOX_TAR && BUSYBOX_GETOPT_LONG
+	depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS
 	help
 	  Enable use of long options, increases size by about 400 Bytes
 
@@ -293,7 +317,7 @@ config BUSYBOX_FEATURE_LZMA_FAST
 
 config BUSYBOX_UNZIP
 	bool "unzip"
-	default y
+	default n
 	help
 	  unzip will list or extract files from a ZIP archive,
 	  commonly found on DOS/WIN systems. The default behavior