2007-05-16 Robert Millan <rmh@aybabtu.com>
* util/i386/efi/grub-install.in: New. * conf/i386-efi.rmk: Enable grub-mkdevicemap, grub-probe and the newly added grub-install. * util/biosdisk.c: Remove unnecessary grub/machine/biosdisk.h include. * util/getroot.c: Replace grub/i386/pc/util/biosdisk.h with grub/util/biosdisk.h. * util/grub-probe.c: Replace grub/machine/util/biosdisk.h with grub/util/biosdisk.h.
This commit is contained in:
parent
2d1a40a90c
commit
46b9d12846
8 changed files with 386 additions and 27 deletions
157
conf/i386-efi.mk
157
conf/i386-efi.mk
|
@ -6,7 +6,7 @@ COMMON_LDFLAGS = -melf_i386 -nostdlib
|
|||
|
||||
# Utilities.
|
||||
bin_UTILITIES = grub-mkimage
|
||||
#sbin_UTILITIES = grub-setup grub-mkdevicemap grub-probe
|
||||
sbin_UTILITIES = grub-mkdevicemap grub-probe
|
||||
#ifeq ($(enable_grub_emu), yes)
|
||||
#sbin_UTILITIES += grub-emu
|
||||
#endif
|
||||
|
@ -42,15 +42,144 @@ grub_mkimage-util_resolve.o: util/resolve.c
|
|||
# kern/fs.c kern/env.c fs/fshelp.c
|
||||
|
||||
# For grub-mkdevicemap.
|
||||
#grub_mkdevicemap_SOURCES = util/i386/pc/grub-mkdevicemap.c util/misc.c
|
||||
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
|
||||
CLEANFILES += grub-mkdevicemap grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
|
||||
MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d grub_mkdevicemap-util_misc.d
|
||||
|
||||
grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES) grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
|
||||
$(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
|
||||
|
||||
grub_mkdevicemap-util_grub_mkdevicemap.o: util/grub-mkdevicemap.c
|
||||
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_mkdevicemap-util_grub_mkdevicemap.d
|
||||
|
||||
grub_mkdevicemap-util_misc.o: util/misc.c
|
||||
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_mkdevicemap-util_misc.d
|
||||
|
||||
|
||||
# For grub-probe.
|
||||
#grub_probe_SOURCES = util/i386/pc/grub-probe.c \
|
||||
# util/i386/pc/biosdisk.c util/misc.c util/i386/pc/getroot.c \
|
||||
# kern/device.c kern/disk.c kern/err.c kern/misc.c fs/fat.c \
|
||||
# fs/ext2.c kern/parser.c kern/partition.c partmap/pc.c fs/ufs.c \
|
||||
# fs/minix.c fs/hfs.c fs/jfs.c kern/fs.c kern/env.c fs/fshelp.c \
|
||||
# fs/xfs.c fs/affs.c fs/sfs.c fs/hfsplus.c
|
||||
grub_probe_SOURCES = util/grub-probe.c \
|
||||
util/biosdisk.c util/misc.c util/getroot.c \
|
||||
kern/device.c kern/disk.c kern/err.c kern/misc.c fs/fat.c \
|
||||
fs/ext2.c kern/parser.c kern/partition.c partmap/pc.c \
|
||||
partmap/gpt.c fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/fs.c \
|
||||
kern/env.c fs/fshelp.c fs/xfs.c fs/affs.c fs/sfs.c fs/hfsplus.c \
|
||||
disk/lvm.c disk/raid.c
|
||||
CLEANFILES += grub-probe grub_probe-util_grub_probe.o grub_probe-util_biosdisk.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-fs_fat.o grub_probe-fs_ext2.o grub_probe-kern_parser.o grub_probe-kern_partition.o grub_probe-partmap_pc.o grub_probe-partmap_gpt.o grub_probe-fs_ufs.o grub_probe-fs_minix.o grub_probe-fs_hfs.o grub_probe-fs_jfs.o grub_probe-kern_fs.o grub_probe-kern_env.o grub_probe-fs_fshelp.o grub_probe-fs_xfs.o grub_probe-fs_affs.o grub_probe-fs_sfs.o grub_probe-fs_hfsplus.o grub_probe-disk_lvm.o grub_probe-disk_raid.o
|
||||
MOSTLYCLEANFILES += grub_probe-util_grub_probe.d grub_probe-util_biosdisk.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-fs_fat.d grub_probe-fs_ext2.d grub_probe-kern_parser.d grub_probe-kern_partition.d grub_probe-partmap_pc.d grub_probe-partmap_gpt.d grub_probe-fs_ufs.d grub_probe-fs_minix.d grub_probe-fs_hfs.d grub_probe-fs_jfs.d grub_probe-kern_fs.d grub_probe-kern_env.d grub_probe-fs_fshelp.d grub_probe-fs_xfs.d grub_probe-fs_affs.d grub_probe-fs_sfs.d grub_probe-fs_hfsplus.d grub_probe-disk_lvm.d grub_probe-disk_raid.d
|
||||
|
||||
grub-probe: $(grub_probe_DEPENDENCIES) grub_probe-util_grub_probe.o grub_probe-util_biosdisk.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-fs_fat.o grub_probe-fs_ext2.o grub_probe-kern_parser.o grub_probe-kern_partition.o grub_probe-partmap_pc.o grub_probe-partmap_gpt.o grub_probe-fs_ufs.o grub_probe-fs_minix.o grub_probe-fs_hfs.o grub_probe-fs_jfs.o grub_probe-kern_fs.o grub_probe-kern_env.o grub_probe-fs_fshelp.o grub_probe-fs_xfs.o grub_probe-fs_affs.o grub_probe-fs_sfs.o grub_probe-fs_hfsplus.o grub_probe-disk_lvm.o grub_probe-disk_raid.o
|
||||
$(CC) -o $@ grub_probe-util_grub_probe.o grub_probe-util_biosdisk.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-fs_fat.o grub_probe-fs_ext2.o grub_probe-kern_parser.o grub_probe-kern_partition.o grub_probe-partmap_pc.o grub_probe-partmap_gpt.o grub_probe-fs_ufs.o grub_probe-fs_minix.o grub_probe-fs_hfs.o grub_probe-fs_jfs.o grub_probe-kern_fs.o grub_probe-kern_env.o grub_probe-fs_fshelp.o grub_probe-fs_xfs.o grub_probe-fs_affs.o grub_probe-fs_sfs.o grub_probe-fs_hfsplus.o grub_probe-disk_lvm.o grub_probe-disk_raid.o $(LDFLAGS) $(grub_probe_LDFLAGS)
|
||||
|
||||
grub_probe-util_grub_probe.o: util/grub-probe.c
|
||||
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-util_grub_probe.d
|
||||
|
||||
grub_probe-util_biosdisk.o: util/biosdisk.c
|
||||
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-util_biosdisk.d
|
||||
|
||||
grub_probe-util_misc.o: util/misc.c
|
||||
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-util_misc.d
|
||||
|
||||
grub_probe-util_getroot.o: util/getroot.c
|
||||
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-util_getroot.d
|
||||
|
||||
grub_probe-kern_device.o: kern/device.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_device.d
|
||||
|
||||
grub_probe-kern_disk.o: kern/disk.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_disk.d
|
||||
|
||||
grub_probe-kern_err.o: kern/err.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_err.d
|
||||
|
||||
grub_probe-kern_misc.o: kern/misc.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_misc.d
|
||||
|
||||
grub_probe-fs_fat.o: fs/fat.c
|
||||
$(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
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_ext2.d
|
||||
|
||||
grub_probe-kern_parser.o: kern/parser.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_parser.d
|
||||
|
||||
grub_probe-kern_partition.o: kern/partition.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_partition.d
|
||||
|
||||
grub_probe-partmap_pc.o: partmap/pc.c
|
||||
$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-partmap_pc.d
|
||||
|
||||
grub_probe-partmap_gpt.o: partmap/gpt.c
|
||||
$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-partmap_gpt.d
|
||||
|
||||
grub_probe-fs_ufs.o: fs/ufs.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_ufs.d
|
||||
|
||||
grub_probe-fs_minix.o: fs/minix.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_minix.d
|
||||
|
||||
grub_probe-fs_hfs.o: fs/hfs.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_hfs.d
|
||||
|
||||
grub_probe-fs_jfs.o: fs/jfs.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_jfs.d
|
||||
|
||||
grub_probe-kern_fs.o: kern/fs.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_fs.d
|
||||
|
||||
grub_probe-kern_env.o: kern/env.c
|
||||
$(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-kern_env.d
|
||||
|
||||
grub_probe-fs_fshelp.o: fs/fshelp.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_fshelp.d
|
||||
|
||||
grub_probe-fs_xfs.o: fs/xfs.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_xfs.d
|
||||
|
||||
grub_probe-fs_affs.o: fs/affs.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_affs.d
|
||||
|
||||
grub_probe-fs_sfs.o: fs/sfs.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_sfs.d
|
||||
|
||||
grub_probe-fs_hfsplus.o: fs/hfsplus.c
|
||||
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-fs_hfsplus.d
|
||||
|
||||
grub_probe-disk_lvm.o: disk/lvm.c
|
||||
$(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
|
||||
$(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_probe_CFLAGS) -MD -c -o $@ $<
|
||||
-include grub_probe-disk_raid.d
|
||||
|
||||
|
||||
# For grub-emu.
|
||||
grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \
|
||||
|
@ -75,16 +204,22 @@ 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 \
|
||||
util/console.c util/grub-emu.c util/misc.c \
|
||||
util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
|
||||
util/biosdisk.c util/getroot.c \
|
||||
util/i386/pc/misc.c grub_emu_init.c
|
||||
|
||||
grub_emu_LDFLAGS = $(LIBCURSES)
|
||||
|
||||
# Scripts.
|
||||
#sbin_SCRIPTS = grub-install
|
||||
sbin_SCRIPTS = grub-install
|
||||
|
||||
# For grub-install.
|
||||
#grub_install_SOURCES = util/efi/pc/grub-install.in
|
||||
grub_install_SOURCES = util/i386/efi/grub-install.in
|
||||
CLEANFILES += grub-install
|
||||
|
||||
grub-install: util/i386/efi/grub-install.in config.status
|
||||
./config.status --file=grub-install:util/i386/efi/grub-install.in
|
||||
chmod +x $@
|
||||
|
||||
|
||||
# Modules.
|
||||
pkgdata_MODULES = kernel.mod normal.mod _chain.mod chain.mod \
|
||||
|
|
|
@ -6,7 +6,7 @@ COMMON_LDFLAGS = -melf_i386 -nostdlib
|
|||
|
||||
# Utilities.
|
||||
bin_UTILITIES = grub-mkimage
|
||||
#sbin_UTILITIES = grub-setup grub-mkdevicemap grub-probe
|
||||
sbin_UTILITIES = grub-mkdevicemap grub-probe
|
||||
#ifeq ($(enable_grub_emu), yes)
|
||||
#sbin_UTILITIES += grub-emu
|
||||
#endif
|
||||
|
@ -24,15 +24,16 @@ 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/i386/pc/grub-mkdevicemap.c util/misc.c
|
||||
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
|
||||
|
||||
# For grub-probe.
|
||||
#grub_probe_SOURCES = util/i386/pc/grub-probe.c \
|
||||
# util/i386/pc/biosdisk.c util/misc.c util/i386/pc/getroot.c \
|
||||
# kern/device.c kern/disk.c kern/err.c kern/misc.c fs/fat.c \
|
||||
# fs/ext2.c kern/parser.c kern/partition.c partmap/pc.c fs/ufs.c \
|
||||
# fs/minix.c fs/hfs.c fs/jfs.c kern/fs.c kern/env.c fs/fshelp.c \
|
||||
# fs/xfs.c fs/affs.c fs/sfs.c fs/hfsplus.c
|
||||
grub_probe_SOURCES = util/grub-probe.c \
|
||||
util/biosdisk.c util/misc.c util/getroot.c \
|
||||
kern/device.c kern/disk.c kern/err.c kern/misc.c fs/fat.c \
|
||||
fs/ext2.c kern/parser.c kern/partition.c partmap/pc.c \
|
||||
partmap/gpt.c fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/fs.c \
|
||||
kern/env.c fs/fshelp.c fs/xfs.c fs/affs.c fs/sfs.c fs/hfsplus.c \
|
||||
disk/lvm.c disk/raid.c
|
||||
|
||||
# For grub-emu.
|
||||
grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \
|
||||
|
@ -57,16 +58,16 @@ 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 \
|
||||
util/console.c util/grub-emu.c util/misc.c \
|
||||
util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
|
||||
util/biosdisk.c util/getroot.c \
|
||||
util/i386/pc/misc.c grub_emu_init.c
|
||||
|
||||
grub_emu_LDFLAGS = $(LIBCURSES)
|
||||
|
||||
# Scripts.
|
||||
#sbin_SCRIPTS = grub-install
|
||||
sbin_SCRIPTS = grub-install
|
||||
|
||||
# For grub-install.
|
||||
#grub_install_SOURCES = util/efi/pc/grub-install.in
|
||||
grub_install_SOURCES = util/i386/efi/grub-install.in
|
||||
|
||||
# Modules.
|
||||
pkgdata_MODULES = kernel.mod normal.mod _chain.mod chain.mod \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue