Merge branch 'master' of git+ssh://openadk.org/git/openadk

4 files changed, 42 insertions, 13 deletions

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 3478eaab5..2aaf7ee9f 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -119,7 +119,7 @@ config BUSYBOX_LOCALE_SUPPORT
 	  Enable this if your system has locale support and you would like
 	  busybox to support locale settings.
 
-config BUSYBOX_FEATURE_ASSUME_UNICODE
+config BUSYBOX_UNICODE_SUPPORT
 	bool "Support Unicode"
 	default n
 	help
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index 104fb861e..4bfba12c3 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -63,6 +63,13 @@ config BUSYBOX_FEATURE_AR_LONG_FILENAMES
 	  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_FEATURE_AR_CREATE
+	bool "Support archive creation"
+	default n
+	depends on BUSYBOX_AR
+	help
+	  This enables archive creation (-c and -r) with busybox ar.
+
 config BUSYBOX_BUNZIP2
 	bool "bunzip2"
 	depends on !ADK_PACKAGE_BZIP2
@@ -93,8 +100,8 @@ config BUSYBOX_BZIP2
 
 config BUSYBOX_CPIO
 	bool "cpio"
-	default n
 	depends on !ADK_PACKAGE_CPIO
+	default n
 	help
 	  cpio is an archival utility program used to create, modify, and
 	  extract contents from archives.
@@ -193,10 +200,8 @@ config BUSYBOX_LZOP_COMPR_HIGH
 
 config BUSYBOX_IPKG
 	bool "ipkg"
+	default y if ADK_TARGET_PACKAGE_IPKG
 	default n
-	select BUSYBOX_MD5SUM
-	depends on BUSYBOX_WGET || ADK_PACKAGE_WGET
-	depends on ADK_TARGET_PACKAGE_IPKG
 	help
 	  ipkg is the itsy package management system.
 
@@ -251,7 +256,7 @@ config BUSYBOX_FEATURE_TAR_FROM
 
 config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 	bool "Support for old tar header format"
-	default N
+	default n
 	depends on BUSYBOX_TAR
 	help
 	  This option is required to unpack archives created in
@@ -260,7 +265,7 @@ config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 
 config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY
 	bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
-	default N
+	default n
 	depends on BUSYBOX_TAR
 	help
 	  This option is required to unpack archives created by some old
@@ -311,6 +316,7 @@ config BUSYBOX_UNCOMPRESS
 
 config BUSYBOX_UNLZMA
 	bool "unlzma"
+	depends on !ADK_PACKAGE_XZ
 	default n
 	help
 	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
@@ -332,6 +338,29 @@ config BUSYBOX_FEATURE_LZMA_FAST
 	  This option reduces decompression time by about 25% at the cost of
 	  a 1K bigger binary.
 
+config BUSYBOX_LZMA
+	bool "Provide lzma alias which supports only unpacking"
+	default n
+	depends on BUSYBOX_UNLZMA
+	help
+	  Enable this option if you want commands like "lzma -d" to work.
+	  IOW: you'll get lzma applet, but it will always require -d option.
+
+config BUSYBOX_UNXZ
+	bool "unxz"
+	depends on !ADK_PACKAGE_XZ
+	default n
+	help
+	  unxz is a unlzma successor.
+
+config BUSYBOX_XZ
+	bool "Provide xz alias which supports only unpacking"
+	default n
+	depends on BUSYBOX_UNXZ
+	help
+	  Enable this option if you want commands like "xz -d" to work.
+	  IOW: you'll get xz applet, but it will always require -d option.
+
 config BUSYBOX_UNZIP
 	bool "unzip"
 	default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 015c2de5c..85d4342e5 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -823,7 +823,7 @@ config BUSYBOX_WHO
 
 config BUSYBOX_WHOAMI
 	bool "whoami"
-	default n
+	default y
 	help
 	  whoami is used to print the username of the current
 	  user id (same as id -un).
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index d755490c7..9049edd92 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -952,8 +952,8 @@ config BUSYBOX_VCONFIG
 
 config BUSYBOX_WGET
 	bool "wget"
-	default y
 	depends on !ADK_PACKAGE_WGET
+	default y
 	help
 	  wget is a utility for non-interactive download of files from HTTP,
 	  HTTPS, and FTP servers.
@@ -961,21 +961,21 @@ config BUSYBOX_WGET
 config BUSYBOX_FEATURE_WGET_STATUSBAR
 	bool "Enable a nifty process meter (+2k)"
 	default y
-	depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
+	depends on BUSYBOX_WGET
 	help
 	  Enable the transfer progress bar for wget transfers.
 
 config BUSYBOX_FEATURE_WGET_AUTHENTICATION
 	bool "Enable HTTP authentication"
 	default y
-	depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
+	depends on BUSYBOX_WGET
 	help
 	  Support authenticated HTTP transfers.
 
 config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
 	bool "Enable long options"
-	default n
-	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS && !ADK_PACKAGE_WGET
+	default y
+	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
 	help
 	  Support long options for the wget applet.