busybox: version bump 1.21.0 -> 1.22.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 474 insertions, 408 deletions

diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index 8cf459da7..2fb1dac8c 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -161,12 +161,13 @@ config BUSYBOX_UNICODE_USING_LOCALE
 	  Internal implementation is smaller.
 
 config BUSYBOX_FEATURE_CHECK_UNICODE_IN_ENV
-	bool "Check $LANG environment variable"
+	bool "Check $LC_ALL, $LC_CTYPE and $LANG environment variables"
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT && !BUSYBOX_UNICODE_USING_LOCALE
 	help
 	  With this option on, Unicode support is activated
-	  only if LANG variable has the value of the form "xxxx.utf8"
+	  only if locale-related variables have the value of the form
+	  "xxxx.utf8"
 
 	  Otherwise, Unicode support will be always enabled and active.
 
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index d1435d6e7..ca43f0e35 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -6,7 +6,6 @@
 
 menu "Archival Utilities"
 
-
 config BUSYBOX_FEATURE_SEAMLESS_XZ
 	bool "Make tar, rpm, modprobe etc understand .xz data"
 	default y
@@ -76,7 +75,19 @@ config BUSYBOX_FEATURE_AR_CREATE
 	depends on BUSYBOX_AR
 	help
 	  This enables archive creation (-c and -r) with busybox ar.
-
+config BUSYBOX_UNCOMPRESS
+	bool "uncompress"
+	default n
+	help
+	  uncompress is used to decompress archives created by compress.
+	  Not much used anymore, replaced by gzip/gunzip.
+config BUSYBOX_GUNZIP
+	bool "gunzip"
+	default y
+	help
+	  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_BUNZIP2
 	bool "bunzip2"
 	default y
@@ -89,7 +100,46 @@ config BUSYBOX_BUNZIP2
 
 	  Unless you have a specific application which requires bunzip2, you
 	  should probably say N here.
+config BUSYBOX_UNLZMA
+	bool "unlzma"
+	default y
+	help
+	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
+	  compression algorithm, and range coding. Compression
+	  is generally considerably better than that achieved by the bzip2
+	  compressors.
+
+	  The BusyBox unlzma applet is limited to decompression only.
+	  On an x86 system, this applet adds about 4K.
 
+config BUSYBOX_FEATURE_LZMA_FAST
+	bool "Optimize unlzma for speed"
+	default n
+	depends on BUSYBOX_UNLZMA
+	help
+	  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 y
+	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"
+	default y
+	help
+	  unxz is a unlzma successor.
+
+config BUSYBOX_XZ
+	bool "Provide xz alias which supports only unpacking"
+	default y
+	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_BZIP2
 	bool "bzip2"
 	default y
@@ -102,7 +152,6 @@ config BUSYBOX_BZIP2
 
 	  Unless you have a specific application which requires bzip2, you
 	  should probably say N here.
-
 config BUSYBOX_CPIO
 	bool "cpio"
 	default y
@@ -131,7 +180,6 @@ config BUSYBOX_FEATURE_CPIO_P
 	depends on BUSYBOX_FEATURE_CPIO_O
 	help
 	  Passthrough mode. Rarely used.
-
 config BUSYBOX_DPKG
 	bool "dpkg"
 	default n
@@ -142,7 +190,6 @@ config BUSYBOX_DPKG
 
 	  This implementation of dpkg has a number of limitations,
 	  you should use the official dpkg if possible.
-
 config BUSYBOX_DPKG_DEB
 	bool "dpkg_deb"
 	default n
@@ -164,15 +211,6 @@ config BUSYBOX_FEATURE_DPKG_DEB_EXTRACT_ONLY
 	  "ar -p <deb> data.tar.gz | tar -zx". However it saves space as none
 	  of the extra dpkg-deb, ar or tar options are needed, they are linked
 	  to internally.
-
-config BUSYBOX_GUNZIP
-	bool "gunzip"
-	default y
-	help
-	  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_GZIP
 	bool "gzip"
 	default y
@@ -198,7 +236,6 @@ config BUSYBOX_GZIP_FAST
 	  1: larger buffers, larger hash-tables
 	  2: larger buffers, largest hash-tables
 	  Larger models may give slightly better compression
-
 config BUSYBOX_LZOP
 	bool "lzop"
 	default y
@@ -213,19 +250,16 @@ config BUSYBOX_LZOP_COMPR_HIGH
 	  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_RPM2CPIO
-	bool "rpm2cpio"
-	default y
-	help
-	  Converts a RPM file into a CPIO archive.
-
 config BUSYBOX_RPM
 	bool "rpm"
 	default y
 	help
 	  Mini RPM applet - queries and extracts RPM packages.
-
+config BUSYBOX_RPM2CPIO
+	bool "rpm2cpio"
+	default y
+	help
+	  Converts a RPM file into a CPIO archive.
 config BUSYBOX_TAR
 	bool "tar"
 	default y
@@ -325,56 +359,6 @@ config BUSYBOX_FEATURE_TAR_SELINUX
 	help
 	  With this option busybox supports restoring SELinux labels
 	  when extracting files from tar archives.
-
-config BUSYBOX_UNCOMPRESS
-	bool "uncompress"
-	default n
-	help
-	  uncompress is used to decompress archives created by compress.
-	  Not much used anymore, replaced by gzip/gunzip.
-
-config BUSYBOX_UNLZMA
-	bool "unlzma"
-	default y
-	help
-	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
-	  compression algorithm, and range coding. Compression
-	  is generally considerably better than that achieved by the bzip2
-	  compressors.
-
-	  The BusyBox unlzma applet is limited to decompression only.
-	  On an x86 system, this applet adds about 4K.
-
-config BUSYBOX_FEATURE_LZMA_FAST
-	bool "Optimize unlzma for speed"
-	default n
-	depends on BUSYBOX_UNLZMA
-	help
-	  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 y
-	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"
-	default y
-	help
-	  unxz is a unlzma successor.
-
-config BUSYBOX_XZ
-	bool "Provide xz alias which supports only unpacking"
-	default y
-	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 y
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 36e51e043..b05b80893 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -95,6 +95,14 @@ config BUSYBOX_TOUCH
 	  touch is used to create or change the access and/or
 	  modification timestamp of specified files.
 
+config BUSYBOX_FEATURE_TOUCH_NODEREF
+	bool "Add support for -h"
+	default y
+	depends on BUSYBOX_TOUCH
+	help
+	  Enable touch to have the -h option.
+	  This requires libc support for lutimes() function.
+
 config BUSYBOX_FEATURE_TOUCH_SUSV3
 	bool "Add support for SUSV3 features (-d -t -r)"
 	default y
diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index a3840d4a2..d9268828e 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -6,11 +6,77 @@
 
 menu "Editors"
 
+config BUSYBOX_AWK
+	bool "awk"
+	default y
+	help
+	  Awk is used as a pattern scanning and processing language. This is
+	  the BusyBox implementation of that programming language.
+
+config BUSYBOX_FEATURE_AWK_LIBM
+	bool "Enable math functions (requires libm)"
+	default y
+	depends on BUSYBOX_AWK
+	help
+	  Enable math functions of the Awk programming language.
+	  NOTE: This will require libm to be present for linking.
+
+config BUSYBOX_FEATURE_AWK_GNU_EXTENSIONS
+	bool "Enable a few GNU extensions"
+	default y
+	depends on BUSYBOX_AWK
+	help
+	  Enable a few features from gawk:
+	  * command line option -e AWK_PROGRAM
+	  * simultaneous use of -f and -e on the command line.
+	    This enables the use of awk library files.
+	    Ex: awk -f mylib.awk -e '{print myfunction($1);}' ...
+config BUSYBOX_CMP
+	bool "cmp"
+	default y
+	help
+	  cmp is used to compare two files and returns the result
+	  to standard output.
+config BUSYBOX_DIFF
+	bool "diff"
+	default y
+	help
+	  diff compares two files or directories and outputs the
+	  differences between them in a form that can be given to
+	  the patch command.
+
+config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS
+	help
+	  Enable use of long options.
+
+config BUSYBOX_FEATURE_DIFF_DIR
+	bool "Enable directory support"
+	default y
+	depends on BUSYBOX_DIFF
+	help
+	  This option enables support for directory and subdirectory
+	  comparison.
+config BUSYBOX_ED
+	bool "ed"
+	default y
+	help
+	  The original 1970's Unix text editor, from the days of teletypes.
+	  Small, simple, evil. Part of SUSv3. If you're not already using
+	  this, you don't need it.
 config BUSYBOX_PATCH
 	bool "patch"
 	default y
 	help
 	  Apply a unified diff formatted patch.
+config BUSYBOX_SED
+	bool "sed"
+	default y
+	help
+	  sed is used to perform text transformations on a file
+	  or input from a pipeline.
 config BUSYBOX_VI
 	bool "vi"
 	default y
@@ -127,66 +193,6 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
 
 	  This is not clean but helps a lot on serial lines and such.
 
-config BUSYBOX_AWK
-	bool "awk"
-	default y
-	help
-	  Awk is used as a pattern scanning and processing language. This is
-	  the BusyBox implementation of that programming language.
-
-config BUSYBOX_FEATURE_AWK_LIBM
-	bool "Enable math functions (requires libm)"
-	default y
-	depends on BUSYBOX_AWK
-	help
-	  Enable math functions of the Awk programming language.
-	  NOTE: This will require libm to be present for linking.
-
-config BUSYBOX_CMP
-	bool "cmp"
-	default y
-	help
-	  cmp is used to compare two files and returns the result
-	  to standard output.
-
-config BUSYBOX_DIFF
-	bool "diff"
-	default y
-	help
-	  diff compares two files or directories and outputs the
-	  differences between them in a form that can be given to
-	  the patch command.
-
-config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS
-	help
-	  Enable use of long options.
-
-config BUSYBOX_FEATURE_DIFF_DIR
-	bool "Enable directory support"
-	default y
-	depends on BUSYBOX_DIFF
-	help
-	  This option enables support for directory and subdirectory
-	  comparison.
-
-config BUSYBOX_ED
-	bool "ed"
-	default y
-	help
-	  The original 1970's Unix text editor, from the days of teletypes.
-	  Small, simple, evil. Part of SUSv3. If you're not already using
-	  this, you don't need it.
-
-config BUSYBOX_SED
-	bool "sed"
-	default y
-	help
-	  sed is used to perform text transformations on a file
-	  or input from a pipeline.
-
 config BUSYBOX_FEATURE_ALLOW_EXEC
 	bool "Allow vi and awk to execute shell commands"
 	default y
diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in
index 12bee0bdb..0f967b71e 100644
--- a/config/busybox/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -103,6 +103,18 @@ config BUSYBOX_NANDDUMP
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Dump the content of raw NAND chip
+config BUSYBOX_RFKILL
+	bool "rfkill"
+	default n # doesn't build on Ubuntu 9.04
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Enable/disable wireless devices.
+
+	  rfkill list : list all wireless devices
+	  rfkill list bluetooth : list all bluetooth devices
+	  rfkill list 1 : list device corresponding to the given index
+	  rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
+
 config BUSYBOX_SETSERIAL
 	bool "setserial"
 	default y
@@ -150,6 +162,12 @@ config BUSYBOX_UBIUPDATEVOL
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Update a UBI volume.
+config BUSYBOX_WALL
+	bool "wall"
+	default y
+	depends on BUSYBOX_FEATURE_UTMP
+	help
+	  Write a message to all users that are logged in.
 
 config BUSYBOX_ADJTIMEX
 	bool "adjtimex"
@@ -647,18 +665,6 @@ config BUSYBOX_READAHEAD
 	  As readahead(2) blocks until each file has been read, it is best to
 	  run this applet as a background job.
 
-config BUSYBOX_RFKILL
-	bool "rfkill"
-	default n  # doesn't build on Ubuntu 9.04
-	select BUSYBOX_PLATFORM_LINUX
-	help
-	  Enable/disable wireless devices.
-
-	  rfkill list : list all wireless devices
-	  rfkill list bluetooth : list all bluetooth devices
-	  rfkill list 1 : list device corresponding to the given index
-	  rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
-
 config BUSYBOX_RUNLEVEL
 	bool "runlevel"
 	default y
@@ -735,13 +741,6 @@ config BUSYBOX_VOLNAME
 	help
 	  Prints a CD-ROM volume name.
 
-config BUSYBOX_WALL
-	bool "wall"
-	default y
-	depends on BUSYBOX_FEATURE_UTMP
-	help
-	  Write a message to all users that are logged in.
-
 config BUSYBOX_WATCHDOG
 	bool "watchdog"
 	default y
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index 7e6cc25fe..3e578664a 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -55,7 +55,7 @@ config BUSYBOX_NC_SERVER
 	  Allow netcat to act as a server.
 
 config BUSYBOX_NC_EXTRA
-	bool "Netcat extensions (-eiw and filename)"
+	bool "Netcat extensions (-eiw and -f FILE)"
 	default y
 	depends on BUSYBOX_NC
 	help
@@ -71,7 +71,7 @@ config BUSYBOX_NC_110_COMPAT
 	  This option makes nc closely follow original nc-1.10.
 	  The code is about 2.5k bigger. It enables
 	  -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
-	  busybox-specific extensions: -f FILE and -ll.
+	  busybox-specific extensions: -f FILE.
 config BUSYBOX_PING
 	bool "ping"
 	default y
@@ -1063,16 +1063,18 @@ config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
 	  Support long options for the wget applet.
 
 config BUSYBOX_FEATURE_WGET_TIMEOUT
-	bool "Enable read timeout option -T SEC"
+	bool "Enable timeout option -T SEC"
 	default y
 	depends on BUSYBOX_WGET
 	help
-	  Supports network read timeout for wget, so that wget will give
-	  up and timeout when reading network data, through the -T command
-	  line option.  Currently only network data read timeout is
-	  supported (i.e., timeout is not applied to the DNS nor TCP
-	  connection initialization).  When FEATURE_WGET_LONG_OPTIONS is
-	  also enabled, the --timeout option will work in addition to -T.
+	  Supports network read and connect timeouts for wget,
+	  so that wget will give up and timeout, through the -T
+	  command line option.
+
+	  Currently only connect and network data read timeout are
+	  supported (i.e., timeout is not applied to the DNS query). When
+	  FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
+	  will work in addition to -T.
 
 config BUSYBOX_ZCIP
 	bool "zcip"
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index 87d7d3c3f..e4b146131 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -11,6 +11,12 @@ config BUSYBOX_BLOCKDEV
 	default y
 	help
 	  Performs some ioctls with block devices.
+config BUSYBOX_FSTRIM
+	bool "fstrim"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Discard unused blocks on a mounted filesystem.
 config BUSYBOX_MDEV
 	bool "mdev"
 	default y
@@ -766,250 +772,6 @@ config BUSYBOX_FEATURE_MTAB_SUPPORT
 	  About the only reason to use this is if you've removed /proc from
 	  your kernel.
 
-config BUSYBOX_VOLUMEID
-	bool #No description makes it a hidden option
-	default n
-
-menu "Filesystem/Volume identification"
-	depends on BUSYBOX_VOLUMEID
-
-config BUSYBOX_FEATURE_VOLUMEID_EXT
-	bool "Ext filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_BTRFS
-	bool "btrfs filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_REISERFS
-	bool "Reiser filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_FAT
-	bool "fat filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	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
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_JFS
-	bool "jfs filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_UFS
-###	bool "ufs filesystem"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_XFS
-	bool "xfs filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_NILFS
-	bool "nilfs filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_NTFS
-	bool "ntfs filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_ISO9660
-	bool "iso9660 filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_UDF
-	bool "udf filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_LUKS
-	bool "luks filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_LINUXSWAP
-	bool "linux swap filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_LVM
-###	bool "lvm"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_CRAMFS
-	bool "cramfs filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_HPFS
-###	bool "hpfs filesystem"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_ROMFS
-	bool "romfs filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	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
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_MINIX
-###	bool "minix filesystem"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-### These only detect partition tables - not used (yet?)
-### config FEATURE_VOLUMEID_MAC
-###	bool "mac filesystem"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-###
-### config FEATURE_VOLUMEID_MSDOS
-###	bool "msdos filesystem"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_OCFS2
-	bool "ocfs2 filesystem"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_HIGHPOINTRAID
-###	bool "highpoint raid"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-### config FEATURE_VOLUMEID_ISWRAID
-###	bool "intel raid"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-### config FEATURE_VOLUMEID_LSIRAID
-###	bool "lsi raid"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-### config FEATURE_VOLUMEID_VIARAID
-###	bool "via raid"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-### config FEATURE_VOLUMEID_SILICONRAID
-###	bool "silicon raid"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-### config FEATURE_VOLUMEID_NVIDIARAID
-###	bool "nvidia raid"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-### config FEATURE_VOLUMEID_PROMISERAID
-###	bool "promise raid"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID
-	bool "linuxraid"
-	default y
-	depends on BUSYBOX_VOLUMEID
-	help
-	  TODO
-
-endmenu
+source "config/busybox/util-linux/volume_id/Config.in"
 
 endmenu
diff --git a/config/busybox/util-linux/volume_id/Config.in b/config/busybox/util-linux/volume_id/Config.in
new file mode 100644
index 000000000..d1deb37e2
--- /dev/null
+++ b/config/busybox/util-linux/volume_id/Config.in
@@ -0,0 +1,304 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+config BUSYBOX_VOLUMEID
+	bool #No description makes it a hidden option
+	default n
+
+menu "Filesystem/Volume identification"
+	depends on BUSYBOX_VOLUMEID
+
+
+config BUSYBOX_FEATURE_VOLUMEID_BTRFS
+	bool "btrfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_CRAMFS
+	bool "cramfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	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_EXT
+	bool "Ext filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_F2FS
+	bool "f2fs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  F2FS (aka Flash-Friendly File System) is a log-structured file system,
+	  which is adapted to newer forms of storage. F2FS also remedies some
+	  known issues of the older log structured file systems, such as high
+	  cleaning overhead.
+
+
+config BUSYBOX_FEATURE_VOLUMEID_FAT
+	bool "fat filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_HFS
+	bool "hfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_ISO9660
+	bool "iso9660 filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_JFS
+	bool "jfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID
+	bool "linuxraid"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_LINUXSWAP
+	bool "linux swap filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_LUKS
+	bool "luks filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_NILFS
+	bool "nilfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  NILFS is a New Implementation of a Log-Structured File System (LFS)
+	  that supports continuous snapshots. This provides features like
+	  versioning of the entire filesystem, restoration of files that
+	  were deleted a few minutes ago. NILFS keeps consistency like
+	  conventional LFS, so it provides quick recovery after system crashes.
+
+	  The possible use of NILFS includes versioning, tamper detection,
+	  SOX compliance logging, and so forth. It can serve as an alternative
+	  filesystem for Linux desktop environment, or as a basis of advanced
+	  storage appliances.
+
+
+config BUSYBOX_FEATURE_VOLUMEID_NTFS
+	bool "ntfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_OCFS2
+	bool "ocfs2 filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_REISERFS
+	bool "Reiser filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_ROMFS
+	bool "romfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	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
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_UDF
+	bool "udf filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+### config FEATURE_VOLUMEID_HIGHPOINTRAID
+###	bool "highpoint raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_HPFS
+###	bool "hpfs filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_ISWRAID
+###	bool "intel raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_LSIRAID
+###	bool "lsi raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_LVM
+###	bool "lvm"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_MAC
+###	bool "mac filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_MINIX
+###	bool "minix filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_MSDOS
+###	bool "msdos filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_NVIDIARAID
+###	bool "nvidia raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_PROMISERAID
+###	bool "promise raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_SILICONRAID
+###	bool "silicon raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_UFS
+###	bool "ufs filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_VIARAID
+###	bool "via raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+config BUSYBOX_FEATURE_VOLUMEID_XFS
+	bool "xfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
+
+endmenu