build fixes for real platforms

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a5a1b08ea54f62aa8556d62b322f9f5b45c5f0f3..abefb4d84470fef65ed56a3c272657711451f0fb 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -67,30 +67,29 @@ sbin_UTILITIES = grub-setup
 
 # For grub-mkimage.
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
-       util/resolve.c lib/LzmaEnc.c lib/LzFind.c
+       kern/emu/misc.c util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = gnulib/progname.c \
-       util/i386/pc/grub-setup.c util/hostdisk.c       \
-       util/misc.c util/getroot.c kern/device.c kern/disk.c    \
-       kern/err.c kern/misc.c kern/parser.c kern/partition.c   \
-       kern/file.c kern/fs.c kern/env.c kern/list.c            \
-       fs/fshelp.c                                             \
-       \
-       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c          \
-       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c   \
-       fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c       \
-       fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c           \
-       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c             \
-       \
-       partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c      \
-       partmap/gpt.c           \
-       \
-       disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
-       util/raid.c util/lvm.c util/mm.c                        \
+grub_setup_SOURCES = gnulib/progname.c util/i386/pc/grub-setup.c       \
+       util/misc.c kern/emu/misc.c kern/emu/getroot.c                  \
+       kern/emu/hostdisk.c kern/device.c kern/disk.c kern/err.c        \
+       kern/misc.c kern/parser.c kern/partition.c kern/file.c          \
+       kern/emu/mm.c kern/fs.c kern/env.c kern/list.c fs/fshelp.c      \
+                                                                       \
+       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c                 \
+       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
+       fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c               \
+       fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c                   \
+       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c                     \
+                                                                       \
+       partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c              \
+       partmap/gpt.c                                                   \
+                                                                       \
+       disk/raid.c disk/mdraid_linux.c disk/lvm.c                      \
+       util/raid.c util/lvm.c                                          \
        grub_setup_init.c
 
 sbin_SCRIPTS += grub-install

diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 664bef12a3d8bbf4da0865f2ad96cb5643efc621..d5a18a78c4c7028f79984ba4c4c28f172786fb20 100644 (file)
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -14,7 +14,7 @@ boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LI
 boot_img_FORMAT = binary
 
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c kern/emu/misc.c \
        util/resolve.c gnulib/progname.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 4603c219e0a80c5d65c32d6e4fc72d0215292dfd..6e13ace29ed35bb4650a63f397660f441bc0816e 100644 (file)
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -13,7 +13,7 @@ bin_SCRIPTS =
 # For grub-mkimage.
 bin_UTILITIES += grub-mkimage
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
-       util/resolve.c lib/LzmaEnc.c lib/LzFind.c
+       kern/emu/misc.c util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index f0c9b0db79842924d5bc0c05c0e11a86e37a7ffb..99128f918572034e094e4ce0588bec0a7244ef43 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -44,34 +44,34 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c kern/emu/misc.c \
         util/resolve.c gnulib/progname.c
 
 # For grub-setup.
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c        \
-       util/ieee1275/ofpath.c \
-       util/misc.c util/getroot.c kern/device.c kern/disk.c    \
-       kern/err.c kern/misc.c kern/parser.c kern/partition.c   \
-       kern/file.c kern/fs.c kern/env.c kern/list.c            \
-       fs/fshelp.c                                             \
-       \
-       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c         \
-       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c  \
-       fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c       \
-       fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c           \
-       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c             \
-       \
-       partmap/amiga.c partmap/apple.c partmap/msdos.c         \
-       partmap/bsdlabel.c partmap/sun.c partmap/acorn.c        \
-       \
-       disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
-       util/raid.c util/lvm.c util/mm.c gnulib/progname.c      \
-       grub_setup_init.c
+grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c                        \
+       util/ieee1275/ofpath.c util/misc.c kern/emu/hostdisk.c          \
+       kern/emu/misc.c kern/emu/getroot.c kern/emu/mm.c kern/device.c  \
+       kern/disk.c kern/err.c kern/misc.c kern/parser.c                \
+       kern/partition.c kern/file.c kern/fs.c kern/env.c kern/list.c   \
+       fs/fshelp.c                                                     \
+                                                                       \
+       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c                 \
+       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
+       fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c               \
+       fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c                   \
+       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c                     \
+                                                                       \
+       partmap/amiga.c partmap/apple.c partmap/msdos.c                 \
+       partmap/bsdlabel.c partmap/sun.c partmap/acorn.c                \
+                                                                       \
+       disk/raid.c disk/mdraid_linux.c disk/lvm.c util/raid.c          \
+       util/lvm.c gnulib/progname.c grub_setup_init.c
 
 # For grub-ofpathname.
-grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
-       util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
+grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c      \
+       util/ieee1275/ofpath.c util/misc.c kern/emu/misc.c      \
+       gnulib/progname.c
 
 # Scripts.
 sbin_SCRIPTS = grub-install

diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index e29dad64539a183c0a495e9ad369cd3b998394f3..7d7d9a3e1a25dd9d4eb2672bea6d70630e9ca145 100644 (file)
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -5,7 +5,7 @@ bin_UTILITIES = grub-mkimage
 
 # For grub-mkimage.
 grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
-       util/misc.c util/resolve.c
+       util/misc.c kern/emu/misc.c util/resolve.c
 util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # Scripts.

diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 63fa8c3289d11022339ea6d553a31a2ce5382843..be6224f7fcea54a0e1b2926bb54c8e8c512add80 100644 (file)
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -28,14 +28,14 @@
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
 #include <grub/i18n.h>
 #include <grub/util/raid.h>
 #include <grub/util/lvm.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
 
@@ -423,7 +423,7 @@ unable_to_embed:
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
   core_path_dev_full = grub_util_get_path (dir, core_file);
-  core_path_dev = make_system_path_relative_to_its_root (core_path_dev_full);
+  core_path_dev = grub_make_system_path_relative_to_its_root (core_path_dev_full);
   free (core_path_dev_full);
 
   /* It is a Good Thing to sync two times.  */

diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 06bc16795ec2608be972589feea432d8282fdbd6..a46a22f8721b0b97be1c2650ce91a4dc23ea4183 100644 (file)
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -29,7 +29,7 @@
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 #define _GNU_SOURCE    1
 #include <getopt.h>