2008-02-05 Bean <bean123ch@gmail.com>
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Get physical address of entry. (grub_multiboot_load_elf64): Likewise. (grub_multiboot): Initialize mbi structure. * util/grub-fstest.c: Don't include unused header file script.h. * conf/common.rmk (grub-fstest.c_DEPENDENCIES): Move to the begginning of file. (grub_fstest_SOURCES): Likewise.
This commit is contained in:
parent
409480b7a2
commit
c32865bfcf
5 changed files with 243 additions and 213 deletions
|
@ -17,6 +17,26 @@ grub_probe_SOURCES = util/grub-probe.c \
|
|||
kern/fs.c kern/env.c fs/fshelp.c \
|
||||
disk/lvm.c disk/raid.c grub_probe_init.c
|
||||
|
||||
ifeq ($(enable_grub_fstest), yes)
|
||||
bin_UTILITIES += grub-fstest
|
||||
endif
|
||||
|
||||
# For grub-fstest.
|
||||
util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
|
||||
grub_fstest_SOURCES = util/grub-fstest.c util/hostfs.c util/misc.c \
|
||||
kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c \
|
||||
disk/host.c disk/loopback.c normal/arg.c normal/misc.c \
|
||||
io/gzio.c commands/hexdump.c commands/blocklist.c commands/ls.c \
|
||||
\
|
||||
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
|
||||
fs/hfsplus.c fs/iso9660.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 \
|
||||
\
|
||||
kern/partition.c partmap/pc.c partmap/apple.c partmap/gpt.c \
|
||||
kern/fs.c kern/env.c fs/fshelp.c disk/lvm.c disk/raid.c \
|
||||
grub_fstest_init.c
|
||||
|
||||
# For the parser.
|
||||
grub_script.tab.c grub_script.tab.h: normal/parser.y
|
||||
$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
|
||||
|
@ -344,23 +364,3 @@ gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|||
read_mod_SOURCES = commands/read.c
|
||||
read_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
read_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
ifeq ($(enable_grub_fstest), yes)
|
||||
bin_UTILITIES += grub-fstest
|
||||
endif
|
||||
|
||||
# For grub-fstest.
|
||||
util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
|
||||
grub_fstest_SOURCES = util/grub-fstest.c util/hostfs.c util/misc.c \
|
||||
kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c \
|
||||
disk/host.c disk/loopback.c normal/arg.c normal/misc.c \
|
||||
io/gzio.c commands/hexdump.c commands/blocklist.c commands/ls.c \
|
||||
\
|
||||
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
|
||||
fs/hfsplus.c fs/iso9660.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 \
|
||||
\
|
||||
kern/partition.c partmap/pc.c partmap/apple.c partmap/gpt.c \
|
||||
kern/fs.c kern/env.c fs/fshelp.c disk/lvm.c disk/raid.c \
|
||||
grub_fstest_init.c
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue