[PATCH] Rename kernel.mod to kernel.img on EFI.

grub-devel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Rename kernel.mod to kernel.img on EFI.

From:	Vladimir 'φ-coder/phcoder' Serbinenko
Subject:	[PATCH] Rename kernel.mod to kernel.img on EFI.
Date:	Wed, 02 Dec 2009 17:30:07 +0100
User-agent:	Mozilla-Thunderbird 2.0.0.22 (X11/20091109)

Fixes problem of users including kernel.mod as a module

-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko

=== added file 'ChangeLog.kimg'
--- ChangeLog.kimg      1970-01-01 00:00:00 +0000
+++ ChangeLog.kimg      2009-12-02 16:13:45 +0000
@@ -0,0 +1,21 @@
+2009-12-02  Vladimir Serbinenko  <address@hidden>
+
+       Rename kernel.mod to kernel.img.
+
+       * conf/i386-efi.rmk (pkglib_MODULES): Change kernel.mod to kernel.img.
+       (kernel_mod_EXPORTS): Rename to ...
+       (kernel_img_EXPORTS): ... this.
+       (kernel_mod_SOURCES): Rename to ...
+       (kernel_img_SOURCES): ... this.
+       (kernel_mod_HEADERS): Rename to ...
+       (kernel_img_HEADERS): ... this. All users updated.
+       (kernel_mod_CFLAGS): Rename to ...
+       (kernel_img_CFLAGS): ... this.
+       (kernel_mod_ASFLAGS): Rename to ...
+       (kernel_img_ASFLAGS): ... this.
+       (kernel_mod_LDFLAGS): Rename to ...
+       (kernel_img_LDFLAGS): ... this.
+       * conf/x86_64-efi.rmk: Likewise.
+       * util/i386/efi/grub-mkimage.c (read_kernel_module): Rename to ...
+       (read_kernel_image): ... this. All users updated.
+       (read_kernel_image): Read "kernel.img" instead of "kernel.mod".

=== modified file 'conf/i386-efi.rmk'
--- conf/i386-efi.rmk   2009-11-27 23:24:57 +0000
+++ conf/i386-efi.rmk   2009-12-02 16:13:45 +0000
@@ -30,14 +30,14 @@
 grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
-pkglib_MODULES = kernel.mod chain.mod appleldr.mod \
+pkglib_MODULES = kernel.img chain.mod appleldr.mod \
        linux.mod halt.mod reboot.mod pci.mod lspci.mod \
        datetime.mod date.mod datehook.mod loadbios.mod \
        fixvideo.mod mmap.mod acpi.mod
 
-# For kernel.mod.
-kernel_mod_EXPORTS = no
-kernel_mod_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
+# For kernel.img.
+kernel_img_EXPORTS = no
+kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
        kern/misc.c kern/mm.c kern/reader.c kern/term.c \
        kern/rescue_parser.c kern/rescue_reader.c \
@@ -48,22 +48,22 @@
        kern/i386/tsc.c kern/i386/pit.c \
        kern/generic/rtc_get_time_ms.c \
        kern/generic/millisleep.c
-kernel_mod_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h 
i18n.h
-kernel_mod_CFLAGS = $(COMMON_CFLAGS)
-kernel_mod_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_mod_LDFLAGS = $(COMMON_LDFLAGS)
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 
 MOSTLYCLEANFILES += symlist.c
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
-symlist.c: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h 
gensymlist.sh
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h 
gensymlist.sh
        /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h 
genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h 
genkernsyms.sh
        /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
 # For boot.mod.

=== modified file 'conf/x86_64-efi.rmk'
--- conf/x86_64-efi.rmk 2009-11-27 23:24:57 +0000
+++ conf/x86_64-efi.rmk 2009-12-02 16:13:45 +0000
@@ -29,14 +29,14 @@
 grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
-pkglib_MODULES = kernel.mod chain.mod appleldr.mod     \
+pkglib_MODULES = kernel.img chain.mod appleldr.mod     \
        halt.mod reboot.mod linux.mod pci.mod lspci.mod \
        datetime.mod date.mod datehook.mod loadbios.mod \
        fixvideo.mod mmap.mod acpi.mod ata.mod
 
-# For kernel.mod.
-kernel_mod_EXPORTS = no
-kernel_mod_SOURCES = kern/x86_64/efi/startup.S kern/x86_64/efi/callwrap.S \
+# For kernel.img.
+kernel_img_EXPORTS = no
+kernel_img_SOURCES = kern/x86_64/efi/startup.S kern/x86_64/efi/callwrap.S \
        kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
        kern/misc.c kern/mm.c kern/reader.c kern/term.c \
@@ -47,23 +47,23 @@
        kern/i386/tsc.c kern/i386/pit.c \
        kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c \
        term/efi/console.c disk/efi/efidisk.c
-kernel_mod_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
        handler.h command.h i18n.h
-kernel_mod_CFLAGS = $(COMMON_CFLAGS)
-kernel_mod_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_mod_LDFLAGS = $(COMMON_LDFLAGS)
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 
 MOSTLYCLEANFILES += symlist.c
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
-symlist.c: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h 
gensymlist.sh
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h 
gensymlist.sh
        /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h 
genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h 
genkernsyms.sh
        /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
 # For boot.mod.

=== modified file 'util/i386/efi/grub-mkimage.c'
--- util/i386/efi/grub-mkimage.c        2009-11-26 16:15:16 +0000
+++ util/i386/efi/grub-mkimage.c        2009-12-02 16:13:45 +0000
@@ -55,12 +55,12 @@
 /* Read the whole kernel image. Return the pointer to a read image,
    and store the size in bytes in *SIZE.  */
 static char *
-read_kernel_module (const char *dir, size_t *size)
+read_kernel_image (const char *dir, size_t *size)
 {
   char *kernel_image;
   char *kernel_path;
 
-  kernel_path = grub_util_get_path (dir, "kernel.mod");
+  kernel_path = grub_util_get_path (dir, "kernel.img");
   *size = grub_util_get_image_size (kernel_path);
   kernel_image = grub_util_read_image (kernel_path);
   free (kernel_path);
@@ -945,7 +945,7 @@
   int i;
 
   /* Get the kernel image and check the format.  */
-  kernel_image = read_kernel_module (dir, &kernel_size);
+  kernel_image = read_kernel_image (dir, &kernel_size);
   e = (Elf_Ehdr *) kernel_image;
   if (! check_elf_header (e, kernel_size))
     grub_util_error ("invalid ELF header");

signature.asc
Description: OpenPGP digital signature

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH] Rename kernel.mod to kernel.img on EFI., Vladimir 'φ-coder/phcoder' Serbinenko <=
- Re: [PATCH] Rename kernel.mod to kernel.img on EFI., Robert Millan, 2009/12/04

Prev by Date: New Chinese (simplified) PO file for 'grub' (version 1.97+20091122)
Next by Date: USB device not seen by grub
Previous by thread: [PATCH] Fixed some typos
Next by thread: Re: [PATCH] Rename kernel.mod to kernel.img on EFI.
Index(es):
- Date
- Thread