diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-09-18 16:28:43 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-09-18 16:28:43 +0200 |
commit | 0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5 (patch) | |
tree | cfe1328d742da3f0572ac8b2f06aa95259862ac5 /util-linux/volume_id | |
parent | b63afead4411c5832d427ed149683c85cc81a4c9 (diff) | |
download | busybox-w32-0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5.tar.gz busybox-w32-0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5.tar.bz2 busybox-w32-0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5.zip |
regularize format of source file headers, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/volume_id')
35 files changed, 70 insertions, 105 deletions
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c index 334a341c3..085c158db 100644 --- a/util-linux/volume_id/bcache.c +++ b/util-linux/volume_id/bcache.c | |||
@@ -7,14 +7,13 @@ | |||
7 | * Based on code fragments from bcache-tools by Kent Overstreet: | 7 | * Based on code fragments from bcache-tools by Kent Overstreet: |
8 | * http://evilpiepirate.org/git/bcache-tools.git | 8 | * http://evilpiepirate.org/git/bcache-tools.git |
9 | */ | 9 | */ |
10 | |||
11 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o | ||
12 | |||
13 | //config:config FEATURE_VOLUMEID_BCACHE | 10 | //config:config FEATURE_VOLUMEID_BCACHE |
14 | //config: bool "bcache filesystem" | 11 | //config: bool "bcache filesystem" |
15 | //config: default y | 12 | //config: default y |
16 | //config: depends on VOLUMEID | 13 | //config: depends on VOLUMEID |
17 | 14 | ||
15 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o | ||
16 | |||
18 | #include "volume_id_internal.h" | 17 | #include "volume_id_internal.h" |
19 | 18 | ||
20 | #define SB_LABEL_SIZE 32 | 19 | #define SB_LABEL_SIZE 32 |
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c index 338a48762..a3ddf9782 100644 --- a/util-linux/volume_id/btrfs.c +++ b/util-linux/volume_id/btrfs.c | |||
@@ -18,14 +18,13 @@ | |||
18 | * License along with this library; if not, write to the Free Software | 18 | * License along with this library; if not, write to the Free Software |
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
20 | */ | 20 | */ |
21 | |||
22 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o | ||
23 | |||
24 | //config:config FEATURE_VOLUMEID_BTRFS | 21 | //config:config FEATURE_VOLUMEID_BTRFS |
25 | //config: bool "btrfs filesystem" | 22 | //config: bool "btrfs filesystem" |
26 | //config: default y | 23 | //config: default y |
27 | //config: depends on VOLUMEID | 24 | //config: depends on VOLUMEID |
28 | 25 | ||
26 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o | ||
27 | |||
29 | #include "volume_id_internal.h" | 28 | #include "volume_id_internal.h" |
30 | 29 | ||
31 | #define BTRFS_UUID_SIZE 16 | 30 | #define BTRFS_UUID_SIZE 16 |
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c index c63223e2b..3468a5005 100644 --- a/util-linux/volume_id/cramfs.c +++ b/util-linux/volume_id/cramfs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_CRAMFS | 20 | //config:config FEATURE_VOLUMEID_CRAMFS |
24 | //config: bool "cramfs filesystem" | 21 | //config: bool "cramfs filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct cramfs_super { | 29 | struct cramfs_super { |
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c index 14bf9d691..952b027d9 100644 --- a/util-linux/volume_id/exfat.c +++ b/util-linux/volume_id/exfat.c | |||
@@ -17,9 +17,6 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_EXFAT | 20 | //config:config FEATURE_VOLUMEID_EXFAT |
24 | //config: bool "exFAT filesystem" | 21 | //config: bool "exFAT filesystem" |
25 | //config: default y | 22 | //config: default y |
@@ -29,6 +26,8 @@ | |||
29 | //config: for flash drives. It has many features from NTFS, but with less | 26 | //config: for flash drives. It has many features from NTFS, but with less |
30 | //config: overhead. exFAT is used on most SDXC cards for consumer electronics. | 27 | //config: overhead. exFAT is used on most SDXC cards for consumer electronics. |
31 | 28 | ||
29 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o | ||
30 | |||
32 | #include "volume_id_internal.h" | 31 | #include "volume_id_internal.h" |
33 | 32 | ||
34 | #define EXFAT_SB_OFFSET 0 | 33 | #define EXFAT_SB_OFFSET 0 |
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c index 473b3229a..f17faddb6 100644 --- a/util-linux/volume_id/ext.c +++ b/util-linux/volume_id/ext.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_EXT | 20 | //config:config FEATURE_VOLUMEID_EXT |
24 | //config: bool "Ext filesystem" | 21 | //config: bool "Ext filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | #include "bb_e2fs_defs.h" | 28 | #include "bb_e2fs_defs.h" |
30 | 29 | ||
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c index 3027f178e..e6100aec2 100644 --- a/util-linux/volume_id/f2fs.c +++ b/util-linux/volume_id/f2fs.c | |||
@@ -5,9 +5,6 @@ | |||
5 | * | 5 | * |
6 | * Licensed under GPLv2, see file LICENSE in this source tree. | 6 | * Licensed under GPLv2, see file LICENSE in this source tree. |
7 | */ | 7 | */ |
8 | |||
9 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o | ||
10 | |||
11 | //config:config FEATURE_VOLUMEID_F2FS | 8 | //config:config FEATURE_VOLUMEID_F2FS |
12 | //config: bool "f2fs filesystem" | 9 | //config: bool "f2fs filesystem" |
13 | //config: default y | 10 | //config: default y |
@@ -18,6 +15,8 @@ | |||
18 | //config: known issues of the older log structured file systems, such as high | 15 | //config: known issues of the older log structured file systems, such as high |
19 | //config: cleaning overhead. | 16 | //config: cleaning overhead. |
20 | 17 | ||
18 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o | ||
19 | |||
21 | #include "volume_id_internal.h" | 20 | #include "volume_id_internal.h" |
22 | 21 | ||
23 | #define F2FS_MAGIC 0xF2F52010 // F2FS Magic Number | 22 | #define F2FS_MAGIC 0xF2F52010 // F2FS Magic Number |
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c index bc3433daf..b24ed098e 100644 --- a/util-linux/volume_id/fat.c +++ b/util-linux/volume_id/fat.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_FAT | 20 | //config:config FEATURE_VOLUMEID_FAT |
24 | //config: bool "fat filesystem" | 21 | //config: bool "fat filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | /* linux/msdos_fs.h says: */ | 29 | /* linux/msdos_fs.h says: */ |
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c index 78dae0790..05d16db34 100644 --- a/util-linux/volume_id/hfs.c +++ b/util-linux/volume_id/hfs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_HFS | 20 | //config:config FEATURE_VOLUMEID_HFS |
24 | //config: bool "hfs filesystem" | 21 | //config: bool "hfs filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct hfs_finder_info{ | 29 | struct hfs_finder_info{ |
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c index 23072f87c..c771b01f5 100644 --- a/util-linux/volume_id/iso9660.c +++ b/util-linux/volume_id/iso9660.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_ISO9660 | 20 | //config:config FEATURE_VOLUMEID_ISO9660 |
24 | //config: bool "iso9660 filesystem" | 21 | //config: bool "iso9660 filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | #define ISO_SUPERBLOCK_OFFSET 0x8000 | 29 | #define ISO_SUPERBLOCK_OFFSET 0x8000 |
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c index 543d90fe5..5e523e236 100644 --- a/util-linux/volume_id/jfs.c +++ b/util-linux/volume_id/jfs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_JFS | 20 | //config:config FEATURE_VOLUMEID_JFS |
24 | //config: bool "jfs filesystem" | 21 | //config: bool "jfs filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct jfs_super_block { | 29 | struct jfs_super_block { |
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c index 0db6e8662..db6209a4d 100644 --- a/util-linux/volume_id/linux_raid.c +++ b/util-linux/volume_id/linux_raid.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_LINUXRAID | 20 | //config:config FEATURE_VOLUMEID_LINUXRAID |
24 | //config: bool "linuxraid" | 21 | //config: bool "linuxraid" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct mdp_super_block { | 29 | struct mdp_super_block { |
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c index a35769dfc..78b339cf0 100644 --- a/util-linux/volume_id/linux_swap.c +++ b/util-linux/volume_id/linux_swap.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_LINUXSWAP | 20 | //config:config FEATURE_VOLUMEID_LINUXSWAP |
24 | //config: bool "linux swap filesystem" | 21 | //config: bool "linux swap filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct swap_header_v1_2 { | 29 | struct swap_header_v1_2 { |
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c index 4b80b7a6d..8e634d4ee 100644 --- a/util-linux/volume_id/luks.c +++ b/util-linux/volume_id/luks.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_LUKS | 20 | //config:config FEATURE_VOLUMEID_LUKS |
24 | //config: bool "luks filesystem" | 21 | //config: bool "luks filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | #define LUKS_MAGIC_L 6 | 29 | #define LUKS_MAGIC_L 6 |
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c index 9d6c57fba..7a8b798df 100644 --- a/util-linux/volume_id/nilfs.c +++ b/util-linux/volume_id/nilfs.c | |||
@@ -18,9 +18,6 @@ | |||
18 | * License along with this library; if not, write to the Free Software | 18 | * License along with this library; if not, write to the Free Software |
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
20 | */ | 20 | */ |
21 | |||
22 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o | ||
23 | |||
24 | //config:config FEATURE_VOLUMEID_NILFS | 21 | //config:config FEATURE_VOLUMEID_NILFS |
25 | //config: bool "nilfs filesystem" | 22 | //config: bool "nilfs filesystem" |
26 | //config: default y | 23 | //config: default y |
@@ -37,6 +34,8 @@ | |||
37 | //config: filesystem for Linux desktop environment, or as a basis of advanced | 34 | //config: filesystem for Linux desktop environment, or as a basis of advanced |
38 | //config: storage appliances. | 35 | //config: storage appliances. |
39 | 36 | ||
37 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o | ||
38 | |||
40 | #include "volume_id_internal.h" | 39 | #include "volume_id_internal.h" |
41 | 40 | ||
42 | #define NILFS_UUID_SIZE 16 | 41 | #define NILFS_UUID_SIZE 16 |
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c index bf85f7ed3..22dd77fc7 100644 --- a/util-linux/volume_id/ntfs.c +++ b/util-linux/volume_id/ntfs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_NTFS | 20 | //config:config FEATURE_VOLUMEID_NTFS |
24 | //config: bool "ntfs filesystem" | 21 | //config: bool "ntfs filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct ntfs_super_block { | 29 | struct ntfs_super_block { |
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c index 2dedac98b..235968b88 100644 --- a/util-linux/volume_id/ocfs2.c +++ b/util-linux/volume_id/ocfs2.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_OCFS2 | 20 | //config:config FEATURE_VOLUMEID_OCFS2 |
24 | //config: bool "ocfs2 filesystem" | 21 | //config: bool "ocfs2 filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | /* All these values are taken from ocfs2-tools's ocfs2_fs.h */ | 29 | /* 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 369d4d9bb..d9fd8944d 100644 --- a/util-linux/volume_id/reiserfs.c +++ b/util-linux/volume_id/reiserfs.c | |||
@@ -18,14 +18,13 @@ | |||
18 | * License along with this library; if not, write to the Free Software | 18 | * License along with this library; if not, write to the Free Software |
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
20 | */ | 20 | */ |
21 | |||
22 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o | ||
23 | |||
24 | //config:config FEATURE_VOLUMEID_REISERFS | 21 | //config:config FEATURE_VOLUMEID_REISERFS |
25 | //config: bool "Reiser filesystem" | 22 | //config: bool "Reiser filesystem" |
26 | //config: default y | 23 | //config: default y |
27 | //config: depends on VOLUMEID | 24 | //config: depends on VOLUMEID |
28 | 25 | ||
26 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o | ||
27 | |||
29 | #include "volume_id_internal.h" | 28 | #include "volume_id_internal.h" |
30 | 29 | ||
31 | struct reiserfs_super_block { | 30 | struct reiserfs_super_block { |
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c index 95a65f9ef..bd74fda8d 100644 --- a/util-linux/volume_id/romfs.c +++ b/util-linux/volume_id/romfs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_ROMFS | 20 | //config:config FEATURE_VOLUMEID_ROMFS |
24 | //config: bool "romfs filesystem" | 21 | //config: bool "romfs filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct romfs_super { | 29 | struct romfs_super { |
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c index e3ffce35e..4b65afd8b 100644 --- a/util-linux/volume_id/squashfs.c +++ b/util-linux/volume_id/squashfs.c | |||
@@ -5,9 +5,6 @@ | |||
5 | * | 5 | * |
6 | * Licensed under GPLv2, see file LICENSE in this source tree. | 6 | * Licensed under GPLv2, see file LICENSE in this source tree. |
7 | */ | 7 | */ |
8 | |||
9 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o | ||
10 | |||
11 | //config:config FEATURE_VOLUMEID_SQUASHFS | 8 | //config:config FEATURE_VOLUMEID_SQUASHFS |
12 | //config: bool "SquashFS filesystem" | 9 | //config: bool "SquashFS filesystem" |
13 | //config: default y | 10 | //config: default y |
@@ -18,6 +15,8 @@ | |||
18 | //config: device/memory systems (e.g. embedded systems) where low overhead is | 15 | //config: device/memory systems (e.g. embedded systems) where low overhead is |
19 | //config: needed. | 16 | //config: needed. |
20 | 17 | ||
18 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o | ||
19 | |||
21 | #include "volume_id_internal.h" | 20 | #include "volume_id_internal.h" |
22 | 21 | ||
23 | struct squashfs_superblock { | 22 | struct squashfs_superblock { |
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c index cd4cd906b..be41f8048 100644 --- a/util-linux/volume_id/sysv.c +++ b/util-linux/volume_id/sysv.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_SYSV | 20 | //config:config FEATURE_VOLUMEID_SYSV |
24 | //config: bool "sysv filesystem" | 21 | //config: bool "sysv filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | #define SYSV_NICINOD 100 | 29 | #define SYSV_NICINOD 100 |
diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c index 7512b84b0..aee53f9dd 100644 --- a/util-linux/volume_id/ubifs.c +++ b/util-linux/volume_id/ubifs.c | |||
@@ -5,9 +5,6 @@ | |||
5 | * | 5 | * |
6 | * Licensed under GPLv2, see file LICENSE in this source tree. | 6 | * Licensed under GPLv2, see file LICENSE in this source tree. |
7 | */ | 7 | */ |
8 | |||
9 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o | ||
10 | |||
11 | //config:config FEATURE_VOLUMEID_UBIFS | 8 | //config:config FEATURE_VOLUMEID_UBIFS |
12 | //config: bool "UBIFS filesystem" | 9 | //config: bool "UBIFS filesystem" |
13 | //config: default y | 10 | //config: default y |
@@ -16,6 +13,8 @@ | |||
16 | //config: UBIFS (Unsorted Block Image File System) is a file | 13 | //config: UBIFS (Unsorted Block Image File System) is a file |
17 | //config: system for use with raw flash memory media. | 14 | //config: system for use with raw flash memory media. |
18 | 15 | ||
16 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o | ||
17 | |||
19 | #include "volume_id_internal.h" | 18 | #include "volume_id_internal.h" |
20 | 19 | ||
21 | #define UBIFS_NODE_MAGIC 0x06101831 | 20 | #define UBIFS_NODE_MAGIC 0x06101831 |
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c index fa5dccee7..0df4a86df 100644 --- a/util-linux/volume_id/udf.c +++ b/util-linux/volume_id/udf.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_UDF | 20 | //config:config FEATURE_VOLUMEID_UDF |
24 | //config: bool "udf filesystem" | 21 | //config: bool "udf filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct volume_descriptor { | 29 | struct volume_descriptor { |
diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c index 4afa6d927..1d5ceb787 100644 --- a/util-linux/volume_id/unused_highpoint.c +++ b/util-linux/volume_id/unused_highpoint.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_HIGHPOINTRAID | 20 | //config:### config FEATURE_VOLUMEID_HIGHPOINTRAID |
24 | //config:### bool "highpoint raid" | 21 | //config:### bool "highpoint raid" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct hpt37x_meta { | 29 | struct hpt37x_meta { |
diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c index 3e16dedbd..26fefd415 100644 --- a/util-linux/volume_id/unused_hpfs.c +++ b/util-linux/volume_id/unused_hpfs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_HPFS | 20 | //config:### config FEATURE_VOLUMEID_HPFS |
24 | //config:### bool "hpfs filesystem" | 21 | //config:### bool "hpfs filesystem" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct hpfs_super { | 29 | struct hpfs_super { |
diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c index fba99be58..f7b3eec74 100644 --- a/util-linux/volume_id/unused_isw_raid.c +++ b/util-linux/volume_id/unused_isw_raid.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_ISWRAID | 20 | //config:### config FEATURE_VOLUMEID_ISWRAID |
24 | //config:### bool "intel raid" | 21 | //config:### bool "intel raid" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct isw_meta { | 29 | struct isw_meta { |
diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c index 9dd2b409c..12dabea87 100644 --- a/util-linux/volume_id/unused_lsi_raid.c +++ b/util-linux/volume_id/unused_lsi_raid.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_LSIRAID | 20 | //config:### config FEATURE_VOLUMEID_LSIRAID |
24 | //config:### bool "lsi raid" | 21 | //config:### bool "lsi raid" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct lsi_meta { | 29 | struct lsi_meta { |
diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c index 5ad6d585c..649306c85 100644 --- a/util-linux/volume_id/unused_lvm.c +++ b/util-linux/volume_id/unused_lvm.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_LVM | 20 | //config:### config FEATURE_VOLUMEID_LVM |
24 | //config:### bool "lvm" | 21 | //config:### bool "lvm" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct lvm1_super_block { | 29 | struct lvm1_super_block { |
diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c index 997d330a4..a0d253e92 100644 --- a/util-linux/volume_id/unused_mac.c +++ b/util-linux/volume_id/unused_mac.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_MAC | 20 | //config:### config FEATURE_VOLUMEID_MAC |
24 | //config:### bool "mac filesystem" | 21 | //config:### bool "mac filesystem" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct mac_driver_desc { | 29 | struct mac_driver_desc { |
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c index f84c0f06f..baa14c552 100644 --- a/util-linux/volume_id/unused_msdos.c +++ b/util-linux/volume_id/unused_msdos.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_MSDOS | 20 | //config:### config FEATURE_VOLUMEID_MSDOS |
24 | //config:### bool "msdos filesystem" | 21 | //config:### bool "msdos filesystem" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct msdos_partition_entry { | 29 | 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 dfb54fa9d..e8217b402 100644 --- a/util-linux/volume_id/unused_nvidia_raid.c +++ b/util-linux/volume_id/unused_nvidia_raid.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_NVIDIARAID | 20 | //config:### config FEATURE_VOLUMEID_NVIDIARAID |
24 | //config:### bool "nvidia raid" | 21 | //config:### bool "nvidia raid" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct nvidia_meta { | 29 | struct nvidia_meta { |
diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c index d594de39c..c4a6f502a 100644 --- a/util-linux/volume_id/unused_promise_raid.c +++ b/util-linux/volume_id/unused_promise_raid.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_PROMISERAID | 20 | //config:### config FEATURE_VOLUMEID_PROMISERAID |
24 | //config:### bool "promise raid" | 21 | //config:### bool "promise raid" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct promise_meta { | 29 | struct promise_meta { |
diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c index 886721b61..ea96dc98a 100644 --- a/util-linux/volume_id/unused_silicon_raid.c +++ b/util-linux/volume_id/unused_silicon_raid.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_SILICONRAID | 20 | //config:### config FEATURE_VOLUMEID_SILICONRAID |
24 | //config:### bool "silicon raid" | 21 | //config:### bool "silicon raid" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct silicon_meta { | 29 | struct silicon_meta { |
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c index 78ef26ad4..c36793a68 100644 --- a/util-linux/volume_id/unused_ufs.c +++ b/util-linux/volume_id/unused_ufs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_UFS | 20 | //config:### config FEATURE_VOLUMEID_UFS |
24 | //config:### bool "ufs filesystem" | 21 | //config:### bool "ufs filesystem" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct ufs_super_block { | 29 | 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 f82626655..c77c8393c 100644 --- a/util-linux/volume_id/unused_via_raid.c +++ b/util-linux/volume_id/unused_via_raid.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o | ||
22 | |||
23 | //config:### config FEATURE_VOLUMEID_VIARAID | 20 | //config:### config FEATURE_VOLUMEID_VIARAID |
24 | //config:### bool "via raid" | 21 | //config:### bool "via raid" |
25 | //config:### default y | 22 | //config:### default y |
26 | //config:### depends on VOLUMEID | 23 | //config:### depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct via_meta { | 29 | struct via_meta { |
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c index 656d5bfcf..f98b66a53 100644 --- a/util-linux/volume_id/xfs.c +++ b/util-linux/volume_id/xfs.c | |||
@@ -17,14 +17,13 @@ | |||
17 | * License along with this library; if not, write to the Free Software | 17 | * License along with this library; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | |||
21 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o | ||
22 | |||
23 | //config:config FEATURE_VOLUMEID_XFS | 20 | //config:config FEATURE_VOLUMEID_XFS |
24 | //config: bool "xfs filesystem" | 21 | //config: bool "xfs filesystem" |
25 | //config: default y | 22 | //config: default y |
26 | //config: depends on VOLUMEID | 23 | //config: depends on VOLUMEID |
27 | 24 | ||
25 | //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o | ||
26 | |||
28 | #include "volume_id_internal.h" | 27 | #include "volume_id_internal.h" |
29 | 28 | ||
30 | struct xfs_super_block { | 29 | struct xfs_super_block { |