* [PATCH] Rename kernel.mod to kernel.img on EFI.
@ 2009-12-02 16:30 Vladimir 'φ-coder/phcoder' Serbinenko
2009-12-04 20:49 ` Robert Millan
0 siblings, 1 reply; 2+ messages in thread
From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2009-12-02 16:30 UTC (permalink / raw)
To: The development of GRUB 2
[-- Attachment #1.1: Type: text/plain, Size: 115 bytes --]
Fixes problem of users including kernel.mod as a module
--
Regards
Vladimir 'φ-coder/phcoder' Serbinenko
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: kimg.diff --]
[-- Type: text/x-diff; name="kimg.diff", Size: 6673 bytes --]
=== 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 <phcoder@gmail.com>
+
+ 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");
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 293 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Rename kernel.mod to kernel.img on EFI.
2009-12-02 16:30 [PATCH] Rename kernel.mod to kernel.img on EFI Vladimir 'φ-coder/phcoder' Serbinenko
@ 2009-12-04 20:49 ` Robert Millan
0 siblings, 0 replies; 2+ messages in thread
From: Robert Millan @ 2009-12-04 20:49 UTC (permalink / raw)
To: The development of GNU GRUB
On Wed, Dec 02, 2009 at 05:30:07PM +0100, Vladimir 'φ-coder/phcoder' Serbinenko wrote:
> Fixes problem of users including kernel.mod as a module
Great. Please do. Btw, this is a relief, I thought for some odd reason it
actually *was* a module.
--
Robert Millan
The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
how) you may access your data; but nobody's threatening your freedom: we
still allow you to remove your data and not access it at all."
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-04 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-02 16:30 [PATCH] Rename kernel.mod to kernel.img on EFI Vladimir 'φ-coder/phcoder' Serbinenko
2009-12-04 20:49 ` Robert Millan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.