2009-02-09 Felix Zielcke <fzielcke@z-51.de>

	* conf/common.rmk (grub_probe_SOURCES): Move fs/ext2.c before fs/fat.c
	to avoid false posivites with FAT.
	(grub_fstest_SOURCES): Likewise.
	* conf/i386-pc.rmk (grub_emu_SOURCES): Likewise.
	* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9dd5df2199f9b550a987317d93cc917d07df0de0..516c3bb3c9642d4d9b0f911fe332d60b97699d38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-02-09  Felix Zielcke  <fzielcke@z-51.de>
+
+       * conf/common.rmk (grub_probe_SOURCES): Move fs/ext2.c before fs/fat.c
+       to avoid false posivites with FAT.
+       (grub_fstest_SOURCES): Likewise.
+       * conf/i386-pc.rmk (grub_emu_SOURCES): Likewise.
+       * conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
+       * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+       * conf/i386-coreboot.rmk (grub_emu_SOURCES): Likewise.
+       * conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+       * conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+
 2009-02-09  Felix Zielcke  <fzielcke@z-51.de>
 
        fs/fat.c (grub_fat_mount): Try to avoid false positives by checking

diff --git a/conf/common.rmk b/conf/common.rmk
index c7f97dd326445b7f7e6b47282afab2769e269541..dfd481a89101286396b76ee20adb95fc1b382ded 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -14,7 +14,7 @@ grub_probe_SOURCES = util/grub-probe.c        \
        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                     \
@@ -34,7 +34,7 @@ grub_fstest_SOURCES = util/grub-fstest.c util/hostfs.c util/misc.c    \
        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                             \

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 739aeff4d1149a1d0eea9ebda1d354c72369cf7f..f26bf4a369802750c454647b8559c441ff1cf263 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -62,7 +62,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c      \
        lib/hexdump.c commands/i386/cpuid.c                             \
        disk/host.c disk/loopback.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                             \

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 56569a6f0946f00dc111d5c71874e6e30108e82c..90fc2f0352f520bb410ec5f1cf6023174aabffa8 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -61,7 +61,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c      \
        commands/i386/cpuid.c                                           \
        disk/host.c disk/loopback.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                             \

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 0b405e3061c0db7234a70fb86b36d6bc07d400cf..2fd03b5ed233d4902fbfad29ef11fea7933e9bb4 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -134,7 +134,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c    \
        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                             \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 818d645ca294bd06d795479662fc97f58bfc2cb8..b48f303d50a0401f182769786734e51053f0bfa5 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -45,7 +45,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c      \
        lib/hexdump.c commands/halt.c commands/reboot.c                 \
        disk/loopback.c                                                 \
        \
-       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c                 \
+       fs/affs.c fs/cpio.c fs/ext2.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                             \

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 334caeeac9f16a79dc8814cfdfd891b91f0e1738..ce133e9107c181ff2dabd267c59e7b2c5804af6f 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -48,7 +48,7 @@ grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
 #      commands/timeout.c commands/test.c                              \
 #      commands/halt.c commands/reboot.c               \
 #      disk/loopback.c                                                 \
-#      fs/affs.c fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c  \
+#      fs/affs.c fs/fat.c fs/ext2.c fs/fshelp.c fs/hfs.c fs/iso9660.c  \
 #      fs/jfs.c fs/minix.c fs/sfs.c fs/ufs.c fs/xfs.c                  \
 #      grub_script.tab.c                                               \
 #      io/gzio.c                                                       \

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 83d9c8bc5948f2585109419df2cf82c6735bc54e..973260b1376cf73c614db6d2340c78fd0cf80fa4 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -42,7 +42,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c      \
        commands/i386/cpuid.c                                           \
        disk/loopback.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                                      \