volume_id: Adopt to new config style.

Config instructions for util-linux/volume_id are moved into the
source files according to the new config feature.

No code change.

Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

util-linux/Config.src

@@ -699,250 +699,6 @@ config FEATURE_MTAB_SUPPORT
 	  About the only reason to use this is if you've removed /proc from
 	  your kernel.
 
-config VOLUMEID
-	bool #No description makes it a hidden option
-	default n
-
-menu "Filesystem/Volume identification"
-	depends on VOLUMEID
-
-config FEATURE_VOLUMEID_EXT
-	bool "Ext filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_BTRFS
-	bool "btrfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_REISERFS
-	bool "Reiser filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_FAT
-	bool "fat filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_EXFAT
-	bool "exFAT filesystem"
-	default y
-	depends on 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 FEATURE_VOLUMEID_HFS
-	bool "hfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_JFS
-	bool "jfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_UFS
-###	bool "ufs filesystem"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config FEATURE_VOLUMEID_XFS
-	bool "xfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_NILFS
-	bool "nilfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_NTFS
-	bool "ntfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_ISO9660
-	bool "iso9660 filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_UDF
-	bool "udf filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_LUKS
-	bool "luks filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_LINUXSWAP
-	bool "linux swap filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_LVM
-###	bool "lvm"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config FEATURE_VOLUMEID_CRAMFS
-	bool "cramfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-### config FEATURE_VOLUMEID_HPFS
-###	bool "hpfs filesystem"
-###	default y
-###	depends on VOLUMEID
-###	help
-###	  TODO
-
-config FEATURE_VOLUMEID_ROMFS
-	bool "romfs filesystem"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-config FEATURE_VOLUMEID_SQUASHFS
-	bool "SquashFS filesystem"
-	default y
-	depends on VOLUMEID && 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 FEATURE_VOLUMEID_SYSV
-	bool "sysv filesystem"
-	default y
-	depends on 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 FEATURE_VOLUMEID_OCFS2
-	bool "ocfs2 filesystem"
-	default y
-	depends on 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 FEATURE_VOLUMEID_LINUXRAID
-	bool "linuxraid"
-	default y
-	depends on VOLUMEID
-	help
-	  TODO
-
-endmenu
+source util-linux/volume_id/Config.in
 
 endmenu

util-linux/volume_id/Config.src

@@ -0,0 +1,15 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+config VOLUMEID
+	bool #No description makes it a hidden option
+	default n
+
+menu "Filesystem/Volume identification"
+	depends on VOLUMEID
+
+INSERT
+
+endmenu

util-linux/volume_id/btrfs.c

@@ -21,6 +21,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_BTRFS
+//config:	bool "btrfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define BTRFS_UUID_SIZE 16

util-linux/volume_id/cramfs.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_CRAMFS
+//config:	bool "cramfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct cramfs_super {

util-linux/volume_id/exfat.c

@@ -20,6 +20,17 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
 
+//config:
+//config:config FEATURE_VOLUMEID_EXFAT
+//config:	bool "exFAT filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  exFAT (extended FAT) is a proprietary file system designed especially
+//config:	  for flash drives. It has many features from NTFS, but with less
+//config:	  overhead. exFAT is used on most SDXC cards for consumer electronics.
+//config:
+
 #include "volume_id_internal.h"
 
 #define EXFAT_SB_OFFSET		0

util-linux/volume_id/ext.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
 
+//config:
+//config:config FEATURE_VOLUMEID_EXT
+//config:	bool "Ext filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 #include "bb_e2fs_defs.h"
 

util-linux/volume_id/fat.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
 
+//config:
+//config:config FEATURE_VOLUMEID_FAT
+//config:	bool "fat filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 /* linux/msdos_fs.h says: */

util-linux/volume_id/hfs.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_HFS
+//config:	bool "hfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct hfs_finder_info{

util-linux/volume_id/iso9660.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
 
+//config:
+//config:config FEATURE_VOLUMEID_ISO9660
+//config:	bool "iso9660 filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define ISO_SUPERBLOCK_OFFSET		0x8000

util-linux/volume_id/jfs.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_JFS
+//config:	bool "jfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct jfs_super_block {

util-linux/volume_id/linux_raid.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
 
+//config:
+//config:config FEATURE_VOLUMEID_LINUXRAID
+//config:	bool "linuxraid"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct mdp_super_block {

util-linux/volume_id/linux_swap.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
 
+//config:
+//config:config FEATURE_VOLUMEID_LINUXSWAP
+//config:	bool "linux swap filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct swap_header_v1_2 {

util-linux/volume_id/luks.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
 
+//config:
+//config:config FEATURE_VOLUMEID_LUKS
+//config:	bool "luks filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define LUKS_MAGIC_L             6

util-linux/volume_id/nilfs.c

@@ -21,6 +21,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_NILFS
+//config:	bool "nilfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define NILFS_UUID_SIZE 16

util-linux/volume_id/ntfs.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_NTFS
+//config:	bool "ntfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct ntfs_super_block {

util-linux/volume_id/ocfs2.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
 
+//config:
+//config:config FEATURE_VOLUMEID_OCFS2
+//config:	bool "ocfs2 filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 /* All these values are taken from ocfs2-tools's ocfs2_fs.h */

util-linux/volume_id/reiserfs.c

@@ -21,6 +21,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_REISERFS
+//config:	bool "Reiser filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct reiserfs_super_block {

util-linux/volume_id/romfs.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_ROMFS
+//config:	bool "romfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct romfs_super {

util-linux/volume_id/squashfs.c

@@ -8,6 +8,18 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_SQUASHFS
+//config:	bool "SquashFS filesystem"
+//config:	default y
+//config:	depends on VOLUMEID && FEATURE_BLKID_TYPE
+//config:	help
+//config:	  Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+//config:	  intended for general read-only filesystem use and in constrained block
+//config:	  device/memory systems (e.g. embedded systems) where low overhead is
+//config:	  needed.
+//config:
+
 #include "volume_id_internal.h"
 
 struct squashfs_superblock {

util-linux/volume_id/sysv.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
 
+//config:
+//config:config FEATURE_VOLUMEID_SYSV
+//config:	bool "sysv filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 #define SYSV_NICINOD			100

util-linux/volume_id/udf.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
 
+//config:
+//config:config FEATURE_VOLUMEID_UDF
+//config:	bool "udf filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct volume_descriptor {

util-linux/volume_id/unused_highpoint.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
+//config:###	bool "highpoint raid"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct hpt37x_meta {

util-linux/volume_id/unused_hpfs.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_HPFS
+//config:###	bool "hpfs filesystem"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct hpfs_super {

util-linux/volume_id/unused_isw_raid.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_ISWRAID
+//config:###	bool "intel raid"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct isw_meta {

util-linux/volume_id/unused_lsi_raid.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_LSIRAID
+//config:###	bool "lsi raid"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct lsi_meta {

util-linux/volume_id/unused_lvm.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_LVM
+//config:###	bool "lvm"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct lvm1_super_block {

util-linux/volume_id/unused_mac.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_MAC
+//config:###	bool "mac filesystem"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct mac_driver_desc {

util-linux/volume_id/unused_minix.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_MINIX
+//config:###	bool "minix filesystem"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct minix_super_block {

util-linux/volume_id/unused_msdos.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_MSDOS
+//config:###	bool "msdos filesystem"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct msdos_partition_entry {

util-linux/volume_id/unused_nvidia_raid.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_NVIDIARAID
+//config:###	bool "nvidia raid"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct nvidia_meta {

util-linux/volume_id/unused_promise_raid.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_PROMISERAID
+//config:###	bool "promise raid"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct promise_meta {

util-linux/volume_id/unused_silicon_raid.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_SILICONRAID
+//config:###	bool "silicon raid"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct silicon_meta {

util-linux/volume_id/unused_ufs.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_UFS
+//config:###	bool "ufs filesystem"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct ufs_super_block {

util-linux/volume_id/unused_via_raid.c

@@ -20,6 +20,15 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
 
+//config:
+//config:### config FEATURE_VOLUMEID_VIARAID
+//config:###	bool "via raid"
+//config:###	default y
+//config:###	depends on VOLUMEID
+//config:###	help
+//config:###	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct via_meta {

util-linux/volume_id/xfs.c

@@ -20,6 +20,15 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
 
+//config:
+//config:config FEATURE_VOLUMEID_XFS
+//config:	bool "xfs filesystem"
+//config:	default y
+//config:	depends on VOLUMEID
+//config:	help
+//config:	  TODO
+//config:
+
 #include "volume_id_internal.h"
 
 struct xfs_super_block {