2009-10-03 Robert Millan <rmh.grub@aybabtu.com>

        Resync grub-mkdevicemap in x86_64-efi.

        * conf/x86_64-efi.rmk (sbin_UTILITIES): Enable `grub-mkdevicemap'.
        (grub_mkdevicemap_SOURCES): Add missing `util/deviceiter.c' and
        `util/devicemap.c'.

diff --git a/ChangeLog b/ChangeLog
index b2d1a7085d958f079c01747d9961bb3c5249c252..70adb66fbfcf01c28b5dace55386747ac5f11f95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-03  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Resync grub-mkdevicemap in x86_64-efi.
+
+       * conf/x86_64-efi.rmk (sbin_UTILITIES): Enable `grub-mkdevicemap'.
+       (grub_mkdevicemap_SOURCES): Add missing `util/deviceiter.c' and
+       `util/devicemap.c'.
+
 2009-10-01  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-editenv.c (create_envblk_file): Write new block with a

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 934cd7284b343a2be6bf940e60322a7d2f929a43..5be1b404f57b300b566690f5bcb60e00e6c9a24c 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -9,7 +9,7 @@ script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Utilities.
 bin_UTILITIES = grub-mkimage
-#sbin_UTILITIES = grub-mkdevicemap
+sbin_UTILITIES = grub-mkdevicemap
 #ifeq ($(enable_grub_emu), yes)
 #sbin_UTILITIES += grub-emu
 #endif
@@ -27,7 +27,8 @@ grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \
 #      kern/fs.c kern/env.c fs/fshelp.c
 
 # For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
+       util/devicemap.c util/misc.c
 
 # For grub-emu.
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h