commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[1975] 2009-02-07 Robert Millan <address@hidden>


From: Robert Millan
Subject: [1975] 2009-02-07 Robert Millan <address@hidden>
Date: Sat, 07 Feb 2009 20:55:49 +0000

Revision: 1975
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1975
Author:   robertmh
Date:     2009-02-07 20:55:48 +0000 (Sat, 07 Feb 2009)

Log Message:
-----------
2009-02-07  Robert Millan  <address@hidden>

        * conf/common.rmk (grub_probe_SOURCES, grub_fstest_SOURCES): Move
        position of `disk/lvm.c\' to ensure grub_init_all() always picks it
        after the RAID stuff.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/DISTLIST
    trunk/grub2/conf/common.mk
    trunk/grub2/conf/common.rmk

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-02-05 18:28:58 UTC (rev 1974)
+++ trunk/grub2/ChangeLog       2009-02-07 20:55:48 UTC (rev 1975)
@@ -1,3 +1,9 @@
+2009-02-07  Robert Millan  <address@hidden>
+
+       * conf/common.rmk (grub_probe_SOURCES, grub_fstest_SOURCES): Move
+       position of `disk/lvm.c' to ensure grub_init_all() always picks it
+       after the RAID stuff.
+
 2009-02-05  Vesa Jääskeläinen  <address@hidden>
 
        Fixes problem when running vbetest command as reported by 

Modified: trunk/grub2/DISTLIST
===================================================================
--- trunk/grub2/DISTLIST        2009-02-05 18:28:58 UTC (rev 1974)
+++ trunk/grub2/DISTLIST        2009-02-07 20:55:48 UTC (rev 1975)
@@ -436,7 +436,6 @@
 util/misc.c
 util/raid.c
 util/resolve.c
-util/unifont2pff.rb
 util/update-grub_lib.in
 util/elf/grub-mkimage.c
 util/grub.d/00_header.in

Modified: trunk/grub2/conf/common.mk
===================================================================
--- trunk/grub2/conf/common.mk  2009-02-05 18:28:58 UTC (rev 1974)
+++ trunk/grub2/conf/common.mk  2009-02-07 20:55:48 UTC (rev 1975)
@@ -40,12 +40,12 @@
        \
        partmap/pc.c partmap/apple.c partmap/gpt.c              \
        kern/fs.c kern/env.c fs/fshelp.c                        \
-       disk/lvm.c disk/raid.c disk/mdraid_linux.c grub_probe_init.c
-CLEANFILES += grub-probe$(EXEEXT) grub_probe-util_grub_probe.o 
grub_probe-util_hostdisk.o grub_probe-util_misc.o grub_probe-util_getroot.o 
grub_probe-kern_device.o grub_probe-kern_disk.o grub_probe-kern_err.o 
grub_probe-kern_misc.o grub_probe-kern_parser.o grub_probe-kern_partition.o 
grub_probe-kern_file.o grub_probe-fs_affs.o grub_probe-fs_cpio.o 
grub_probe-fs_ext2.o grub_probe-fs_fat.o grub_probe-fs_hfs.o 
grub_probe-fs_hfsplus.o grub_probe-fs_iso9660.o grub_probe-fs_udf.o 
grub_probe-fs_jfs.o grub_probe-fs_minix.o grub_probe-fs_ntfs.o 
grub_probe-fs_ntfscomp.o grub_probe-fs_reiserfs.o grub_probe-fs_sfs.o 
grub_probe-fs_ufs.o grub_probe-fs_xfs.o grub_probe-fs_afs.o 
grub_probe-partmap_pc.o grub_probe-partmap_apple.o grub_probe-partmap_gpt.o 
grub_probe-kern_fs.o grub_probe-kern_env.o grub_probe-fs_fshelp.o 
grub_probe-disk_lvm.o grub_probe-disk_raid.o grub_probe-disk_mdraid_linux.o 
grub_probe-grub_probe_init.o
-MOSTLYCLEANFILES += grub_probe-util_grub_probe.d grub_probe-util_hostdisk.d 
grub_probe-util_misc.d grub_probe-util_getroot.d grub_probe-kern_device.d 
grub_probe-kern_disk.d grub_probe-kern_err.d grub_probe-kern_misc.d 
grub_probe-kern_parser.d grub_probe-kern_partition.d grub_probe-kern_file.d 
grub_probe-fs_affs.d grub_probe-fs_cpio.d grub_probe-fs_ext2.d 
grub_probe-fs_fat.d grub_probe-fs_hfs.d grub_probe-fs_hfsplus.d 
grub_probe-fs_iso9660.d grub_probe-fs_udf.d grub_probe-fs_jfs.d 
grub_probe-fs_minix.d grub_probe-fs_ntfs.d grub_probe-fs_ntfscomp.d 
grub_probe-fs_reiserfs.d grub_probe-fs_sfs.d grub_probe-fs_ufs.d 
grub_probe-fs_xfs.d grub_probe-fs_afs.d grub_probe-partmap_pc.d 
grub_probe-partmap_apple.d grub_probe-partmap_gpt.d grub_probe-kern_fs.d 
grub_probe-kern_env.d grub_probe-fs_fshelp.d grub_probe-disk_lvm.d 
grub_probe-disk_raid.d grub_probe-disk_mdraid_linux.d 
grub_probe-grub_probe_init.d
+       disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
+CLEANFILES += grub-probe$(EXEEXT) grub_probe-util_grub_probe.o 
grub_probe-util_hostdisk.o grub_probe-util_misc.o grub_probe-util_getroot.o 
grub_probe-kern_device.o grub_probe-kern_disk.o grub_probe-kern_err.o 
grub_probe-kern_misc.o grub_probe-kern_parser.o grub_probe-kern_partition.o 
grub_probe-kern_file.o grub_probe-fs_affs.o grub_probe-fs_cpio.o 
grub_probe-fs_ext2.o grub_probe-fs_fat.o grub_probe-fs_hfs.o 
grub_probe-fs_hfsplus.o grub_probe-fs_iso9660.o grub_probe-fs_udf.o 
grub_probe-fs_jfs.o grub_probe-fs_minix.o grub_probe-fs_ntfs.o 
grub_probe-fs_ntfscomp.o grub_probe-fs_reiserfs.o grub_probe-fs_sfs.o 
grub_probe-fs_ufs.o grub_probe-fs_xfs.o grub_probe-fs_afs.o 
grub_probe-partmap_pc.o grub_probe-partmap_apple.o grub_probe-partmap_gpt.o 
grub_probe-kern_fs.o grub_probe-kern_env.o grub_probe-fs_fshelp.o 
grub_probe-disk_raid.o grub_probe-disk_mdraid_linux.o grub_probe-disk_lvm.o 
grub_probe-grub_probe_init.o
+MOSTLYCLEANFILES += grub_probe-util_grub_probe.d grub_probe-util_hostdisk.d 
grub_probe-util_misc.d grub_probe-util_getroot.d grub_probe-kern_device.d 
grub_probe-kern_disk.d grub_probe-kern_err.d grub_probe-kern_misc.d 
grub_probe-kern_parser.d grub_probe-kern_partition.d grub_probe-kern_file.d 
grub_probe-fs_affs.d grub_probe-fs_cpio.d grub_probe-fs_ext2.d 
grub_probe-fs_fat.d grub_probe-fs_hfs.d grub_probe-fs_hfsplus.d 
grub_probe-fs_iso9660.d grub_probe-fs_udf.d grub_probe-fs_jfs.d 
grub_probe-fs_minix.d grub_probe-fs_ntfs.d grub_probe-fs_ntfscomp.d 
grub_probe-fs_reiserfs.d grub_probe-fs_sfs.d grub_probe-fs_ufs.d 
grub_probe-fs_xfs.d grub_probe-fs_afs.d grub_probe-partmap_pc.d 
grub_probe-partmap_apple.d grub_probe-partmap_gpt.d grub_probe-kern_fs.d 
grub_probe-kern_env.d grub_probe-fs_fshelp.d grub_probe-disk_raid.d 
grub_probe-disk_mdraid_linux.d grub_probe-disk_lvm.d 
grub_probe-grub_probe_init.d
 
-grub-probe: $(grub_probe_DEPENDENCIES) grub_probe-util_grub_probe.o 
grub_probe-util_hostdisk.o grub_probe-util_misc.o grub_probe-util_getroot.o 
grub_probe-kern_device.o grub_probe-kern_disk.o grub_probe-kern_err.o 
grub_probe-kern_misc.o grub_probe-kern_parser.o grub_probe-kern_partition.o 
grub_probe-kern_file.o grub_probe-fs_affs.o grub_probe-fs_cpio.o 
grub_probe-fs_ext2.o grub_probe-fs_fat.o grub_probe-fs_hfs.o 
grub_probe-fs_hfsplus.o grub_probe-fs_iso9660.o grub_probe-fs_udf.o 
grub_probe-fs_jfs.o grub_probe-fs_minix.o grub_probe-fs_ntfs.o 
grub_probe-fs_ntfscomp.o grub_probe-fs_reiserfs.o grub_probe-fs_sfs.o 
grub_probe-fs_ufs.o grub_probe-fs_xfs.o grub_probe-fs_afs.o 
grub_probe-partmap_pc.o grub_probe-partmap_apple.o grub_probe-partmap_gpt.o 
grub_probe-kern_fs.o grub_probe-kern_env.o grub_probe-fs_fshelp.o 
grub_probe-disk_lvm.o grub_probe-disk_raid.o grub_probe-disk_mdraid_linux.o 
grub_probe-grub_probe_init.o
-       $(CC) -o $@ grub_probe-util_grub_probe.o grub_probe-util_hostdisk.o 
grub_probe-util_misc.o grub_probe-util_getroot.o grub_probe-kern_device.o 
grub_probe-kern_disk.o grub_probe-kern_err.o grub_probe-kern_misc.o 
grub_probe-kern_parser.o grub_probe-kern_partition.o grub_probe-kern_file.o 
grub_probe-fs_affs.o grub_probe-fs_cpio.o grub_probe-fs_ext2.o 
grub_probe-fs_fat.o grub_probe-fs_hfs.o grub_probe-fs_hfsplus.o 
grub_probe-fs_iso9660.o grub_probe-fs_udf.o grub_probe-fs_jfs.o 
grub_probe-fs_minix.o grub_probe-fs_ntfs.o grub_probe-fs_ntfscomp.o 
grub_probe-fs_reiserfs.o grub_probe-fs_sfs.o grub_probe-fs_ufs.o 
grub_probe-fs_xfs.o grub_probe-fs_afs.o grub_probe-partmap_pc.o 
grub_probe-partmap_apple.o grub_probe-partmap_gpt.o grub_probe-kern_fs.o 
grub_probe-kern_env.o grub_probe-fs_fshelp.o grub_probe-disk_lvm.o 
grub_probe-disk_raid.o grub_probe-disk_mdraid_linux.o 
grub_probe-grub_probe_init.o $(LDFLAGS) $(grub_probe_LDFLAGS)
+grub-probe: $(grub_probe_DEPENDENCIES) grub_probe-util_grub_probe.o 
grub_probe-util_hostdisk.o grub_probe-util_misc.o grub_probe-util_getroot.o 
grub_probe-kern_device.o grub_probe-kern_disk.o grub_probe-kern_err.o 
grub_probe-kern_misc.o grub_probe-kern_parser.o grub_probe-kern_partition.o 
grub_probe-kern_file.o grub_probe-fs_affs.o grub_probe-fs_cpio.o 
grub_probe-fs_ext2.o grub_probe-fs_fat.o grub_probe-fs_hfs.o 
grub_probe-fs_hfsplus.o grub_probe-fs_iso9660.o grub_probe-fs_udf.o 
grub_probe-fs_jfs.o grub_probe-fs_minix.o grub_probe-fs_ntfs.o 
grub_probe-fs_ntfscomp.o grub_probe-fs_reiserfs.o grub_probe-fs_sfs.o 
grub_probe-fs_ufs.o grub_probe-fs_xfs.o grub_probe-fs_afs.o 
grub_probe-partmap_pc.o grub_probe-partmap_apple.o grub_probe-partmap_gpt.o 
grub_probe-kern_fs.o grub_probe-kern_env.o grub_probe-fs_fshelp.o 
grub_probe-disk_raid.o grub_probe-disk_mdraid_linux.o grub_probe-disk_lvm.o 
grub_probe-grub_probe_init.o
+       $(CC) -o $@ grub_probe-util_grub_probe.o grub_probe-util_hostdisk.o 
grub_probe-util_misc.o grub_probe-util_getroot.o grub_probe-kern_device.o 
grub_probe-kern_disk.o grub_probe-kern_err.o grub_probe-kern_misc.o 
grub_probe-kern_parser.o grub_probe-kern_partition.o grub_probe-kern_file.o 
grub_probe-fs_affs.o grub_probe-fs_cpio.o grub_probe-fs_ext2.o 
grub_probe-fs_fat.o grub_probe-fs_hfs.o grub_probe-fs_hfsplus.o 
grub_probe-fs_iso9660.o grub_probe-fs_udf.o grub_probe-fs_jfs.o 
grub_probe-fs_minix.o grub_probe-fs_ntfs.o grub_probe-fs_ntfscomp.o 
grub_probe-fs_reiserfs.o grub_probe-fs_sfs.o grub_probe-fs_ufs.o 
grub_probe-fs_xfs.o grub_probe-fs_afs.o grub_probe-partmap_pc.o 
grub_probe-partmap_apple.o grub_probe-partmap_gpt.o grub_probe-kern_fs.o 
grub_probe-kern_env.o grub_probe-fs_fshelp.o grub_probe-disk_raid.o 
grub_probe-disk_mdraid_linux.o grub_probe-disk_lvm.o 
grub_probe-grub_probe_init.o $(LDFLAGS) $(grub_probe_LDFLAGS)
 
 grub_probe-util_grub_probe.o: util/grub-probe.c 
$(util/grub-probe.c_DEPENDENCIES)
        $(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_probe_CFLAGS) -MD -c -o $@ $<
@@ -183,10 +183,6 @@
        $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_probe_CFLAGS) -MD -c -o $@ $<
 -include grub_probe-fs_fshelp.d
 
-grub_probe-disk_lvm.o: disk/lvm.c $(disk/lvm.c_DEPENDENCIES)
-       $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_probe_CFLAGS) -MD -c -o $@ $<
--include grub_probe-disk_lvm.d
-
 grub_probe-disk_raid.o: disk/raid.c $(disk/raid.c_DEPENDENCIES)
        $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_probe_CFLAGS) -MD -c -o $@ $<
 -include grub_probe-disk_raid.d
@@ -195,6 +191,10 @@
        $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_probe_CFLAGS) -MD -c -o $@ $<
 -include grub_probe-disk_mdraid_linux.d
 
+grub_probe-disk_lvm.o: disk/lvm.c $(disk/lvm.c_DEPENDENCIES)
+       $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_probe_CFLAGS) -MD -c -o $@ $<
+-include grub_probe-disk_lvm.d
+
 grub_probe-grub_probe_init.o: grub_probe_init.c 
$(grub_probe_init.c_DEPENDENCIES)
        $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_probe_CFLAGS) -MD -c -o $@ $<
 -include grub_probe-grub_probe_init.d
@@ -217,15 +217,15 @@
        fs/ufs.c fs/xfs.c fs/afs.c                                      \
        \
        kern/partition.c partmap/pc.c partmap/apple.c partmap/gpt.c     \
-       kern/fs.c kern/env.c fs/fshelp.c disk/lvm.c disk/raid.c         \
+       kern/fs.c kern/env.c fs/fshelp.c disk/raid.c                    \
        disk/raid5_recover.c disk/raid6_recover.c                       \
-       disk/mdraid_linux.c disk/dmraid_nvidia.c                        \
+       disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
        grub_fstest_init.c
-CLEANFILES += grub-fstest$(EXEEXT) grub_fstest-util_grub_fstest.o 
grub_fstest-util_hostfs.o grub_fstest-util_misc.o grub_fstest-kern_file.o 
grub_fstest-kern_device.o grub_fstest-kern_disk.o grub_fstest-kern_err.o 
grub_fstest-kern_misc.o grub_fstest-disk_host.o grub_fstest-disk_loopback.o 
grub_fstest-normal_arg.o grub_fstest-normal_misc.o grub_fstest-lib_hexdump.o 
grub_fstest-lib_crc.o grub_fstest-commands_blocklist.o 
grub_fstest-commands_ls.o grub_fstest-fs_affs.o grub_fstest-fs_cpio.o 
grub_fstest-fs_ext2.o grub_fstest-fs_fat.o grub_fstest-fs_hfs.o 
grub_fstest-fs_hfsplus.o grub_fstest-fs_iso9660.o grub_fstest-fs_udf.o 
grub_fstest-fs_jfs.o grub_fstest-fs_minix.o grub_fstest-fs_ntfs.o 
grub_fstest-fs_ntfscomp.o grub_fstest-fs_reiserfs.o grub_fstest-fs_sfs.o 
grub_fstest-fs_ufs.o grub_fstest-fs_xfs.o grub_fstest-fs_afs.o 
grub_fstest-kern_partition.o grub_fstest-partmap_pc.o 
grub_fstest-partmap_apple.o grub_fstest-partmap_gpt.o grub_fstest-kern_fs.o 
grub_fstest-kern_env.o grub_fstest-fs_fshelp.o grub_fstest-disk_lvm.o 
grub_fstest-disk_raid.o grub_fstest-disk_raid5_recover.o 
grub_fstest-disk_raid6_recover.o grub_fstest-disk_mdraid_linux.o 
grub_fstest-disk_dmraid_nvidia.o grub_fstest-grub_fstest_init.o
-MOSTLYCLEANFILES += grub_fstest-util_grub_fstest.d grub_fstest-util_hostfs.d 
grub_fstest-util_misc.d grub_fstest-kern_file.d grub_fstest-kern_device.d 
grub_fstest-kern_disk.d grub_fstest-kern_err.d grub_fstest-kern_misc.d 
grub_fstest-disk_host.d grub_fstest-disk_loopback.d grub_fstest-normal_arg.d 
grub_fstest-normal_misc.d grub_fstest-lib_hexdump.d grub_fstest-lib_crc.d 
grub_fstest-commands_blocklist.d grub_fstest-commands_ls.d 
grub_fstest-fs_affs.d grub_fstest-fs_cpio.d grub_fstest-fs_ext2.d 
grub_fstest-fs_fat.d grub_fstest-fs_hfs.d grub_fstest-fs_hfsplus.d 
grub_fstest-fs_iso9660.d grub_fstest-fs_udf.d grub_fstest-fs_jfs.d 
grub_fstest-fs_minix.d grub_fstest-fs_ntfs.d grub_fstest-fs_ntfscomp.d 
grub_fstest-fs_reiserfs.d grub_fstest-fs_sfs.d grub_fstest-fs_ufs.d 
grub_fstest-fs_xfs.d grub_fstest-fs_afs.d grub_fstest-kern_partition.d 
grub_fstest-partmap_pc.d grub_fstest-partmap_apple.d grub_fstest-partmap_gpt.d 
grub_fstest-kern_fs.d grub_fstest-kern_env.d grub_fstest-fs_fshelp.d 
grub_fstest-disk_lvm.d grub_fstest-disk_raid.d grub_fstest-disk_raid5_recover.d 
grub_fstest-disk_raid6_recover.d grub_fstest-disk_mdraid_linux.d 
grub_fstest-disk_dmraid_nvidia.d grub_fstest-grub_fstest_init.d
+CLEANFILES += grub-fstest$(EXEEXT) grub_fstest-util_grub_fstest.o 
grub_fstest-util_hostfs.o grub_fstest-util_misc.o grub_fstest-kern_file.o 
grub_fstest-kern_device.o grub_fstest-kern_disk.o grub_fstest-kern_err.o 
grub_fstest-kern_misc.o grub_fstest-disk_host.o grub_fstest-disk_loopback.o 
grub_fstest-normal_arg.o grub_fstest-normal_misc.o grub_fstest-lib_hexdump.o 
grub_fstest-lib_crc.o grub_fstest-commands_blocklist.o 
grub_fstest-commands_ls.o grub_fstest-fs_affs.o grub_fstest-fs_cpio.o 
grub_fstest-fs_ext2.o grub_fstest-fs_fat.o grub_fstest-fs_hfs.o 
grub_fstest-fs_hfsplus.o grub_fstest-fs_iso9660.o grub_fstest-fs_udf.o 
grub_fstest-fs_jfs.o grub_fstest-fs_minix.o grub_fstest-fs_ntfs.o 
grub_fstest-fs_ntfscomp.o grub_fstest-fs_reiserfs.o grub_fstest-fs_sfs.o 
grub_fstest-fs_ufs.o grub_fstest-fs_xfs.o grub_fstest-fs_afs.o 
grub_fstest-kern_partition.o grub_fstest-partmap_pc.o 
grub_fstest-partmap_apple.o grub_fstest-partmap_gpt.o grub_fstest-kern_fs.o 
grub_fstest-kern_env.o grub_fstest-fs_fshelp.o grub_fstest-disk_raid.o 
grub_fstest-disk_raid5_recover.o grub_fstest-disk_raid6_recover.o 
grub_fstest-disk_mdraid_linux.o grub_fstest-disk_dmraid_nvidia.o 
grub_fstest-disk_lvm.o grub_fstest-grub_fstest_init.o
+MOSTLYCLEANFILES += grub_fstest-util_grub_fstest.d grub_fstest-util_hostfs.d 
grub_fstest-util_misc.d grub_fstest-kern_file.d grub_fstest-kern_device.d 
grub_fstest-kern_disk.d grub_fstest-kern_err.d grub_fstest-kern_misc.d 
grub_fstest-disk_host.d grub_fstest-disk_loopback.d grub_fstest-normal_arg.d 
grub_fstest-normal_misc.d grub_fstest-lib_hexdump.d grub_fstest-lib_crc.d 
grub_fstest-commands_blocklist.d grub_fstest-commands_ls.d 
grub_fstest-fs_affs.d grub_fstest-fs_cpio.d grub_fstest-fs_ext2.d 
grub_fstest-fs_fat.d grub_fstest-fs_hfs.d grub_fstest-fs_hfsplus.d 
grub_fstest-fs_iso9660.d grub_fstest-fs_udf.d grub_fstest-fs_jfs.d 
grub_fstest-fs_minix.d grub_fstest-fs_ntfs.d grub_fstest-fs_ntfscomp.d 
grub_fstest-fs_reiserfs.d grub_fstest-fs_sfs.d grub_fstest-fs_ufs.d 
grub_fstest-fs_xfs.d grub_fstest-fs_afs.d grub_fstest-kern_partition.d 
grub_fstest-partmap_pc.d grub_fstest-partmap_apple.d grub_fstest-partmap_gpt.d 
grub_fstest-kern_fs.d grub_fstest-kern_env.d grub_fstest-fs_fshelp.d 
grub_fstest-disk_raid.d grub_fstest-disk_raid5_recover.d 
grub_fstest-disk_raid6_recover.d grub_fstest-disk_mdraid_linux.d 
grub_fstest-disk_dmraid_nvidia.d grub_fstest-disk_lvm.d 
grub_fstest-grub_fstest_init.d
 
-grub-fstest: $(grub_fstest_DEPENDENCIES) grub_fstest-util_grub_fstest.o 
grub_fstest-util_hostfs.o grub_fstest-util_misc.o grub_fstest-kern_file.o 
grub_fstest-kern_device.o grub_fstest-kern_disk.o grub_fstest-kern_err.o 
grub_fstest-kern_misc.o grub_fstest-disk_host.o grub_fstest-disk_loopback.o 
grub_fstest-normal_arg.o grub_fstest-normal_misc.o grub_fstest-lib_hexdump.o 
grub_fstest-lib_crc.o grub_fstest-commands_blocklist.o 
grub_fstest-commands_ls.o grub_fstest-fs_affs.o grub_fstest-fs_cpio.o 
grub_fstest-fs_ext2.o grub_fstest-fs_fat.o grub_fstest-fs_hfs.o 
grub_fstest-fs_hfsplus.o grub_fstest-fs_iso9660.o grub_fstest-fs_udf.o 
grub_fstest-fs_jfs.o grub_fstest-fs_minix.o grub_fstest-fs_ntfs.o 
grub_fstest-fs_ntfscomp.o grub_fstest-fs_reiserfs.o grub_fstest-fs_sfs.o 
grub_fstest-fs_ufs.o grub_fstest-fs_xfs.o grub_fstest-fs_afs.o 
grub_fstest-kern_partition.o grub_fstest-partmap_pc.o 
grub_fstest-partmap_apple.o grub_fstest-partmap_gpt.o grub_fstest-kern_fs.o 
grub_fstest-kern_env.o grub_fstest-fs_fshelp.o grub_fstest-disk_lvm.o 
grub_fstest-disk_raid.o grub_fstest-disk_raid5_recover.o 
grub_fstest-disk_raid6_recover.o grub_fstest-disk_mdraid_linux.o 
grub_fstest-disk_dmraid_nvidia.o grub_fstest-grub_fstest_init.o
-       $(CC) -o $@ grub_fstest-util_grub_fstest.o grub_fstest-util_hostfs.o 
grub_fstest-util_misc.o grub_fstest-kern_file.o grub_fstest-kern_device.o 
grub_fstest-kern_disk.o grub_fstest-kern_err.o grub_fstest-kern_misc.o 
grub_fstest-disk_host.o grub_fstest-disk_loopback.o grub_fstest-normal_arg.o 
grub_fstest-normal_misc.o grub_fstest-lib_hexdump.o grub_fstest-lib_crc.o 
grub_fstest-commands_blocklist.o grub_fstest-commands_ls.o 
grub_fstest-fs_affs.o grub_fstest-fs_cpio.o grub_fstest-fs_ext2.o 
grub_fstest-fs_fat.o grub_fstest-fs_hfs.o grub_fstest-fs_hfsplus.o 
grub_fstest-fs_iso9660.o grub_fstest-fs_udf.o grub_fstest-fs_jfs.o 
grub_fstest-fs_minix.o grub_fstest-fs_ntfs.o grub_fstest-fs_ntfscomp.o 
grub_fstest-fs_reiserfs.o grub_fstest-fs_sfs.o grub_fstest-fs_ufs.o 
grub_fstest-fs_xfs.o grub_fstest-fs_afs.o grub_fstest-kern_partition.o 
grub_fstest-partmap_pc.o grub_fstest-partmap_apple.o grub_fstest-partmap_gpt.o 
grub_fstest-kern_fs.o grub_fstest-kern_env.o grub_fstest-fs_fshelp.o 
grub_fstest-disk_lvm.o grub_fstest-disk_raid.o grub_fstest-disk_raid5_recover.o 
grub_fstest-disk_raid6_recover.o grub_fstest-disk_mdraid_linux.o 
grub_fstest-disk_dmraid_nvidia.o grub_fstest-grub_fstest_init.o $(LDFLAGS) 
$(grub_fstest_LDFLAGS)
+grub-fstest: $(grub_fstest_DEPENDENCIES) grub_fstest-util_grub_fstest.o 
grub_fstest-util_hostfs.o grub_fstest-util_misc.o grub_fstest-kern_file.o 
grub_fstest-kern_device.o grub_fstest-kern_disk.o grub_fstest-kern_err.o 
grub_fstest-kern_misc.o grub_fstest-disk_host.o grub_fstest-disk_loopback.o 
grub_fstest-normal_arg.o grub_fstest-normal_misc.o grub_fstest-lib_hexdump.o 
grub_fstest-lib_crc.o grub_fstest-commands_blocklist.o 
grub_fstest-commands_ls.o grub_fstest-fs_affs.o grub_fstest-fs_cpio.o 
grub_fstest-fs_ext2.o grub_fstest-fs_fat.o grub_fstest-fs_hfs.o 
grub_fstest-fs_hfsplus.o grub_fstest-fs_iso9660.o grub_fstest-fs_udf.o 
grub_fstest-fs_jfs.o grub_fstest-fs_minix.o grub_fstest-fs_ntfs.o 
grub_fstest-fs_ntfscomp.o grub_fstest-fs_reiserfs.o grub_fstest-fs_sfs.o 
grub_fstest-fs_ufs.o grub_fstest-fs_xfs.o grub_fstest-fs_afs.o 
grub_fstest-kern_partition.o grub_fstest-partmap_pc.o 
grub_fstest-partmap_apple.o grub_fstest-partmap_gpt.o grub_fstest-kern_fs.o 
grub_fstest-kern_env.o grub_fstest-fs_fshelp.o grub_fstest-disk_raid.o 
grub_fstest-disk_raid5_recover.o grub_fstest-disk_raid6_recover.o 
grub_fstest-disk_mdraid_linux.o grub_fstest-disk_dmraid_nvidia.o 
grub_fstest-disk_lvm.o grub_fstest-grub_fstest_init.o
+       $(CC) -o $@ grub_fstest-util_grub_fstest.o grub_fstest-util_hostfs.o 
grub_fstest-util_misc.o grub_fstest-kern_file.o grub_fstest-kern_device.o 
grub_fstest-kern_disk.o grub_fstest-kern_err.o grub_fstest-kern_misc.o 
grub_fstest-disk_host.o grub_fstest-disk_loopback.o grub_fstest-normal_arg.o 
grub_fstest-normal_misc.o grub_fstest-lib_hexdump.o grub_fstest-lib_crc.o 
grub_fstest-commands_blocklist.o grub_fstest-commands_ls.o 
grub_fstest-fs_affs.o grub_fstest-fs_cpio.o grub_fstest-fs_ext2.o 
grub_fstest-fs_fat.o grub_fstest-fs_hfs.o grub_fstest-fs_hfsplus.o 
grub_fstest-fs_iso9660.o grub_fstest-fs_udf.o grub_fstest-fs_jfs.o 
grub_fstest-fs_minix.o grub_fstest-fs_ntfs.o grub_fstest-fs_ntfscomp.o 
grub_fstest-fs_reiserfs.o grub_fstest-fs_sfs.o grub_fstest-fs_ufs.o 
grub_fstest-fs_xfs.o grub_fstest-fs_afs.o grub_fstest-kern_partition.o 
grub_fstest-partmap_pc.o grub_fstest-partmap_apple.o grub_fstest-partmap_gpt.o 
grub_fstest-kern_fs.o grub_fstest-kern_env.o grub_fstest-fs_fshelp.o 
grub_fstest-disk_raid.o grub_fstest-disk_raid5_recover.o 
grub_fstest-disk_raid6_recover.o grub_fstest-disk_mdraid_linux.o 
grub_fstest-disk_dmraid_nvidia.o grub_fstest-disk_lvm.o 
grub_fstest-grub_fstest_init.o $(LDFLAGS) $(grub_fstest_LDFLAGS)
 
 grub_fstest-util_grub_fstest.o: util/grub-fstest.c 
$(util/grub-fstest.c_DEPENDENCIES)
        $(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
@@ -387,10 +387,6 @@
        $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
 -include grub_fstest-fs_fshelp.d
 
-grub_fstest-disk_lvm.o: disk/lvm.c $(disk/lvm.c_DEPENDENCIES)
-       $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
--include grub_fstest-disk_lvm.d
-
 grub_fstest-disk_raid.o: disk/raid.c $(disk/raid.c_DEPENDENCIES)
        $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
 -include grub_fstest-disk_raid.d
@@ -411,6 +407,10 @@
        $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
 -include grub_fstest-disk_dmraid_nvidia.d
 
+grub_fstest-disk_lvm.o: disk/lvm.c $(disk/lvm.c_DEPENDENCIES)
+       $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
+-include grub_fstest-disk_lvm.d
+
 grub_fstest-grub_fstest_init.o: grub_fstest_init.c 
$(grub_fstest_init.c_DEPENDENCIES)
        $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
 -include grub_fstest-grub_fstest_init.d

Modified: trunk/grub2/conf/common.rmk
===================================================================
--- trunk/grub2/conf/common.rmk 2009-02-05 18:28:58 UTC (rev 1974)
+++ trunk/grub2/conf/common.rmk 2009-02-07 20:55:48 UTC (rev 1975)
@@ -21,7 +21,7 @@
        \
        partmap/pc.c partmap/apple.c partmap/gpt.c              \
        kern/fs.c kern/env.c fs/fshelp.c                        \
-       disk/lvm.c disk/raid.c disk/mdraid_linux.c grub_probe_init.c
+       disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
 
 ifeq ($(enable_grub_fstest), yes)
 bin_UTILITIES += grub-fstest
@@ -40,9 +40,9 @@
        fs/ufs.c fs/xfs.c fs/afs.c                                      \
        \
        kern/partition.c partmap/pc.c partmap/apple.c partmap/gpt.c     \
-       kern/fs.c kern/env.c fs/fshelp.c disk/lvm.c disk/raid.c         \
+       kern/fs.c kern/env.c fs/fshelp.c disk/raid.c                    \
        disk/raid5_recover.c disk/raid6_recover.c                       \
-       disk/mdraid_linux.c disk/dmraid_nvidia.c                        \
+       disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
        grub_fstest_init.c
 
 # For grub-mkfont.






reply via email to

[Prev in Thread] Current Thread [Next in Thread]