diff options
author | Sven-Göran Bergh | 2013-07-31 15:57:59 +0200 |
---|---|---|
committer | Denys Vlasenko | 2013-07-31 15:57:59 +0200 |
commit | 15d0a860e99307d50165588fa6cbb15cfc405e07 (patch) | |
tree | 1ddcd8c5784473eddef2fe36ee59aa340890ed87 /util-linux/volume_id | |
parent | 3b45801dc6e3484ffb2a86958fce587974842c6b (diff) | |
download | busybox-15d0a860e99307d50165588fa6cbb15cfc405e07.zip busybox-15d0a860e99307d50165588fa6cbb15cfc405e07.tar.gz |
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>
Diffstat (limited to 'util-linux/volume_id')
34 files changed, 317 insertions, 0 deletions
diff --git a/util-linux/volume_id/Config.src b/util-linux/volume_id/Config.src new file mode 100644 index 0000000..ac208c9 --- /dev/null +++ b/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 diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c index 46725da..e4dddf2 100644 --- a/util-linux/volume_id/btrfs.c +++ b/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 diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c index 8dfd611..aeb7f20 100644 --- a/util-linux/volume_id/cramfs.c +++ b/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 { diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c index 01b3500..c3aa368 100644 --- a/util-linux/volume_id/exfat.c +++ b/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 diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c index a1a0808..df39d93 100644 --- a/util-linux/volume_id/ext.c +++ b/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" diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c index 96b2b69..476d500 100644 --- a/util-linux/volume_id/fat.c +++ b/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: */ diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c index 496d350..8d34aaf 100644 --- a/util-linux/volume_id/hfs.c +++ b/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{ diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c index 67ba8fd..3848de4 100644 --- a/util-linux/volume_id/iso9660.c +++ b/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 diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c index 590698d..a6eaff4 100644 --- a/util-linux/volume_id/jfs.c +++ b/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 { diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c index 74fd10b..f20823a 100644 --- a/util-linux/volume_id/linux_raid.c +++ b/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 { diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c index ffb448e..39470d4 100644 --- a/util-linux/volume_id/linux_swap.c +++ b/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 { diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c index 856d42f..42bf876 100644 --- a/util-linux/volume_id/luks.c +++ b/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 diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c index daa0294..934856f 100644 --- a/util-linux/volume_id/nilfs.c +++ b/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 diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c index b8f278b..46f687a 100644 --- a/util-linux/volume_id/ntfs.c +++ b/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 { diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c index 850f60a..415e0bf 100644 --- a/util-linux/volume_id/ocfs2.c +++ b/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 */ diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c index 5dcc037..24979fb 100644 --- a/util-linux/volume_id/reiserfs.c +++ b/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 { diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c index b55ec9b..4754fdb 100644 --- a/util-linux/volume_id/romfs.c +++ b/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 { diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c index c5b4f9c..079b6cc 100644 --- a/util-linux/volume_id/squashfs.c +++ b/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 { diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c index 7cc1d21..7b4b536 100644 --- a/util-linux/volume_id/sysv.c +++ b/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 diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c index ee5bb77..9214545 100644 --- a/util-linux/volume_id/udf.c +++ b/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 { diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c index 990875c..7231a1d 100644 --- a/util-linux/volume_id/unused_highpoint.c +++ b/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 { diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c index 2a7477b..a87c89f 100644 --- a/util-linux/volume_id/unused_hpfs.c +++ b/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 { diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c index 35bc7d1..851bd2f 100644 --- a/util-linux/volume_id/unused_isw_raid.c +++ b/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 { diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c index 6578f98..52d68de 100644 --- a/util-linux/volume_id/unused_lsi_raid.c +++ b/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 { diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c index cb038f4..08fa052 100644 --- a/util-linux/volume_id/unused_lvm.c +++ b/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 { diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c index 5c40532..a1a53d1 100644 --- a/util-linux/volume_id/unused_mac.c +++ b/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 { diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/unused_minix.c index 7dc4175..50afd5c 100644 --- a/util-linux/volume_id/unused_minix.c +++ b/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 { diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c index 3d90827..d2fc66c 100644 --- a/util-linux/volume_id/unused_msdos.c +++ b/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 { diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c index 9518575..d99a108 100644 --- a/util-linux/volume_id/unused_nvidia_raid.c +++ b/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 { diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c index d19a2f7..cebebe3 100644 --- a/util-linux/volume_id/unused_promise_raid.c +++ b/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 { diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c index 65dc63b..40c8faa 100644 --- a/util-linux/volume_id/unused_silicon_raid.c +++ b/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 { diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c index 173acce..d33c10f 100644 --- a/util-linux/volume_id/unused_ufs.c +++ b/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 { diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c index 8ef06f1..258f93a 100644 --- a/util-linux/volume_id/unused_via_raid.c +++ b/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 { diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c index 44d35fb..5eefc20 100644 --- a/util-linux/volume_id/xfs.c +++ b/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 { |