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

15 files changed, 536 insertions, 285 deletions

diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index ffba6e89b..e675ca47a 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -4,7 +4,7 @@ config ADK_COMPILE_BUSYBOX
 	default n
 
 config ADK_PACKAGE_BUSYBOX
-	prompt "busybox................ Core utilities for embedded systems"
+	prompt "busybox.............. core utilities for embedded systems"
 	boolean
 	select ADK_COMPILE_BUSYBOX
 	default y if !ADK_TOOLCHAIN_ONLY
@@ -21,3 +21,173 @@ endmenu
 config ADK_PACKAGE_UDHCPD
 	boolean
 	default BUSYBOX_APP_UDHCPD
+
+# disable busybox applets, when full programs are choosen
+config BUSYBOX_DISABLE_MOUNT
+	boolean
+	default y if ADK_PACKAGE_MOUNT
+	depends on ADK_PACKAGE_MOUNT
+	default n
+
+config BUSYBOX_DISABLE_UMOUNT
+	boolean
+	default y if ADK_PACKAGE_MOUNT
+	depends on ADK_PACKAGE_MOUNT
+	default n
+
+config BUSYBOX_DISABLE_TAR
+	boolean
+	default y if ADK_PACKAGE_TAR
+	depends on ADK_PACKAGE_TAR
+	default n
+
+config BUSYBOX_DISABLE_RPM
+	boolean
+	default y if ADK_PACKAGE_RPM
+	depends on ADK_PACKAGE_RPM
+	default n
+
+config BUSYBOX_DISABLE_BZIP2
+	boolean
+	default y if ADK_PACKAGE_BZIP2
+	depends on ADK_PACKAGE_BZIP2
+	default n
+
+config BUSYBOX_DISABLE_IP
+	boolean
+	default y if ADK_PACKAGE_IP
+	depends on ADK_PACKAGE_IP
+	default n
+
+config BUSYBOX_DISABLE_PATCH
+	boolean
+	default y if ADK_PACKAGE_PATCH
+	depends on ADK_PACKAGE_PATCH
+	default n
+
+config BUSYBOX_DISABLE_DIFF
+	boolean
+	default y if ADK_PACKAGE_DIFFUTILS
+	depends on ADK_PACKAGE_DIFFUTILS
+	default n
+
+config BUSYBOX_DISABLE_ED
+	boolean
+	default y if ADK_PACKAGE_ED
+	depends on ADK_PACKAGE_ED
+	default n
+
+config BUSYBOX_DISABLE_SED
+	boolean
+	default y if ADK_PACKAGE_SED
+	depends on ADK_PACKAGE_SED
+	default n
+
+config BUSYBOX_DISABLE_LESS
+	boolean
+	default y if ADK_PACKAGE_LESS
+	depends on ADK_PACKAGE_LESS
+	default n
+
+config BUSYBOX_DISABLE_HDPARM
+	boolean
+	default y if ADK_PACKAGE_HDPARM
+	depends on ADK_PACKAGE_HDPARM
+	default n
+
+config BUSYBOX_DISABLE_WATCHDOG
+	boolean
+	default y if ADK_PACKAGE_WATCHDOG
+	depends on ADK_PACKAGE_WATCHDOG
+	default n
+
+config BUSYBOX_DISABLE_PAM
+	boolean
+	default y if ADK_PACKAGE_PAM
+	depends on ADK_PACKAGE_PAM
+	default n
+
+config BUSYBOX_DISABLE_BRCTL
+	boolean
+	default y if ADK_PACKAGE_BRIDGE_UTILS
+	depends on ADK_PACKAGE_BRIDGE_UTILS
+	default n
+
+config BUSYBOX_DISABLE_ETHER_WAKE
+	boolean
+	default y if ADK_PACKAGE_ETHER_WAKE
+	depends on ADK_PACKAGE_ETHER_WAKE
+	default n
+
+config BUSYBOX_DISABLE_NTPD
+	boolean
+	default y if ADK_PACKAGE_OPENNTPD
+	depends on ADK_PACKAGE_OPENNTPD
+	default n
+
+config BUSYBOX_DISABLE_WGET
+	boolean
+	default y if ADK_PACKAGE_WGET
+	depends on ADK_PACKAGE_WGET
+	default n
+
+config BUSYBOX_DISABLE_AR
+	boolean
+	default y if ADK_PACKAGE_BINUTILS
+	depends on ADK_PACKAGE_BINUTILS
+	default n
+
+config BUSYBOX_DISABLE_CPIO
+	boolean
+	default y if ADK_PACKAGE_CPIO
+	depends on ADK_PACKAGE_CPIO
+	default n
+
+config BUSYBOX_DISABLE_XZ
+	boolean
+	default y if ADK_PACKAGE_XZ
+	depends on ADK_PACKAGE_XZ
+	default n
+
+config BUSYBOX_DISABLE_UNXZ
+	boolean
+	default y if ADK_PACKAGE_XZ
+	depends on ADK_PACKAGE_XZ
+	default n
+
+config BUSYBOX_DISABLE_UNZIP
+	boolean
+	default y if ADK_PACKAGE_UNZIP
+	depends on ADK_PACKAGE_UNZIP
+	default n
+
+config BUSYBOX_DISABLE_FBSET
+	boolean
+	default y if ADK_PACKAGE_FBSET
+	depends on ADK_PACKAGE_FBSET
+	default n
+
+config BUSYBOX_DISABLE_LSPCI
+	boolean
+	default y if ADK_PACKAGE_PCIUTILS
+	depends on ADK_PACKAGE_PCIUTILS
+	default n
+
+config BUSYBOX_DISABLE_LSUSB
+	boolean
+	default y if ADK_PACKAGE_LSUSB
+	depends on ADK_PACKAGE_LSUSB
+	default n
+
+config BUSYBOX_DISABLE_GREP
+	boolean
+	default y if ADK_PACKAGE_GREP
+	depends on ADK_PACKAGE_GREP
+	default n
+
+config BUSYBOX_DISABLE_FIND
+	boolean
+	default y if ADK_PACKAGE_FINDUTILS
+	depends on ADK_PACKAGE_FINDUTILS
+	default n
+
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 4a8e8ea68..7941fff37 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.20.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		e025414bc6cd79579cc7a32a45d3ae1c
-PKG_DESCR:=		Core utilities for embedded systems
+PKG_VERSION:=		1.21.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
+PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/
@@ -20,7 +20,7 @@ PKGSC_UDHCPD:=		net
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BUSYBOX,busybox,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD}))
 
 # This is how to extract the Config.in files from a _built_ busybox source tree:
@@ -43,17 +43,17 @@ else
 BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
 endif
 
-# XXX: Although this looks like all new symbols are enabled when 'make oldconfig' runs, they're not.
-#      In fact, you can pipe "yes ''" as well as "yes n", each time leading to the default value being
-#      chosen for each unknown symbol.
-#      A real solution for that task (disabling everything that's unknown, as we know better) is to
-#      upgrade ${TOPDIR}/config so it understands the oldnoconfig target, and using that to update
-#      the busybox config before compiling.
-#      The workaround for now is to patch all busybox symbols to default n inside the busybox source
-#      which do depend on non-existance of other packages outside the busybox source.
 do-configure:
+	# get all symbols from top level config
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${WRKBUILD}/.config
+	# remove all disabled symbols
+	for i in $$(grep "BUSYBOX_DISABLE" $(TOPDIR)/.config);do \
+		test -s "$$i" || continue; \
+		grep -v $${i#BUSYBOX_DISABLE} ${WRKBUILD}/.config > \
+		${WRKBUILD}/.config.tmp; \
+		cp ${WRKBUILD}/.config.tmp ${WRKBUILD}/.config; \
+	done
 	$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
 	yes '' | $(MAKE) ${BB_MAKE_FLAGS} oldconfig $(MAKE_TRACE)
 
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index eaa576bff..e13da8c0e 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -39,7 +39,7 @@ config BUSYBOX_FEATURE_SEAMLESS_Z
 
 config BUSYBOX_AR
 	bool "ar"
-	depends on !ADK_PACKAGE_BINUTILS
+	depends on !BUSYBOX_DISABLE_AR
 	default n  # needs to be improved to be able to replace binutils ar
 	help
 	  ar is an archival utility program used to create, modify, and
@@ -80,7 +80,7 @@ config BUSYBOX_FEATURE_AR_CREATE
 
 config BUSYBOX_BUNZIP2
 	bool "bunzip2"
-	depends on !ADK_PACKAGE_BZIP2
+	depends on !BUSYBOX_DISABLE_BZIP2
 	default n
 	help
 	  bunzip2 is a compression utility using the Burrows-Wheeler block
@@ -94,7 +94,7 @@ config BUSYBOX_BUNZIP2
 
 config BUSYBOX_BZIP2
 	bool "bzip2"
-	depends on !ADK_PACKAGE_BZIP2
+	depends on !BUSYBOX_DISABLE_BZIP2
 	default n
 	help
 	  bzip2 is a compression utility using the Burrows-Wheeler block
@@ -108,7 +108,7 @@ config BUSYBOX_BZIP2
 
 config BUSYBOX_CPIO
 	bool "cpio"
-	depends on !ADK_PACKAGE_CPIO
+	depends on !BUSYBOX_DISABLE_CPIO
 	default n
 	help
 	  cpio is an archival utility program used to create, modify, and
@@ -220,28 +220,27 @@ config BUSYBOX_LZOP_COMPR_HIGH
 
 config BUSYBOX_IPKG
 	bool "ipkg"
-	default y if ADK_TARGET_PACKAGE_IPKG
 	default n
 	help
 	  ipkg is the itsy package management system.
 
 config BUSYBOX_RPM2CPIO
 	bool "rpm2cpio"
-	depends on !ADK_PACKAGE_RPM
+	depends on !BUSYBOX_DISABLE_RPM
 	default n
 	help
 	  Converts a RPM file into a CPIO archive.
 
 config BUSYBOX_RPM
 	bool "rpm"
-	depends on !ADK_PACKAGE_RPM
+	depends on !BUSYBOX_DISABLE_RPM
 	default n
 	help
 	  Mini RPM applet - queries and extracts RPM packages.
 
 config BUSYBOX_TAR
 	bool "tar"
-	depends on !ADK_PACKAGE_TAR
+	depends on !BUSYBOX_DISABLE_TAR
 	default y
 	help
 	  tar is an archiving program. It's commonly used with gzip to
@@ -377,14 +376,14 @@ config BUSYBOX_LZMA
 
 config BUSYBOX_UNXZ
 	bool "unxz"
-	depends on !ADK_PACKAGE_XZ
+	depends on !BUSYBOX_DISABLE_UNXZ
 	default n
 	help
 	  unxz is a unlzma successor.
 
 config BUSYBOX_XZ
 	bool "Provide xz alias which supports only unpacking"
-	depends on !ADK_PACKAGE_XZ
+	depends on !BUSYBOX_DISABLE_XZ
 	default n
 	depends on BUSYBOX_UNXZ
 	help
@@ -393,6 +392,7 @@ config BUSYBOX_XZ
 
 config BUSYBOX_UNZIP
 	bool "unzip"
+	depends on !BUSYBOX_DISABLE_UNZIP
 	default n
 	help
 	  unzip will list or extract files from a ZIP archive,
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 6393c1c14..8c1eeb317 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -13,12 +13,14 @@ config BUSYBOX_BASENAME
 	  basename is used to strip the directory and suffix from filenames,
 	  leaving just the filename itself. Enable this option if you wish
 	  to enable the 'basename' utility.
+
 config BUSYBOX_CAT
 	bool "cat"
 	default y
 	help
 	  cat is used to concatenate files and print them to the standard
 	  output. Enable this option if you wish to enable the 'cat' utility.
+
 config BUSYBOX_DATE
 	bool "date"
 	default y
@@ -651,6 +653,12 @@ config BUSYBOX_SHA512SUM
 	help
 	  Compute and check SHA512 message digest
 
+config BUSYBOX_SHA3SUM
+       bool "sha3sum"
+       default y
+       help
+         Compute and check SHA3 (512-bit) message digest
+
 config BUSYBOX_SLEEP
 	bool "sleep"
 	default y
@@ -903,13 +911,13 @@ config BUSYBOX_FEATURE_HUMAN_READABLE
 	help
 	  Allow df, du, and ls to have human readable output.
 
-comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
-	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
+	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
 
 config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
 	bool "Enable -c, -s and -w options"
 	default y
-	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
 	help
 	  Enabling the -c options allows files to be checked
 	  against pre-calculated hash values.
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index f6e29ac34..cb16bbe34 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -8,10 +8,11 @@ menu "Editors"
 
 config BUSYBOX_PATCH
 	bool "patch"
-	depends on !ADK_PACKAGE_PATCH
+	depends on !BUSYBOX_DISABLE_PATCH
 	default n
 	help
 	  Apply a unified diff formatted patch.
+
 config BUSYBOX_VI
 	bool "vi"
 	default y
@@ -128,14 +129,6 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
 
 	  This is not clean but helps a lot on serial lines and such.
 
-config BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR
-	bool "Optimize cursor movement"
-	default y
-	depends on BUSYBOX_VI
-	help
-	  This will make the cursor movement faster, but requires more memory
-	  and it makes the applet a tiny bit larger.
-
 config BUSYBOX_AWK
 	bool "awk"
 	default y
@@ -160,8 +153,8 @@ config BUSYBOX_CMP
 
 config BUSYBOX_DIFF
 	bool "diff"
-	depends on !ADK_PACKAGE_DIFFUTILS
-	default n
+	depends on !BUSYBOX_DISABLE_DIFF
+	default y
 	help
 	  diff compares two files or directories and outputs the
 	  differences between them in a form that can be given to
@@ -184,6 +177,7 @@ config BUSYBOX_FEATURE_DIFF_DIR
 
 config BUSYBOX_ED
 	bool "ed"
+	depends on !BUSYBOX_DISABLE_ED
 	default y
 	help
 	  The original 1970's Unix text editor, from the days of teletypes.
@@ -192,7 +186,7 @@ config BUSYBOX_ED
 
 config BUSYBOX_SED
 	bool "sed"
-	depends on !ADK_PACKAGE_SED
+	depends on !BUSYBOX_DISABLE_SED
 	default y
 	help
 	  sed is used to perform text transformations on a file
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 072f01bfc..25d925288 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -8,7 +8,7 @@ menu "Finding Utilities"
 
 config BUSYBOX_FIND
 	bool "find"
-	depends on !ADK_PACKAGE_FINDUTILS
+	depends on !BUSYBOX_DISABLE_FIND
 	default y
 	help
 	  find is used to search your system to find specified files.
@@ -187,9 +187,10 @@ config BUSYBOX_FEATURE_FIND_LINKS
 	depends on BUSYBOX_FIND
 	help
 	  Support the 'find -links' option for matching number of links.
+
 config BUSYBOX_GREP
 	bool "grep"
-	depends on !ADK_PACKAGE_GREP
+	depends on !BUSYBOX_DISABLE_GREP
 	default y
 	help
 	  grep is used to search files for a specified pattern.
diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in
index ff06540cc..9205677e2 100644
--- a/package/busybox/config/libbb/Config.in
+++ b/package/busybox/config/libbb/Config.in
@@ -14,6 +14,7 @@ config BUSYBOX_FEATURE_SYSTEMD
 	  are controlled by systemd, enable this option.
 	  If you don't use systemd, it is still safe to enable it,
 	  but the downside is increased code size.
+
 config BUSYBOX_FEATURE_RTMINMAX
 	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 	default y
@@ -42,6 +43,16 @@ config BUSYBOX_MD5_SMALL
 	  2                   3.0                5088
 	  3 (smallest)        5.1                4912
 
+config BUSYBOX_SHA3_SMALL
+       int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
+       default 1
+       range 0 1
+       help
+         Trade binary size versus speed for the sha3sum algorithm.
+         SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+         64-bit x86: +270 bytes of code, 45% faster
+         32-bit x86: +450 bytes of code, 75% faster
+
 config BUSYBOX_FEATURE_FAST_TOP
 	bool "Faster /proc scanning code (+100 bytes)"
 	default y
diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index 1c36631f9..5538f0139 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -229,7 +229,7 @@ config BUSYBOX_LOGIN_SESSION_AS_CHILD
 
 config BUSYBOX_PAM
 	bool "Support for PAM (Pluggable Authentication Modules)"
-	depends on !ADK_PACKAGE_PAM
+	depends on !BUSYBOX_DISABLE_PAM
 	default n
 	depends on BUSYBOX_LOGIN
 	help
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 2e8404f0f..0a837cb64 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -15,9 +15,10 @@ config BUSYBOX_CONSPY
 	  example:  conspy NUM      shared access to console num
 	  or        conspy -nd NUM  screenshot of console num
 	  or        conspy -cs NUM  poor man's GNU screen like
+
 config BUSYBOX_LESS
 	bool "less"
-	depends on !ADK_PACKAGE_LESS
+	depends on !BUSYBOX_DISABLE_LESS
 	default y
 	help
 	  'less' is a pager, meaning that it displays text files. It possesses
@@ -508,7 +509,7 @@ endchoice
 config BUSYBOX_HDPARM
 	bool "hdparm"
 	default n
-	depends on !ADK_PACKAGE_HDPARM
+	depends on !BUSYBOX_DISABLE_HDPARM
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Get/Set hard drive parameters. Primarily intended for ATA
@@ -747,7 +748,7 @@ config BUSYBOX_WALL
 config BUSYBOX_WATCHDOG
 	bool "watchdog"
 	default n
-	depends on !ADK_PACKAGE_WATCHDOG
+	depends on !BUSYBOX_DISABLE_WATCHDOG
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The watchdog utility is used with hardware or software watchdog
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index fcd6c33ea..74069af13 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -157,7 +157,7 @@ config BUSYBOX_ARPING
 
 config BUSYBOX_BRCTL
 	bool "brctl"
-	depends on !ADK_PACKAGE_BRIDGE_UTILS
+	depends on !BUSYBOX_DISABLE_BRCTL
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -191,7 +191,7 @@ config BUSYBOX_DNSD
 
 config BUSYBOX_ETHER_WAKE
 	bool "ether-wake"
-	depends on !ADK_PACKAGE_ETHER_WAKE
+	depends on !BUSYBOX_DISABLE_ETHER_WAKE
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -601,7 +601,7 @@ config BUSYBOX_FEATURE_INETD_RPC
 
 config BUSYBOX_IP
 	bool "ip"
-	depends on !ADK_PACKAGE_IP
+	depends on !BUSYBOX_DISABLE_IP
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -747,7 +747,7 @@ config BUSYBOX_NSLOOKUP
 
 config BUSYBOX_NTPD
 	bool "ntpd"
-	depends on !ADK_PACKAGE_OPENNTPD
+	depends on !BUSYBOX_DISABLE_NTPD
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -1040,7 +1040,7 @@ config BUSYBOX_VCONFIG
 
 config BUSYBOX_WGET
 	bool "wget"
-	depends on !ADK_PACKAGE_WGET
+	depends on !BUSYBOX_DISABLE_WGET
 	default y
 	help
 	  wget is a utility for non-interactive download of files from HTTP,
diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in
index 66d18a0f9..b63391bb3 100644
--- a/package/busybox/config/procps/Config.in
+++ b/package/busybox/config/procps/Config.in
@@ -11,48 +11,57 @@ config BUSYBOX_IOSTAT
 	default y
 	help
 	  Report CPU and I/O statistics
+
 config BUSYBOX_LSOF
 	bool "lsof"
 	default y
 	help
 	  Show open files in the format of:
 	  PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+
 config BUSYBOX_MPSTAT
 	bool "mpstat"
 	default n
 	help
 	  Per-processor statistics
+
 config BUSYBOX_NMETER
 	bool "nmeter"
 	default n
 	help
 	  Prints selected system stats continuously, one line per update.
+
 config BUSYBOX_PMAP
        bool "pmap"
        default y
        help
          Display processes' memory mappings.
+
 config BUSYBOX_POWERTOP
 	bool "powertop"
 	default n
 	help
 	  Analyze power consumption on Intel-based laptops
+
 config BUSYBOX_PSTREE
 	bool "pstree"
 	default y
 	help
 	  Display a tree of processes.
+
 config BUSYBOX_PWDX
 	bool "pwdx"
 	default n
 	help
 	  Report current working directory of a process
+
 config BUSYBOX_SMEMCAP
 	bool "smemcap"
 	default n
 	help
 	  smemcap is a tool for capturing process data for smem,
 	  a memory usage statistic tool.
+
 config BUSYBOX_UPTIME
 	bool "uptime"
 	default y
diff --git a/package/busybox/config/sysklogd/Config.in b/package/busybox/config/sysklogd/Config.in
index 8d999c8e9..6df10efde 100644
--- a/package/busybox/config/sysklogd/Config.in
+++ b/package/busybox/config/sysklogd/Config.in
@@ -92,6 +92,19 @@ config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE
 	  This option sets the size of the circular buffer
 	  used to record system log messages.
 
+config BUSYBOX_FEATURE_KMSG_SYSLOG
+       bool "Linux kernel printk buffer support"
+       default n
+       depends on BUSYBOX_SYSLOGD
+       select BUSYBOX_PLATFORM_LINUX
+       help
+         When you enable this feature, the syslogd utility will
+         write system log message to the Linux kernel's printk buffer.
+         This can be used as a smaller alternative to the syslogd IPC
+         support, as klogd and logread aren't needed.
+
+         NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+
 config BUSYBOX_LOGREAD
 	bool "logread"
 	default y
@@ -123,6 +136,9 @@ config BUSYBOX_KLOGD
 	  you wish to record the messages produced by the kernel,
 	  you should enable this option.
 
+comment "klogd should not be used together with syslog to kernel printk buffer"
+       depends on BUSYBOX_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG
+
 config BUSYBOX_FEATURE_KLOGD_KLOGCTL
 	bool "Use the klogctl() interface"
 	default y
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index e9ee30431..baf6beb26 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -11,6 +11,7 @@ config BUSYBOX_BLOCKDEV
 	default n
 	help
 	  Performs some ioctls with block devices.
+
 config BUSYBOX_MDEV
 	bool "mdev"
 	default y
@@ -150,7 +151,7 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
 
 config BUSYBOX_FBSET
 	bool "fbset"
-	depends on !ADK_PACKAGE_FBSET
+	depends on !BUSYBOX_DISABLE_FBSET
 	default y if ADK_TARGET_WITH_VGA
 	default n
 	select BUSYBOX_PLATFORM_LINUX
@@ -450,7 +451,7 @@ config BUSYBOX_LOSETUP
 
 config BUSYBOX_LSPCI
 	bool "lspci"
-	depends on !ADK_PACKAGE_PCIUTILS
+	depends on !BUSYBOX_DISABLE_LSPCI
 	default y if ADK_TARGET_WITH_PCI
 	default y if ADK_TARGET_WITH_MINIPCI
 	default n
@@ -463,7 +464,7 @@ config BUSYBOX_LSPCI
 
 config BUSYBOX_LSUSB
 	bool "lsusb"
-	depends on !ADK_PACKAGE_LSUSB
+	depends on !BUSYBOX_DISABLE_LSUSB
 	default y if ADK_TARGET_WITH_USB
 	default n
 	#select PLATFORM_LINUX
@@ -506,6 +507,7 @@ config BUSYBOX_MORE
 config BUSYBOX_MOUNT
 	bool "mount"
 	default y
+	depends on !BUSYBOX_DISABLE_MOUNT
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  All files and filesystems in Unix are arranged into one big directory
@@ -698,6 +700,7 @@ config BUSYBOX_SWITCH_ROOT
 config BUSYBOX_UMOUNT
 	bool "umount"
 	default y
+	depends on !BUSYBOX_DISABLE_UMOUNT
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  When you want to remove a mounted filesystem from its current mount
@@ -803,6 +806,15 @@ config BUSYBOX_FEATURE_VOLUMEID_FAT
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_EXFAT
+       bool "exFAT filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID
+       help
+         exFAT (extended FAT) is a proprietary file system designed especially
+         for flash drives. It has many features from NTFS, but with less
+         overhead. exFAT is used on most SDXC cards for consumer electronics.
+
 config BUSYBOX_FEATURE_VOLUMEID_HFS
 	bool "hfs filesystem"
 	default y
@@ -810,6 +822,13 @@ config BUSYBOX_FEATURE_VOLUMEID_HFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_NILFS
+       bool "nilfs filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID
+       help
+         TODO
+
 config BUSYBOX_FEATURE_VOLUMEID_JFS
 	bool "jfs filesystem"
 	default y
@@ -894,6 +913,16 @@ config BUSYBOX_FEATURE_VOLUMEID_ROMFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS
+       bool "SquashFS filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID && BUSYBOX_FEATURE_BLKID_TYPE
+       help
+         Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+         intended for general read-only filesystem use and in constrained block
+         device/memory systems (e.g. embedded systems) where low overhead is
+         needed.
+
 config BUSYBOX_FEATURE_VOLUMEID_SYSV
 	bool "sysv filesystem"
 	default y
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 28ced4519..07d31b802 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,6 @@
-diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src
---- busybox-1.20.2.orig//archival/Config.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/Config.src	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src
+--- busybox-1.21.1.orig/archival/Config.src	2013-05-12 01:30:43.000000000 +0200
++++ busybox-1.21.1/archival/Config.src	2013-11-02 15:26:12.000000000 +0100
 @@ -214,6 +214,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -14,9 +14,9 @@ diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Confi
  config RPM2CPIO
  	bool "rpm2cpio"
  	default y
-diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c
---- busybox-1.20.2.orig//archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/ipkg.c	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
+--- busybox-1.21.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/ipkg.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -46,9 +46,9 @@ diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuild.src
---- busybox-1.20.2.orig//archival/Kbuild.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/Kbuild.src	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src
+--- busybox-1.21.1.orig/archival/Kbuild.src	2013-05-12 01:30:43.000000000 +0200
++++ busybox-1.21.1/archival/Kbuild.src	2013-11-02 15:26:12.000000000 +0100
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -57,9 +57,9 @@ diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuil
  
  lib-$(CONFIG_UNXZ)		+= bbunzip.o
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
-diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/archival/libarchive/Kbuild.src
---- busybox-1.20.2.orig//archival/libarchive/Kbuild.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/libarchive/Kbuild.src	2013-01-31 16:44:50.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src
+--- busybox-1.21.1.orig/archival/libarchive/Kbuild.src	2013-06-29 16:58:06.000000000 +0200
++++ busybox-1.21.1/archival/libarchive/Kbuild.src	2013-11-02 15:26:12.000000000 +0100
 @@ -25,14 +25,14 @@
  \
  	data_align.o \
@@ -77,9 +77,9 @@ diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/arc
  	get_header_tar_bz2.o \
  	get_header_tar_lzma.o \
  
-diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/libipkg/args.c
---- busybox-1.20.2.orig//archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/args.c	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c
+--- busybox-1.21.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/args.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -323,9 +323,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/l
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/libipkg/args.h
---- busybox-1.20.2.orig//archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/args.h	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h
+--- busybox-1.21.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/args.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -399,9 +399,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/l
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archival/libipkg/conffile.c
---- busybox-1.20.2.orig//archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/conffile.c	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c
+--- busybox-1.21.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -468,9 +468,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archiv
 +
 +    return ret;
 +}
-diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archival/libipkg/conffile.h
---- busybox-1.20.2.orig//archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/conffile.h	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h
+--- busybox-1.21.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -502,9 +502,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archiv
 +
 +#endif
 +
-diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/archival/libipkg/conffile_list.c
---- busybox-1.20.2.orig//archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/conffile_list.c	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c
+--- busybox-1.21.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival