diff options
35 files changed, 71 insertions, 38 deletions
diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src index 759fdaae5..6b4fb7470 100644 --- a/util-linux/volume_id/Kbuild.src +++ b/util-linux/volume_id/Kbuild.src @@ -7,41 +7,3 @@ lib-y:= INSERT - -lib-$(CONFIG_BLKID) += get_devname.o -lib-$(CONFIG_FINDFS) += get_devname.o -lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o - -lib-$(CONFIG_VOLUMEID) += volume_id.o util.o -lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o -lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o -lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o -### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o -### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o -### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o -### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o -### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o -### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o -### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o -lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o -lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o -lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o -### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o -### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o -### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o -lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o -lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o -### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o -lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o -### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o -lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o -### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o -lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o -lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c index ee71d2e00..46725da3d 100644 --- a/util-linux/volume_id/btrfs.c +++ b/util-linux/volume_id/btrfs.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o + #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 28e997043..8dfd611f4 100644 --- a/util-linux/volume_id/cramfs.c +++ b/util-linux/volume_id/cramfs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o + #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 a38a8916d..01b350003 100644 --- a/util-linux/volume_id/exfat.c +++ b/util-linux/volume_id/exfat.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o + #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 97451067f..a1a080805 100644 --- a/util-linux/volume_id/ext.c +++ b/util-linux/volume_id/ext.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o + #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 904fbb201..96b2b695d 100644 --- a/util-linux/volume_id/fat.c +++ b/util-linux/volume_id/fat.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o + #include "volume_id_internal.h" /* linux/msdos_fs.h says: */ diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c index 665cb9b6e..0c6bdfddf 100644 --- a/util-linux/volume_id/get_devname.c +++ b/util-linux/volume_id/get_devname.c @@ -7,6 +7,11 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//kbuild:lib-$(CONFIG_BLKID) += get_devname.o +//kbuild:lib-$(CONFIG_FINDFS) += get_devname.o +//kbuild:lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o + #include <sys/mount.h> /* BLKGETSIZE64 */ #if !defined(BLKGETSIZE64) # define BLKGETSIZE64 _IOR(0x12,114,size_t) diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c index 3d9704d12..496d3502a 100644 --- a/util-linux/volume_id/hfs.c +++ b/util-linux/volume_id/hfs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o + #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 1d7693a9c..67ba8fdd5 100644 --- a/util-linux/volume_id/iso9660.c +++ b/util-linux/volume_id/iso9660.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o + #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 5333af2c3..590698d68 100644 --- a/util-linux/volume_id/jfs.c +++ b/util-linux/volume_id/jfs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o + #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 209eaabe9..74fd10b88 100644 --- a/util-linux/volume_id/linux_raid.c +++ b/util-linux/volume_id/linux_raid.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o + #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 1ee534ab0..ffb448e95 100644 --- a/util-linux/volume_id/linux_swap.c +++ b/util-linux/volume_id/linux_swap.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o + #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 f9b376672..856d42fa6 100644 --- a/util-linux/volume_id/luks.c +++ b/util-linux/volume_id/luks.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o + #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 b88a9e435..daa0294ae 100644 --- a/util-linux/volume_id/nilfs.c +++ b/util-linux/volume_id/nilfs.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o + #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 0444e546b..b8f278bff 100644 --- a/util-linux/volume_id/ntfs.c +++ b/util-linux/volume_id/ntfs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o + #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 fcdb15192..850f60a4a 100644 --- a/util-linux/volume_id/ocfs2.c +++ b/util-linux/volume_id/ocfs2.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o + #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 67b4a1877..5dcc037ba 100644 --- a/util-linux/volume_id/reiserfs.c +++ b/util-linux/volume_id/reiserfs.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o + #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 15653bedf..b55ec9b46 100644 --- a/util-linux/volume_id/romfs.c +++ b/util-linux/volume_id/romfs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o + #include "volume_id_internal.h" struct romfs_super { diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c index 6eb96464d..7cc1d2133 100644 --- a/util-linux/volume_id/sysv.c +++ b/util-linux/volume_id/sysv.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o + #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 d3747fb8e..ee5bb773d 100644 --- a/util-linux/volume_id/udf.c +++ b/util-linux/volume_id/udf.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o + #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 17b7b3291..990875c8b 100644 --- a/util-linux/volume_id/unused_highpoint.c +++ b/util-linux/volume_id/unused_highpoint.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o + #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 442952464..2a7477bdb 100644 --- a/util-linux/volume_id/unused_hpfs.c +++ b/util-linux/volume_id/unused_hpfs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o + #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 7ab47b3a1..35bc7d13c 100644 --- a/util-linux/volume_id/unused_isw_raid.c +++ b/util-linux/volume_id/unused_isw_raid.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o + #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 e6cc8edd3..6578f9812 100644 --- a/util-linux/volume_id/unused_lsi_raid.c +++ b/util-linux/volume_id/unused_lsi_raid.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o + #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 2206498bf..cb038f4ee 100644 --- a/util-linux/volume_id/unused_lvm.c +++ b/util-linux/volume_id/unused_lvm.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o + #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 e8deb9720..5c4053223 100644 --- a/util-linux/volume_id/unused_mac.c +++ b/util-linux/volume_id/unused_mac.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o + #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 a3e1077b0..7dc4175d3 100644 --- a/util-linux/volume_id/unused_minix.c +++ b/util-linux/volume_id/unused_minix.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o + #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 2e8cb196a..3d90827d8 100644 --- a/util-linux/volume_id/unused_msdos.c +++ b/util-linux/volume_id/unused_msdos.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o + #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 9e8472921..951857555 100644 --- a/util-linux/volume_id/unused_nvidia_raid.c +++ b/util-linux/volume_id/unused_nvidia_raid.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o + #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 0b0d0063c..d19a2f7ba 100644 --- a/util-linux/volume_id/unused_promise_raid.c +++ b/util-linux/volume_id/unused_promise_raid.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o + #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 878b88197..65dc63b1d 100644 --- a/util-linux/volume_id/unused_silicon_raid.c +++ b/util-linux/volume_id/unused_silicon_raid.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o + #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 9f925d983..173acce2f 100644 --- a/util-linux/volume_id/unused_ufs.c +++ b/util-linux/volume_id/unused_ufs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o + #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 a11eec13a..8ef06f1ac 100644 --- a/util-linux/volume_id/unused_via_raid.c +++ b/util-linux/volume_id/unused_via_raid.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o + #include "volume_id_internal.h" struct via_meta { diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c index f0fc84c05..097a6f1ee 100644 --- a/util-linux/volume_id/volume_id.c +++ b/util-linux/volume_id/volume_id.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_VOLUMEID) += volume_id.o util.o + #include "volume_id_internal.h" diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c index 84746020e..44d35fbb6 100644 --- a/util-linux/volume_id/xfs.c +++ b/util-linux/volume_id/xfs.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o + #include "volume_id_internal.h" struct xfs_super_block { |