2005-08-22 Yoshinori K. Okuji <okuji@enbug.org>
* gendistlist.sh (EXTRA_DISTFILES): Added genfslist.sh.
(DISTDIRS): Added io and video.
Rewrite the search routine to make an output consistently.
* DISTLIST: Added conf/sparc64-ieee1275.mk,
conf/sparc64-ieee1275.rmk, include/grub/gzio.h,
include/grub/ieee1275/ieee1275.h, include/grub/ieee1275/ofdisk.h,
io/gzio.c, kern/sparc64/cache.c, kern/sparc64/dl.c,
kern/sparc64/ieee1275/init.c, kern/sparc64/ieee1275/openfw.c and
util/powerpc/ieee1275/misc.c.
* include/grub/gzio.h: New file.
* io/gzio.c: Likewise.
* kern/file.c (grub_file_close): Call grub_device_close only if
FILE->DEVICE is not NULL.
* include/grub/mm.h [!NULL] (NULL): New macro.
* include/grub/err.h (GRUB_ERR_BAD_GZIP_DATA): New constant.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Added io/gzip.c.
(pkgdata_MODULES): Added gzio.mod.
(gzio_mod_SOURCES): New variable.
(gzio_mod_CFLAGS): Likewise.
* conf/i386-pc.rmk (grub_emu_SOURCES): Added io/gzip.c.
(pkgdata_MODULES): Added gzio.mod.
(gzio_mod_SOURCES): New variable.
(gzio_mod_CFLAGS): Likewise.
* commands/cat.c: Include grub/gzio.h.
(grub_cmd_cat): Use grub_gzfile_open instead of
grub_file_open.
* commands/cmp.c: Include grub/gzio.h.
(grub_cmd_cmp): Use grub_gzfile_open instead of
grub_file_open.
* loader/i386/pc/multiboot.c: Include grub/gzio.h.
(grub_rescue_cmd_multiboot): Use grub_gzfile_open instead of
grub_file_open.
(grub_rescue_cmd_module): Likewise.
This commit is contained in:
okuji
parent
fa46f4b5b6
commit
d9864ee11a
16 changed files with 1511 additions and 78 deletions
46
ChangeLog
46
ChangeLog
|
|
@ -1,3 +1,49 @@
|
|||
2005-08-22 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
|
||||
* gendistlist.sh (EXTRA_DISTFILES): Added genfslist.sh.
|
||||
(DISTDIRS): Added io and video.
|
||||
Rewrite the search routine to make an output consistently.
|
||||
|
||||
* DISTLIST: Added conf/sparc64-ieee1275.mk,
|
||||
conf/sparc64-ieee1275.rmk, include/grub/gzio.h,
|
||||
include/grub/ieee1275/ieee1275.h, include/grub/ieee1275/ofdisk.h,
|
||||
io/gzio.c, kern/sparc64/cache.c, kern/sparc64/dl.c,
|
||||
kern/sparc64/ieee1275/init.c, kern/sparc64/ieee1275/openfw.c and
|
||||
util/powerpc/ieee1275/misc.c.
|
||||
|
||||
* include/grub/gzio.h: New file.
|
||||
* io/gzio.c: Likewise.
|
||||
|
||||
* kern/file.c (grub_file_close): Call grub_device_close only if
|
||||
FILE->DEVICE is not NULL.
|
||||
|
||||
* include/grub/mm.h [!NULL] (NULL): New macro.
|
||||
|
||||
* include/grub/err.h (GRUB_ERR_BAD_GZIP_DATA): New constant.
|
||||
|
||||
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Added io/gzip.c.
|
||||
(pkgdata_MODULES): Added gzio.mod.
|
||||
(gzio_mod_SOURCES): New variable.
|
||||
(gzio_mod_CFLAGS): Likewise.
|
||||
|
||||
* conf/i386-pc.rmk (grub_emu_SOURCES): Added io/gzip.c.
|
||||
(pkgdata_MODULES): Added gzio.mod.
|
||||
(gzio_mod_SOURCES): New variable.
|
||||
(gzio_mod_CFLAGS): Likewise.
|
||||
|
||||
* commands/cat.c: Include grub/gzio.h.
|
||||
(grub_cmd_cat): Use grub_gzfile_open instead of
|
||||
grub_file_open.
|
||||
|
||||
* commands/cmp.c: Include grub/gzio.h.
|
||||
(grub_cmd_cmp): Use grub_gzfile_open instead of
|
||||
grub_file_open.
|
||||
|
||||
* loader/i386/pc/multiboot.c: Include grub/gzio.h.
|
||||
(grub_rescue_cmd_multiboot): Use grub_gzfile_open instead of
|
||||
grub_file_open.
|
||||
(grub_rescue_cmd_module): Likewise.
|
||||
|
||||
2005-08-21 Vincent Pelletier <subdino2004@yahoo.fr>
|
||||
|
||||
* conf/sparc64-ieee1275.rmk (grubof_SOURCES): The first file must be
|
||||
|
|
|
|||
127
DISTLIST
127
DISTLIST
|
|
@ -30,13 +30,6 @@ boot/i386/pc/diskboot.S
|
|||
boot/i386/pc/pxeboot.S
|
||||
boot/powerpc/ieee1275/cmain.c
|
||||
boot/powerpc/ieee1275/crt0.S
|
||||
commands/i386/pc/halt.c
|
||||
commands/i386/pc/reboot.c
|
||||
commands/i386/pc/vbeinfo.c
|
||||
commands/i386/pc/vbetest.c
|
||||
commands/ieee1275/halt.c
|
||||
commands/ieee1275/reboot.c
|
||||
commands/ieee1275/suspend.c
|
||||
commands/boot.c
|
||||
commands/cat.c
|
||||
commands/cmp.c
|
||||
|
|
@ -47,13 +40,22 @@ commands/ls.c
|
|||
commands/search.c
|
||||
commands/terminal.c
|
||||
commands/timeout.c
|
||||
commands/i386/pc/halt.c
|
||||
commands/i386/pc/reboot.c
|
||||
commands/i386/pc/vbeinfo.c
|
||||
commands/i386/pc/vbetest.c
|
||||
commands/ieee1275/halt.c
|
||||
commands/ieee1275/reboot.c
|
||||
commands/ieee1275/suspend.c
|
||||
conf/i386-pc.mk
|
||||
conf/i386-pc.rmk
|
||||
conf/powerpc-ieee1275.mk
|
||||
conf/powerpc-ieee1275.rmk
|
||||
conf/sparc64-ieee1275.mk
|
||||
conf/sparc64-ieee1275.rmk
|
||||
disk/loopback.c
|
||||
disk/i386/pc/biosdisk.c
|
||||
disk/ieee1275/ofdisk.c
|
||||
disk/loopback.c
|
||||
font/manager.c
|
||||
fs/ext2.c
|
||||
fs/fat.c
|
||||
|
|
@ -64,36 +66,6 @@ fs/jfs.c
|
|||
fs/minix.c
|
||||
fs/ufs.c
|
||||
hello/hello.c
|
||||
include/grub/i386/pc/util/biosdisk.h
|
||||
include/grub/i386/pc/biosdisk.h
|
||||
include/grub/i386/pc/boot.h
|
||||
include/grub/i386/pc/chainloader.h
|
||||
include/grub/i386/pc/console.h
|
||||
include/grub/i386/pc/init.h
|
||||
include/grub/i386/pc/kernel.h
|
||||
include/grub/i386/pc/linux.h
|
||||
include/grub/i386/pc/loader.h
|
||||
include/grub/i386/pc/memory.h
|
||||
include/grub/i386/pc/multiboot.h
|
||||
include/grub/i386/pc/time.h
|
||||
include/grub/i386/pc/vbe.h
|
||||
include/grub/i386/pc/vga.h
|
||||
include/grub/i386/setjmp.h
|
||||
include/grub/i386/types.h
|
||||
include/grub/powerpc/ieee1275/util/biosdisk.h
|
||||
include/grub/powerpc/ieee1275/biosdisk.h
|
||||
include/grub/powerpc/ieee1275/console.h
|
||||
include/grub/powerpc/ieee1275/ieee1275.h
|
||||
include/grub/powerpc/ieee1275/kernel.h
|
||||
include/grub/powerpc/ieee1275/loader.h
|
||||
include/grub/powerpc/ieee1275/multiboot.h
|
||||
include/grub/powerpc/ieee1275/time.h
|
||||
include/grub/powerpc/libgcc.h
|
||||
include/grub/powerpc/setjmp.h
|
||||
include/grub/powerpc/types.h
|
||||
include/grub/util/getroot.h
|
||||
include/grub/util/misc.h
|
||||
include/grub/util/resolve.h
|
||||
include/grub/arg.h
|
||||
include/grub/boot.h
|
||||
include/grub/cache.h
|
||||
|
|
@ -107,6 +79,7 @@ include/grub/file.h
|
|||
include/grub/font.h
|
||||
include/grub/fs.h
|
||||
include/grub/fshelp.h
|
||||
include/grub/gzio.h
|
||||
include/grub/kernel.h
|
||||
include/grub/loader.h
|
||||
include/grub/misc.h
|
||||
|
|
@ -120,15 +93,45 @@ include/grub/setjmp.h
|
|||
include/grub/symbol.h
|
||||
include/grub/term.h
|
||||
include/grub/types.h
|
||||
kern/i386/pc/init.c
|
||||
kern/i386/pc/lzo1x.S
|
||||
kern/i386/pc/startup.S
|
||||
kern/i386/dl.c
|
||||
kern/ieee1275/ieee1275.c
|
||||
kern/powerpc/ieee1275/init.c
|
||||
kern/powerpc/ieee1275/openfw.c
|
||||
kern/powerpc/cache.S
|
||||
kern/powerpc/dl.c
|
||||
include/grub/i386/setjmp.h
|
||||
include/grub/i386/types.h
|
||||
include/grub/i386/pc/biosdisk.h
|
||||
include/grub/i386/pc/boot.h
|
||||
include/grub/i386/pc/chainloader.h
|
||||
include/grub/i386/pc/console.h
|
||||
include/grub/i386/pc/init.h
|
||||
include/grub/i386/pc/kernel.h
|
||||
include/grub/i386/pc/linux.h
|
||||
include/grub/i386/pc/loader.h
|
||||
include/grub/i386/pc/memory.h
|
||||
include/grub/i386/pc/multiboot.h
|
||||
include/grub/i386/pc/time.h
|
||||
include/grub/i386/pc/vbe.h
|
||||
include/grub/i386/pc/vga.h
|
||||
include/grub/i386/pc/util/biosdisk.h
|
||||
include/grub/ieee1275/ieee1275.h
|
||||
include/grub/ieee1275/ofdisk.h
|
||||
include/grub/powerpc/libgcc.h
|
||||
include/grub/powerpc/setjmp.h
|
||||
include/grub/powerpc/types.h
|
||||
include/grub/powerpc/ieee1275/biosdisk.h
|
||||
include/grub/powerpc/ieee1275/console.h
|
||||
include/grub/powerpc/ieee1275/ieee1275.h
|
||||
include/grub/powerpc/ieee1275/kernel.h
|
||||
include/grub/powerpc/ieee1275/loader.h
|
||||
include/grub/powerpc/ieee1275/multiboot.h
|
||||
include/grub/powerpc/ieee1275/time.h
|
||||
include/grub/powerpc/ieee1275/util/biosdisk.h
|
||||
include/grub/sparc64/setjmp.h
|
||||
include/grub/sparc64/types.h
|
||||
include/grub/sparc64/ieee1275/console.h
|
||||
include/grub/sparc64/ieee1275/ieee1275.h
|
||||
include/grub/sparc64/ieee1275/kernel.h
|
||||
include/grub/sparc64/ieee1275/time.h
|
||||
include/grub/util/getroot.h
|
||||
include/grub/util/misc.h
|
||||
include/grub/util/resolve.h
|
||||
io/gzio.c
|
||||
kern/device.c
|
||||
kern/disk.c
|
||||
kern/dl.c
|
||||
|
|
@ -143,6 +146,19 @@ kern/mm.c
|
|||
kern/partition.c
|
||||
kern/rescue.c
|
||||
kern/term.c
|
||||
kern/i386/dl.c
|
||||
kern/i386/pc/init.c
|
||||
kern/i386/pc/lzo1x.S
|
||||
kern/i386/pc/startup.S
|
||||
kern/ieee1275/ieee1275.c
|
||||
kern/powerpc/cache.S
|
||||
kern/powerpc/dl.c
|
||||
kern/powerpc/ieee1275/init.c
|
||||
kern/powerpc/ieee1275/openfw.c
|
||||
kern/sparc64/cache.c
|
||||
kern/sparc64/dl.c
|
||||
kern/sparc64/ieee1275/init.c
|
||||
kern/sparc64/ieee1275/openfw.c
|
||||
loader/i386/pc/chainloader.c
|
||||
loader/i386/pc/chainloader_normal.c
|
||||
loader/i386/pc/linux.c
|
||||
|
|
@ -151,8 +167,6 @@ loader/i386/pc/multiboot.c
|
|||
loader/i386/pc/multiboot_normal.c
|
||||
loader/powerpc/ieee1275/linux.c
|
||||
loader/powerpc/ieee1275/linux_normal.c
|
||||
normal/i386/setjmp.S
|
||||
normal/powerpc/setjmp.S
|
||||
normal/arg.c
|
||||
normal/cmdline.c
|
||||
normal/command.c
|
||||
|
|
@ -162,6 +176,8 @@ normal/main.c
|
|||
normal/menu.c
|
||||
normal/menu_entry.c
|
||||
normal/misc.c
|
||||
normal/i386/setjmp.S
|
||||
normal/powerpc/setjmp.S
|
||||
partmap/amiga.c
|
||||
partmap/apple.c
|
||||
partmap/pc.c
|
||||
|
|
@ -170,6 +186,12 @@ term/i386/pc/console.c
|
|||
term/i386/pc/vesafb.c
|
||||
term/i386/pc/vga.c
|
||||
term/ieee1275/ofconsole.c
|
||||
util/console.c
|
||||
util/genmoddep.c
|
||||
util/grub-emu.c
|
||||
util/misc.c
|
||||
util/resolve.c
|
||||
util/unifont2pff.rb
|
||||
util/i386/pc/biosdisk.c
|
||||
util/i386/pc/getroot.c
|
||||
util/i386/pc/grub-install.in
|
||||
|
|
@ -179,10 +201,5 @@ util/i386/pc/grub-probefs.c
|
|||
util/i386/pc/grub-setup.c
|
||||
util/i386/pc/misc.c
|
||||
util/powerpc/ieee1275/grub-mkimage.c
|
||||
util/console.c
|
||||
util/genmoddep.c
|
||||
util/grub-emu.c
|
||||
util/misc.c
|
||||
util/resolve.c
|
||||
util/unifont2pff.rb
|
||||
util/powerpc/ieee1275/misc.c
|
||||
video/i386/pc/vbe.c
|
||||
|
|
|
|||
2
NEWS
2
NEWS
|
|
@ -10,6 +10,8 @@ New in 1.91:
|
|||
|
||||
* The option BOOT_IMAGE is passed to Linux.
|
||||
|
||||
* Add support for automatic decompression for gzip.
|
||||
|
||||
|
||||
New in 1.90 - 2005-08-07:
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include <grub/disk.h>
|
||||
#include <grub/term.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/gzio.h>
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_cat (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
|
|
@ -38,7 +39,7 @@ grub_cmd_cat (struct grub_arg_list *state __attribute__ ((unused)),
|
|||
if (argc != 1)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
|
||||
|
||||
file = grub_file_open (args[0]);
|
||||
file = grub_gzfile_open (args[0], 1);
|
||||
if (! file)
|
||||
return 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include <grub/misc.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/gzio.h>
|
||||
|
||||
#define BUFFER_SIZE 512
|
||||
|
||||
|
|
@ -45,8 +46,8 @@ grub_cmd_cmp (struct grub_arg_list *state __attribute__ ((unused)),
|
|||
grub_printf ("Compare `%s' and `%s':\n", args[0],
|
||||
args[1]);
|
||||
|
||||
if (! (file1 = grub_file_open (args[0]) ) ||
|
||||
! (file2 = grub_file_open (args[1]) ) )
|
||||
if (! (file1 = grub_gzfile_open (args[0], 1) ) ||
|
||||
! (file2 = grub_gzfile_open (args[1], 1) ) )
|
||||
goto cleanup;
|
||||
|
||||
if (grub_file_size (file1) != grub_file_size (file2))
|
||||
|
|
|
|||
|
|
@ -680,6 +680,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|||
disk/loopback.c \
|
||||
fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c fs/jfs.c \
|
||||
fs/minix.c fs/ufs.c \
|
||||
io/gzio.c \
|
||||
kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
|
||||
kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c \
|
||||
kern/partition.c kern/rescue.c kern/term.c \
|
||||
|
|
@ -690,10 +691,10 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|||
util/console.c util/grub-emu.c util/misc.c \
|
||||
util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
|
||||
util/i386/pc/misc.c
|
||||
CLEANFILES += grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_search.o grub_emu-commands_timeout.o grub_emu-commands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o
|
||||
MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_default.d grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d grub_emu-commands_search.d grub_emu-commands_timeout.d grub_emu-commands_i386_pc_halt.d grub_emu-commands_i386_pc_reboot.d grub_emu-disk_loopback.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_fshelp.d grub_emu-fs_hfs.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ufs.d grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_completion.d grub_emu-normal_context.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-normal_misc.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-util_console.d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_i386_pc_biosdisk.d grub_emu-util_i386_pc_getroot.d grub_emu-util_i386_pc_misc.d
|
||||
CLEANFILES += grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_search.o grub_emu-commands_timeout.o grub_emu-commands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o
|
||||
MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_default.d grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d grub_emu-commands_search.d grub_emu-commands_timeout.d grub_emu-commands_i386_pc_halt.d grub_emu-commands_i386_pc_reboot.d grub_emu-disk_loopback.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_fshelp.d grub_emu-fs_hfs.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ufs.d grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_completion.d grub_emu-normal_context.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-normal_misc.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-util_console.d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_i386_pc_biosdisk.d grub_emu-util_i386_pc_getroot.d grub_emu-util_i386_pc_misc.d
|
||||
|
||||
grub-emu: grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_search.o grub_emu-commands_timeout.o grub_emu-commands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o
|
||||
grub-emu: grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_search.o grub_emu-commands_timeout.o grub_emu-commands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o
|
||||
$(BUILD_CC) -o $@ $^ $(BUILD_LDFLAGS) $(grub_emu_LDFLAGS)
|
||||
|
||||
grub_emu-commands_boot.o: commands/boot.c
|
||||
|
|
@ -864,6 +865,14 @@ grub_emu-fs_ufs.d: fs/ufs.c
|
|||
|
||||
-include grub_emu-fs_ufs.d
|
||||
|
||||
grub_emu-io_gzio.o: io/gzio.c
|
||||
$(BUILD_CC) -Iio -I$(srcdir)/io $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -c -o $@ $<
|
||||
|
||||
grub_emu-io_gzio.d: io/gzio.c
|
||||
set -e; $(BUILD_CC) -Iio -I$(srcdir)/io $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -M $< | sed 's,gzio\.o[ :]*,grub_emu-io_gzio.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include grub_emu-io_gzio.d
|
||||
|
||||
grub_emu-kern_device.o: kern/device.c
|
||||
$(BUILD_CC) -Ikern -I$(srcdir)/kern $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -c -o $@ $<
|
||||
|
||||
|
|
@ -1159,7 +1168,7 @@ pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod \
|
|||
terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod \
|
||||
apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod \
|
||||
help.mod default.mod timeout.mod configfile.mod vbe.mod \
|
||||
vesafb.mod vbetest.mod vbeinfo.mod search.mod
|
||||
vesafb.mod vbetest.mod vbeinfo.mod search.mod gzio.mod
|
||||
|
||||
# For _chain.mod.
|
||||
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
|
||||
|
|
@ -3239,6 +3248,56 @@ fs-search.lst: commands/search.c genfslist.sh
|
|||
|
||||
|
||||
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
||||
# For gzio.mod.
|
||||
gzio_mod_SOURCES = io/gzio.c
|
||||
CLEANFILES += gzio.mod mod-gzio.o mod-gzio.c pre-gzio.o gzio_mod-io_gzio.o def-gzio.lst und-gzio.lst
|
||||
MOSTLYCLEANFILES += gzio_mod-io_gzio.d
|
||||
DEFSYMFILES += def-gzio.lst
|
||||
UNDSYMFILES += und-gzio.lst
|
||||
|
||||
gzio.mod: pre-gzio.o mod-gzio.o
|
||||
-rm -f $@
|
||||
$(LD) -r -d -o $@ $^
|
||||
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
||||
|
||||
pre-gzio.o: gzio_mod-io_gzio.o
|
||||
-rm -f $@
|
||||
$(LD) -r -d -o $@ $^
|
||||
|
||||
mod-gzio.o: mod-gzio.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
mod-gzio.c: moddep.lst genmodsrc.sh
|
||||
sh $(srcdir)/genmodsrc.sh 'gzio' $< > $@ || (rm -f $@; exit 1)
|
||||
|
||||
def-gzio.lst: pre-gzio.o
|
||||
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 gzio/' > $@
|
||||
|
||||
und-gzio.lst: pre-gzio.o
|
||||
echo 'gzio' > $@
|
||||
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
||||
|
||||
gzio_mod-io_gzio.o: io/gzio.c
|
||||
$(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
gzio_mod-io_gzio.d: io/gzio.c
|
||||
set -e; $(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -M $< | sed 's,gzio\.o[ :]*,gzio_mod-io_gzio.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include gzio_mod-io_gzio.d
|
||||
|
||||
CLEANFILES += cmd-gzio.lst fs-gzio.lst
|
||||
COMMANDFILES += cmd-gzio.lst
|
||||
FSFILES += fs-gzio.lst
|
||||
|
||||
cmd-gzio.lst: io/gzio.c gencmdlist.sh
|
||||
set -e; $(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh gzio > $@ || (rm -f $@; exit 1)
|
||||
|
||||
fs-gzio.lst: io/gzio.c genfslist.sh
|
||||
set -e; $(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh gzio > $@ || (rm -f $@; exit 1)
|
||||
|
||||
|
||||
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
CLEANFILES += moddep.lst command.lst fs.lst
|
||||
pkgdata_DATA += moddep.lst command.lst fs.lst
|
||||
moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|||
disk/loopback.c \
|
||||
fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c fs/jfs.c \
|
||||
fs/minix.c fs/ufs.c \
|
||||
io/gzio.c \
|
||||
kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
|
||||
kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c \
|
||||
kern/partition.c kern/rescue.c kern/term.c \
|
||||
|
|
@ -113,7 +114,7 @@ pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod \
|
|||
terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod \
|
||||
apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod \
|
||||
help.mod default.mod timeout.mod configfile.mod vbe.mod \
|
||||
vesafb.mod vbetest.mod vbeinfo.mod search.mod
|
||||
vesafb.mod vbetest.mod vbeinfo.mod search.mod gzio.mod
|
||||
|
||||
# For _chain.mod.
|
||||
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
|
||||
|
|
@ -274,3 +275,7 @@ vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
|
|||
# For search.mod.
|
||||
search_mod_SOURCES = commands/search.c
|
||||
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
||||
# For gzio.mod.
|
||||
gzio_mod_SOURCES = io/gzio.c
|
||||
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|||
disk/loopback.c \
|
||||
fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c fs/jfs.c \
|
||||
fs/minix.c fs/ufs.c \
|
||||
io/gzio.c \
|
||||
kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
|
||||
kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c \
|
||||
kern/partition.c kern/rescue.c kern/term.c \
|
||||
|
|
@ -81,10 +82,10 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|||
util/console.c util/grub-emu.c util/misc.c \
|
||||
util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
|
||||
util/powerpc/ieee1275/misc.c
|
||||
CLEANFILES += grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_timeout.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_powerpc_ieee1275_misc.o
|
||||
MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_default.d grub_emu-commands_help.d grub_emu-commands_search.d grub_emu-commands_terminal.d grub_emu-commands_ls.d grub_emu-commands_timeout.d grub_emu-commands_ieee1275_halt.d grub_emu-commands_ieee1275_reboot.d grub_emu-disk_loopback.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_fshelp.d grub_emu-fs_hfs.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ufs.d grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_completion.d grub_emu-normal_context.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-normal_misc.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-util_console.d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_i386_pc_biosdisk.d grub_emu-util_i386_pc_getroot.d grub_emu-util_powerpc_ieee1275_misc.d
|
||||
CLEANFILES += grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_timeout.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_powerpc_ieee1275_misc.o
|
||||
MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_default.d grub_emu-commands_help.d grub_emu-commands_search.d grub_emu-commands_terminal.d grub_emu-commands_ls.d grub_emu-commands_timeout.d grub_emu-commands_ieee1275_halt.d grub_emu-commands_ieee1275_reboot.d grub_emu-disk_loopback.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_fshelp.d grub_emu-fs_hfs.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ufs.d grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_completion.d grub_emu-normal_context.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-normal_misc.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-util_console.d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_i386_pc_biosdisk.d grub_emu-util_i386_pc_getroot.d grub_emu-util_powerpc_ieee1275_misc.d
|
||||
|
||||
grub-emu: grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_timeout.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_powerpc_ieee1275_misc.o
|
||||
grub-emu: grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_timeout.o grub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ufs.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_powerpc_ieee1275_misc.o
|
||||
$(BUILD_CC) -o $@ $^ $(BUILD_LDFLAGS) $(grub_emu_LDFLAGS)
|
||||
|
||||
grub_emu-commands_boot.o: commands/boot.c
|
||||
|
|
@ -255,6 +256,14 @@ grub_emu-fs_ufs.d: fs/ufs.c
|
|||
|
||||
-include grub_emu-fs_ufs.d
|
||||
|
||||
grub_emu-io_gzio.o: io/gzio.c
|
||||
$(BUILD_CC) -Iio -I$(srcdir)/io $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -c -o $@ $<
|
||||
|
||||
grub_emu-io_gzio.d: io/gzio.c
|
||||
set -e; $(BUILD_CC) -Iio -I$(srcdir)/io $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -M $< | sed 's,gzio\.o[ :]*,grub_emu-io_gzio.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include grub_emu-io_gzio.d
|
||||
|
||||
grub_emu-kern_device.o: kern/device.c
|
||||
$(BUILD_CC) -Ikern -I$(srcdir)/kern $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -c -o $@ $<
|
||||
|
||||
|
|
@ -747,7 +756,7 @@ pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
|
|||
hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
|
||||
boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
|
||||
pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod sun.mod \
|
||||
default.mod timeout.mod configfile.mod search.mod
|
||||
default.mod timeout.mod configfile.mod search.mod io.mod
|
||||
|
||||
# For fshelp.mod.
|
||||
fshelp_mod_SOURCES = fs/fshelp.c
|
||||
|
|
@ -2427,6 +2436,10 @@ fs-search.lst: commands/search.c genfslist.sh
|
|||
|
||||
|
||||
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
||||
# For gzio.mod.
|
||||
gzio_mod_SOURCES = io/gzio.c
|
||||
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
CLEANFILES += moddep.lst command.lst fs.lst
|
||||
pkgdata_DATA += moddep.lst command.lst fs.lst
|
||||
moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|||
disk/loopback.c \
|
||||
fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c fs/jfs.c \
|
||||
fs/minix.c fs/ufs.c \
|
||||
io/gzio.c \
|
||||
kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
|
||||
kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c \
|
||||
kern/partition.c kern/rescue.c kern/term.c \
|
||||
|
|
@ -75,7 +76,7 @@ pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
|
|||
hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
|
||||
boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
|
||||
pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod sun.mod \
|
||||
default.mod timeout.mod configfile.mod search.mod
|
||||
default.mod timeout.mod configfile.mod search.mod io.mod
|
||||
|
||||
# For fshelp.mod.
|
||||
fshelp_mod_SOURCES = fs/fshelp.c
|
||||
|
|
@ -204,3 +205,7 @@ configfile_mod_CFLAGS = $(COMMON_CFLAGS)
|
|||
# For search.mod.
|
||||
search_mod_SOURCES = commands/search.c
|
||||
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
||||
# For gzio.mod.
|
||||
gzio_mod_SOURCES = io/gzio.c
|
||||
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \
|
||||
THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \
|
||||
config.h.in config.sub configure configure.ac gencmdlist.sh \
|
||||
gendistlist.sh genkernsyms.sh genmk.rb genmodsrc.sh gensymlist.sh \
|
||||
install-sh mkinstalldirs stamp-h.in"
|
||||
gendistlist.sh genfslist.sh genkernsyms.sh genmk.rb \
|
||||
genmodsrc.sh gensymlist.sh install-sh mkinstalldirs stamp-h.in"
|
||||
|
||||
DISTDIRS="boot commands conf disk font fs hello include kern loader \
|
||||
normal partmap term util"
|
||||
DISTDIRS="boot commands conf disk font fs hello include io kern loader \
|
||||
normal partmap term util video"
|
||||
|
||||
for f in $EXTRA_DISTFILES; do
|
||||
echo $f
|
||||
|
|
@ -29,4 +29,10 @@ done
|
|||
dir=`dirname $0`
|
||||
cd $dir
|
||||
|
||||
find $DISTDIRS -name '*.[chS]' -o -name '*.mk' -o -name '*.rmk' -o -name '*.rb'
|
||||
for dir in $DISTDIRS; do
|
||||
for d in `find $dir -type d | sort`; do
|
||||
find $d -maxdepth 1 -name '*.[chS]' -o -name '*.mk' -o -name '*.rmk' \
|
||||
-o -name '*.rb' -o -name '*.in' \
|
||||
| sort
|
||||
done
|
||||
done
|
||||
|
|
|
|||
|
|
@ -49,7 +49,8 @@ typedef enum
|
|||
GRUB_ERR_NO_KERNEL,
|
||||
GRUB_ERR_BAD_FONT,
|
||||
GRUB_ERR_NOT_IMPLEMENTED_YET,
|
||||
GRUB_ERR_SYMLINK_LOOP
|
||||
GRUB_ERR_SYMLINK_LOOP,
|
||||
GRUB_ERR_BAD_GZIP_DATA,
|
||||
}
|
||||
grub_err_t;
|
||||
|
||||
|
|
|
|||
29
include/grub/gzio.h
Normal file
29
include/grub/gzio.h
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/* gzio.h - prototypes for gzio */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2005 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef GRUB_GZIO_H
|
||||
#define GRUB_GZIO_H 1
|
||||
|
||||
#include <grub/file.h>
|
||||
|
||||
grub_file_t grub_gzio_open (grub_file_t io, int transparent);
|
||||
grub_file_t grub_gzfile_open (const char *name, int transparent);
|
||||
|
||||
#endif /* ! GRUB_GZIO_H */
|
||||
|
|
@ -24,6 +24,10 @@
|
|||
#include <grub/types.h>
|
||||
#include <grub/symbol.h>
|
||||
|
||||
#ifndef NULL
|
||||
# define NULL ((void *) 0)
|
||||
#endif
|
||||
|
||||
void grub_mm_init_region (void *addr, grub_size_t size);
|
||||
void *EXPORT_FUNC(grub_malloc) (grub_size_t size);
|
||||
void EXPORT_FUNC(grub_free) (void *ptr);
|
||||
|
|
|
|||
|
|
@ -135,6 +135,7 @@ grub_file_close (grub_file_t file)
|
|||
if (file->fs->close)
|
||||
(file->fs->close) (file);
|
||||
|
||||
if (file->device)
|
||||
grub_device_close (file->device);
|
||||
grub_free (file);
|
||||
return grub_errno;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
#include <grub/dl.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/gzio.h>
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
static struct grub_multiboot_info *mbi;
|
||||
|
|
@ -252,7 +253,7 @@ grub_rescue_cmd_multiboot (int argc, char *argv[])
|
|||
goto fail;
|
||||
}
|
||||
|
||||
file = grub_file_open (argv[0]);
|
||||
file = grub_gzfile_open (argv[0], 1);
|
||||
if (! file)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "Couldn't open file");
|
||||
|
|
@ -361,7 +362,7 @@ grub_rescue_cmd_module (int argc, char *argv[])
|
|||
goto fail;
|
||||
}
|
||||
|
||||
file = grub_file_open (argv[0]);
|
||||
file = grub_gzfile_open (argv[0], 1);
|
||||
if (! file)
|
||||
goto fail;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue