[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1988] 2009-02-10 Felix Zielcke <address@hidden>
From: |
Felix Zielcke |
Subject: |
[1988] 2009-02-10 Felix Zielcke <address@hidden> |
Date: |
Tue, 10 Feb 2009 09:50:24 +0000 |
Revision: 1988
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1988
Author: fzielcke
Date: 2009-02-10 09:50:08 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
2009-02-10 Felix Zielcke <address@hidden>
* fs/fat.c (grub_fat_mount): Fix wrong comparison.
Based on patch from Javier Mart?\195?\173n.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/common.mk
trunk/grub2/conf/i386-pc.mk
trunk/grub2/fs/fat.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-02-09 18:00:36 UTC (rev 1987)
+++ trunk/grub2/ChangeLog 2009-02-10 09:50:08 UTC (rev 1988)
@@ -1,3 +1,9 @@
+2009-02-10 Felix Zielcke <address@hidden>
+
+ * fs/fat.c (grub_fat_mount): Fix wrong comparison.
+
+ Based on patch from Javier MartÃn.
+
2009-02-09 Felix Zielcke <address@hidden>
* conf/common.rmk (grub_probe_SOURCES): Move fs/ext2.c before fs/fat.c
@@ -12,7 +18,7 @@
2009-02-09 Felix Zielcke <address@hidden>
- fs/fat.c (grub_fat_mount): Try to avoid false positives by checking
+ * fs/fat.c (grub_fat_mount): Try to avoid false positives by checking
bpb.version_specific.fat12_or_fat16.fstype and
bpb.version_specific.fat32.fstype.
Modified: trunk/grub2/conf/common.mk
===================================================================
--- trunk/grub2/conf/common.mk 2009-02-09 18:00:36 UTC (rev 1987)
+++ trunk/grub2/conf/common.mk 2009-02-10 09:50:08 UTC (rev 1988)
@@ -33,7 +33,7 @@
kern/device.c kern/disk.c kern/err.c kern/misc.c \
kern/parser.c kern/partition.c kern/file.c \
\
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
+ fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/xfs.c fs/afs.c fs/tar.c \
@@ -41,11 +41,11 @@
partmap/pc.c partmap/apple.c partmap/gpt.c \
kern/fs.c kern/env.c fs/fshelp.c \
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-fs_tar.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-fs_tar.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
+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_fat.o grub_probe-fs_ext2.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-fs_tar.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_fat.d
grub_probe-fs_ext2.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-fs_tar.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-fs_tar.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-fs_tar.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: $(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_fat.o grub_probe-fs_ext2.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-fs_tar.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_fat.o
grub_probe-fs_ext2.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-fs_tar.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 $@ $<
@@ -99,14 +99,14 @@
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_probe_CFLAGS) -MD -c -o $@ $<
-include grub_probe-fs_cpio.d
+grub_probe-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
+ $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_probe_CFLAGS) -MD -c -o $@ $<
+-include grub_probe-fs_fat.d
+
grub_probe-fs_ext2.o: fs/ext2.c $(fs/ext2.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_probe_CFLAGS) -MD -c -o $@ $<
-include grub_probe-fs_ext2.d
-grub_probe-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
- $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_probe_CFLAGS) -MD -c -o $@ $<
--include grub_probe-fs_fat.d
-
grub_probe-fs_hfs.o: fs/hfs.c $(fs/hfs.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_probe_CFLAGS) -MD -c -o $@ $<
-include grub_probe-fs_hfs.d
@@ -215,7 +215,7 @@
disk/host.c disk/loopback.c normal/arg.c normal/misc.c \
lib/hexdump.c lib/crc.c commands/blocklist.c commands/ls.c \
\
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
+ fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/xfs.c fs/afs.c fs/tar.c \
@@ -225,11 +225,11 @@
disk/raid5_recover.c disk/raid6_recover.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-fs_tar.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-fs_tar.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
+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_fat.o grub_fstest-fs_ext2.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-fs_tar.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_fat.d
grub_fstest-fs_ext2.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-fs_tar.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-fs_tar.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-fs_tar.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: $(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_fat.o grub_fstest-fs_ext2.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-fs_tar.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_fat.o
grub_fstest-fs_ext2.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-fs_tar.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 $@ $<
@@ -303,14 +303,14 @@
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
-include grub_fstest-fs_cpio.d
+grub_fstest-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
+ $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
+-include grub_fstest-fs_fat.d
+
grub_fstest-fs_ext2.o: fs/ext2.c $(fs/ext2.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
-include grub_fstest-fs_ext2.d
-grub_fstest-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
- $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
--include grub_fstest-fs_fat.d
-
grub_fstest-fs_hfs.o: fs/hfs.c $(fs/hfs.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_fstest_CFLAGS) -MD -c -o $@ $<
-include grub_fstest-fs_hfs.d
Modified: trunk/grub2/conf/i386-pc.mk
===================================================================
--- trunk/grub2/conf/i386-pc.mk 2009-02-09 18:00:36 UTC (rev 1987)
+++ trunk/grub2/conf/i386-pc.mk 2009-02-10 09:50:08 UTC (rev 1988)
@@ -541,7 +541,7 @@
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
\
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
+ fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/xfs.c fs/afs.c fs/tar.c \
@@ -553,11 +553,11 @@
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_i386_pc_halt.d
grub_emu-commands_reboot.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d
grub_emu-disk_loopback.d grub_emu-disk_scsi.d grub_emu-fs_fshelp.d
grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d
grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_color.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d
grub_emu-partmap_sun.d grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d
grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_ext2.d grub_emu-fs_fat.d
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-util_console.d
grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d
grub_emu-util_hostdisk.d grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d
grub_emu-disk_raid.d grub_emu-disk_raid5_recover.d
grub_emu-disk_raid6_recover.d grub_emu-disk_mdraid_linux.d
grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_i386_pc_halt.d
grub_emu-commands_reboot.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d
grub_emu-disk_loopback.d grub_emu-disk_scsi.d grub_emu-fs_fshelp.d
grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d
grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_color.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d
grub_emu-partmap_sun.d grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d
grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-util_console.d
grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d
grub_emu-util_hostdisk.d grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d
grub_emu-disk_raid.d grub_emu-disk_raid5_recover.d
grub_emu-disk_raid6_recover.d grub_emu-disk_mdraid_linux.d
grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d grub_emu-grub_emu_init.d
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
- $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
$(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
+ $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
$(LDFLAGS) $(grub_emu_LDFLAGS)
grub_emu-commands_boot.o: commands/boot.c $(commands/boot.c_DEPENDENCIES)
$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -795,14 +795,14 @@
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_cpio.d
+grub_emu-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
+ $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-fs_fat.d
+
grub_emu-fs_ext2.o: fs/ext2.c $(fs/ext2.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_ext2.d
-grub_emu-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
- $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
--include grub_emu-fs_fat.d
-
grub_emu-fs_hfs.o: fs/hfs.c $(fs/hfs.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_hfs.d
Modified: trunk/grub2/fs/fat.c
===================================================================
--- trunk/grub2/fs/fat.c 2009-02-09 18:00:36 UTC (rev 1987)
+++ trunk/grub2/fs/fat.c 2009-02-10 09:50:08 UTC (rev 1988)
@@ -187,9 +187,9 @@
if (grub_disk_read (disk, 0, 0, sizeof (bpb), (char *) &bpb))
goto fail;
- if (! grub_strncmp((const char *)
bpb.version_specific.fat12_or_fat16.fstype, "FAT12",5)
- || ! grub_strncmp((const char *)
bpb.version_specific.fat12_or_fat16.fstype, "FAT16",5)
- || ! grub_strncmp((const char *) bpb.version_specific.fat32.fstype,
"FAT32",5))
+ if (grub_strncmp((const char *) bpb.version_specific.fat12_or_fat16.fstype,
"FAT12", 5)
+ && grub_strncmp((const char *)
bpb.version_specific.fat12_or_fat16.fstype, "FAT16", 5)
+ && grub_strncmp((const char *) bpb.version_specific.fat32.fstype,
"FAT32", 5))
goto fail;
/* Get the sizes of logical sectors and clusters. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1988] 2009-02-10 Felix Zielcke <address@hidden>,
Felix Zielcke <=