vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-01-06 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
Mostly from Vincent Pelletier:

    * fs/reiserfs.c: New file.

    * conf/common.rmk (pkglib_MODULES): Added reiserfs.mod.
    (reiserfs_mod_SOURCES): New variable.
    (reiserfs_mod_CFLAGS): Likewise.
    (reiserfs_mod_LDFLAGS): Likewise.

    * DISTLIST: Added boot/i386/pc/lnxboot.S, commands/hexdump.c,
    disk/ata.c, fs/cpio.c, fs/ntfscomp.c, fs/reiserfs.c,
    include/grub/ntfs.h, include/grub/i386/pc/machine.h, and
    normal/color.c.
This commit is contained in:
okuji 2008-01-06 14:14:31 +00:00
parent 9ce3e7c170
commit 492e6d9d4b
9 changed files with 4911 additions and 3915 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2008-01-06 Yoshinori K. Okuji <okuji@enbug.org>
Mostly from Vincent Pelletier:
* fs/reiserfs.c: New file.
* conf/common.rmk (pkglib_MODULES): Added reiserfs.mod.
(reiserfs_mod_SOURCES): New variable.
(reiserfs_mod_CFLAGS): Likewise.
(reiserfs_mod_LDFLAGS): Likewise.
* DISTLIST: Added boot/i386/pc/lnxboot.S, commands/hexdump.c,
disk/ata.c, fs/cpio.c, fs/ntfscomp.c, fs/reiserfs.c,
include/grub/ntfs.h, include/grub/i386/pc/machine.h, and
normal/color.c.
2008-01-06 Robert Millan <rmh@aybabtu.com> 2008-01-06 Robert Millan <rmh@aybabtu.com>
* normal/color.c: Remove `<grub/env.h>'. * normal/color.c: Remove `<grub/env.h>'.

15
DISTLIST
View file

@ -30,6 +30,7 @@ mkinstalldirs
stamp-h.in stamp-h.in
boot/i386/pc/boot.S boot/i386/pc/boot.S
boot/i386/pc/diskboot.S boot/i386/pc/diskboot.S
boot/i386/pc/lnxboot.S
boot/i386/pc/pxeboot.S boot/i386/pc/pxeboot.S
commands/boot.c commands/boot.c
commands/blocklist.c commands/blocklist.c
@ -38,6 +39,7 @@ commands/cmp.c
commands/configfile.c commands/configfile.c
commands/echo.c commands/echo.c
commands/help.c commands/help.c
commands/hexdump.c
commands/ls.c commands/ls.c
commands/search.c commands/search.c
commands/terminal.c commands/terminal.c
@ -64,6 +66,7 @@ conf/powerpc-ieee1275.mk
conf/powerpc-ieee1275.rmk conf/powerpc-ieee1275.rmk
conf/sparc64-ieee1275.mk conf/sparc64-ieee1275.mk
conf/sparc64-ieee1275.rmk conf/sparc64-ieee1275.rmk
disk/ata.c
disk/host.c disk/host.c
disk/loopback.c disk/loopback.c
disk/lvm.c disk/lvm.c
@ -73,18 +76,21 @@ disk/i386/pc/biosdisk.c
disk/ieee1275/ofdisk.c disk/ieee1275/ofdisk.c
font/manager.c font/manager.c
fs/affs.c fs/affs.c
fs/cpio.c
fs/ext2.c fs/ext2.c
fs/fat.c fs/fat.c
fs/fshelp.c fs/fshelp.c
fs/hfs.c fs/hfs.c
fs/hfsplus.c
fs/iso9660.c fs/iso9660.c
fs/jfs.c fs/jfs.c
fs/minix.c fs/minix.c
fs/ntfs.c fs/ntfs.c
fs/ufs.c fs/ntfscomp.c
fs/reiserfs.c
fs/sfs.c fs/sfs.c
fs/ufs.c
fs/xfs.c fs/xfs.c
fs/hfsplus.c
hello/hello.c hello/hello.c
include/multiboot.h include/multiboot.h
include/multiboot2.h include/multiboot2.h
@ -105,18 +111,19 @@ include/grub/font.h
include/grub/fs.h include/grub/fs.h
include/grub/fshelp.h include/grub/fshelp.h
include/grub/gzio.h include/grub/gzio.h
include/grub/hexdump.h
include/grub/hfs.h include/grub/hfs.h
include/grub/kernel.h include/grub/kernel.h
include/grub/loader.h include/grub/loader.h
include/grub/lvm.h include/grub/lvm.h
include/grub/misc.h include/grub/misc.h
include/grub/mm.h include/grub/mm.h
include/multiboot.h
include/grub/multiboot.h include/grub/multiboot.h
include/grub/multiboot_loader.h include/grub/multiboot_loader.h
include/grub/multiboot2.h include/grub/multiboot2.h
include/grub/net.h include/grub/net.h
include/grub/normal.h include/grub/normal.h
include/grub/ntfs.h
include/grub/parser.h include/grub/parser.h
include/grub/partition.h include/grub/partition.h
include/grub/pc_partition.h include/grub/pc_partition.h
@ -162,6 +169,7 @@ include/grub/i386/pc/console.h
include/grub/i386/pc/init.h include/grub/i386/pc/init.h
include/grub/i386/pc/kernel.h include/grub/i386/pc/kernel.h
include/grub/i386/pc/loader.h include/grub/i386/pc/loader.h
include/grub/i386/pc/machine.h
include/grub/i386/pc/memory.h include/grub/i386/pc/memory.h
include/grub/i386/pc/serial.h include/grub/i386/pc/serial.h
include/grub/i386/pc/time.h include/grub/i386/pc/time.h
@ -259,6 +267,7 @@ loader/powerpc/ieee1275/linux.c
loader/powerpc/ieee1275/linux_normal.c loader/powerpc/ieee1275/linux_normal.c
loader/powerpc/ieee1275/multiboot2.c loader/powerpc/ieee1275/multiboot2.c
normal/arg.c normal/arg.c
normal/color.c
normal/cmdline.c normal/cmdline.c
normal/command.c normal/command.c
normal/completion.c normal/completion.c

2
NEWS
View file

@ -9,7 +9,7 @@ New in 1.96:
* grub-emu can access the host filesystem now. * grub-emu can access the host filesystem now.
* Add support for the NTFS filesystems. * Add support for the NTFS and Reiserfs filesystems.
* Add support for ATA/ATAPI. * Add support for ATA/ATAPI.

54
conf/common.mk
View file

@ -81,7 +81,7 @@ update-grub_DATA += util/grub.d/README
# Filing systems. # Filing systems.
pkglib_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod ntfs.mod \ pkglib_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod ntfs.mod \
ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \ ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \
affs.mod sfs.mod hfsplus.mod cpio.mod affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod
# For fshelp.mod. # For fshelp.mod.
fshelp_mod_SOURCES = fs/fshelp.c fshelp_mod_SOURCES = fs/fshelp.c
@ -811,6 +811,58 @@ fs-hfsplus_mod-fs_hfsplus.lst: fs/hfsplus.c genfslist.sh
hfsplus_mod_CFLAGS = $(COMMON_CFLAGS) hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS) hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For reiserfs.mod.
reiserfs_mod_SOURCES = fs/reiserfs.c
CLEANFILES += reiserfs.mod mod-reiserfs.o mod-reiserfs.c pre-reiserfs.o reiserfs_mod-fs_reiserfs.o und-reiserfs.lst
ifneq ($(reiserfs_mod_EXPORTS),no)
CLEANFILES += def-reiserfs.lst
DEFSYMFILES += def-reiserfs.lst
endif
MOSTLYCLEANFILES += reiserfs_mod-fs_reiserfs.d
UNDSYMFILES += und-reiserfs.lst
reiserfs.mod: pre-reiserfs.o mod-reiserfs.o
-rm -f $@
$(TARGET_CC) $(reiserfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
pre-reiserfs.o: $(reiserfs_mod_DEPENDENCIES) reiserfs_mod-fs_reiserfs.o
-rm -f $@
$(TARGET_CC) $(reiserfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ reiserfs_mod-fs_reiserfs.o
mod-reiserfs.o: mod-reiserfs.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -c -o $@ $<
mod-reiserfs.c: moddep.lst genmodsrc.sh
sh $(srcdir)/genmodsrc.sh 'reiserfs' $< > $@ || (rm -f $@; exit 1)
ifneq ($(reiserfs_mod_EXPORTS),no)
def-reiserfs.lst: pre-reiserfs.o
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 reiserfs/' > $@
endif
und-reiserfs.lst: pre-reiserfs.o
echo 'reiserfs' > $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
reiserfs_mod-fs_reiserfs.o: fs/reiserfs.c
$(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -MD -c -o $@ $<
-include reiserfs_mod-fs_reiserfs.d
CLEANFILES += cmd-reiserfs_mod-fs_reiserfs.lst fs-reiserfs_mod-fs_reiserfs.lst
COMMANDFILES += cmd-reiserfs_mod-fs_reiserfs.lst
FSFILES += fs-reiserfs_mod-fs_reiserfs.lst
cmd-reiserfs_mod-fs_reiserfs.lst: fs/reiserfs.c gencmdlist.sh
set -e; $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh reiserfs > $@ || (rm -f $@; exit 1)
fs-reiserfs_mod-fs_reiserfs.lst: fs/reiserfs.c genfslist.sh
set -e; $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh reiserfs > $@ || (rm -f $@; exit 1)
reiserfs_mod_CFLAGS = $(COMMON_CFLAGS)
reiserfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For cpio.mod. # For cpio.mod.
cpio_mod_SOURCES = fs/cpio.c cpio_mod_SOURCES = fs/cpio.c
CLEANFILES += cpio.mod mod-cpio.o mod-cpio.c pre-cpio.o cpio_mod-fs_cpio.o und-cpio.lst CLEANFILES += cpio.mod mod-cpio.o mod-cpio.c pre-cpio.o cpio_mod-fs_cpio.o und-cpio.lst

7
conf/common.rmk
View file

@ -81,7 +81,7 @@ update-grub_DATA += util/grub.d/README
# Filing systems. # Filing systems.
pkglib_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod ntfs.mod \ pkglib_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod ntfs.mod \
ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \ ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \
affs.mod sfs.mod hfsplus.mod cpio.mod affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod
# For fshelp.mod. # For fshelp.mod.
fshelp_mod_SOURCES = fs/fshelp.c fshelp_mod_SOURCES = fs/fshelp.c
@ -153,6 +153,11 @@ hfsplus_mod_SOURCES = fs/hfsplus.c
hfsplus_mod_CFLAGS = $(COMMON_CFLAGS) hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS) hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For reiserfs.mod.
reiserfs_mod_SOURCES = fs/reiserfs.c
reiserfs_mod_CFLAGS = $(COMMON_CFLAGS)
reiserfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For cpio.mod. # For cpio.mod.
cpio_mod_SOURCES = fs/cpio.c cpio_mod_SOURCES = fs/cpio.c
cpio_mod_CFLAGS = $(COMMON_CFLAGS) cpio_mod_CFLAGS = $(COMMON_CFLAGS)

25
conf/i386-linuxbios.mk
View file

@ -792,13 +792,13 @@ normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \ normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \
normal/menu_entry.c normal/misc.c grub_script.tab.c \ normal/menu_entry.c normal/misc.c grub_script.tab.c \
normal/script.c normal/i386/setjmp.S normal/script.c normal/i386/setjmp.S normal/color.c
CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o normal_mod-normal_color.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no) ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst DEFSYMFILES += def-normal.lst
endif endif
MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d normal_mod-normal_command.d normal_mod-normal_completion.d normal_mod-normal_execute.d normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d normal_mod-normal_menu_entry.d normal_mod-normal_misc.d normal_mod-grub_script_tab.d normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d normal_mod-normal_command.d normal_mod-normal_completion.d normal_mod-normal_execute.d normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d normal_mod-normal_menu_entry.d normal_mod-normal_misc.d normal_mod-grub_script_tab.d normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d normal_mod-normal_color.d
UNDSYMFILES += und-normal.lst UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o normal.mod: pre-normal.o mod-normal.o
@ -806,9 +806,9 @@ normal.mod: pre-normal.o mod-normal.o
$(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o normal_mod-normal_color.o
-rm -f $@ -rm -f $@
$(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o normal_mod-normal_color.o
mod-normal.o: mod-normal.c mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $< $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
@ -1035,6 +1035,21 @@ fs-normal_mod-normal_i386_setjmp.lst: normal/i386/setjmp.S genfslist.sh
set -e; $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 $(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $< | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1) set -e; $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 $(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $< | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
normal_mod-normal_color.o: normal/color.c
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
CLEANFILES += cmd-normal_mod-normal_color.lst fs-normal_mod-normal_color.lst
COMMANDFILES += cmd-normal_mod-normal_color.lst
FSFILES += fs-normal_mod-normal_color.lst
cmd-normal_mod-normal_color.lst: normal/color.c gencmdlist.sh
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
fs-normal_mod-normal_color.lst: normal/color.c genfslist.sh
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
normal_mod_CFLAGS = $(COMMON_CFLAGS) normal_mod_CFLAGS = $(COMMON_CFLAGS)
normal_mod_ASFLAGS = $(COMMON_ASFLAGS) normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
normal_mod_LDFLAGS = $(COMMON_LDFLAGS) normal_mod_LDFLAGS = $(COMMON_LDFLAGS)

4
config.h.in
View file

@ -88,10 +88,10 @@
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* The size of `long', as computed by sizeof. */ /* The size of a `long', as computed by sizeof. */
#undef SIZEOF_LONG #undef SIZEOF_LONG
/* The size of `void *', as computed by sizeof. */ /* The size of a `void *', as computed by sizeof. */
#undef SIZEOF_VOID_P #undef SIZEOF_VOID_P
/* Define it to either start or _start */ /* Define it to either start or _start */

7302
configure vendored
View file

File diff suppressed because it is too large Load diff

1401
fs/reiserfs.c Normal file
View file

File diff suppressed because it is too large Load diff