Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NFs64-0006E5-8D for mharc-grub-devel@gnu.org; Wed, 02 Dec 2009 11:30:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFs62-0006DH-8k for grub-devel@gnu.org; Wed, 02 Dec 2009 11:30:30 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFs5x-0006Au-Jt for grub-devel@gnu.org; Wed, 02 Dec 2009 11:30:29 -0500 Received: from [199.232.76.173] (port=40795 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFs5x-0006Aj-Bg for grub-devel@gnu.org; Wed, 02 Dec 2009 11:30:25 -0500 Received: from mail-ew0-f224.google.com ([209.85.219.224]:58255) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFs5w-0002UE-Qw for grub-devel@gnu.org; Wed, 02 Dec 2009 11:30:25 -0500 Received: by ewy24 with SMTP id 24so425538ewy.26 for ; Wed, 02 Dec 2009 08:30:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:x-enigmail-version:content-type; bh=0Vt0iW3Wu8GeEWsLFfBIYHHHT+H77SdSrXYa26c0Jz0=; b=G9G+MOFT6vWm1t/Nhvc29xvGXfWmtqvAHgTrEDFqNAGcxgI+j/Ad8fdzwleqNLwuPP sy1WEvun4czoYgx9O/6jSlF+wjphcMf8F1/163N8K7T9JDWRaIsRP1V4t/j7XikAb6jJ V1lfv/1DkyFDGnot651LejAGM6kIqfl7Z711I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type; b=fJEi15uy6qIv+Sjegkal0ASHT4vXEe39Q99QA3ZpqCKgjOSIHLUZJvZqbUz9jjlvTX dxxTodX+ULiFGPqgTnbBkDGeCUN10FM35EW8cV5jmX8d/v5oOTVu/YIGfOnqd94ml1V+ coUz3/7doCYiLZTx1owHUL0DBAXv0b7R3b/Lw= Received: by 10.213.0.144 with SMTP id 16mr336421ebb.38.1259771423783; Wed, 02 Dec 2009 08:30:23 -0800 (PST) Received: from debian.bg45.phnet (gprs22.swisscom-mobile.ch [193.247.250.22]) by mx.google.com with ESMTPS id 16sm824336ewy.6.2009.12.02.08.30.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Dec 2009 08:30:23 -0800 (PST) Message-ID: <4B16960F.5090800@gmail.com> Date: Wed, 02 Dec 2009 17:30:07 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20091109) MIME-Version: 1.0 To: The development of GRUB 2 X-Enigmail-Version: 0.95.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig02F25C5EE732A57FAAE27EFE" X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [PATCH] Rename kernel.mod to kernel.img on EFI. X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 16:30:30 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig02F25C5EE732A57FAAE27EFE Content-Type: multipart/mixed; boundary="------------020509040804090000050201" This is a multi-part message in MIME format. --------------020509040804090000050201 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Fixes problem of users including kernel.mod as a module --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------020509040804090000050201 Content-Type: text/x-diff; name="kimg.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="kimg.diff" =3D=3D=3D 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 + + 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". =3D=3D=3D 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 =3D util/i386/efi/grub-install.in =20 # Modules. -pkglib_MODULES =3D kernel.mod chain.mod appleldr.mod \ +pkglib_MODULES =3D 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 =20 -# For kernel.mod. -kernel_mod_EXPORTS =3D no -kernel_mod_SOURCES =3D kern/i386/efi/startup.S kern/main.c kern/device.c= \ +# For kernel.img. +kernel_img_EXPORTS =3D no +kernel_img_SOURCES =3D 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 =3D boot.h cache.h device.h disk.h dl.h elf.h elfload= =2Eh \ +kernel_img_HEADERS =3D boot.h cache.h device.h disk.h dl.h elf.h elfload= =2Eh \ 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 i= 18n.h -kernel_mod_CFLAGS =3D $(COMMON_CFLAGS) -kernel_mod_ASFLAGS =3D $(COMMON_ASFLAGS) -kernel_mod_LDFLAGS =3D $(COMMON_LDFLAGS) +kernel_img_CFLAGS =3D $(COMMON_CFLAGS) +kernel_img_ASFLAGS =3D $(COMMON_ASFLAGS) +kernel_img_LDFLAGS =3D $(COMMON_LDFLAGS) =20 MOSTLYCLEANFILES +=3D symlist.c MOSTLYCLEANFILES +=3D symlist.c kernel_syms.lst DEFSYMFILES +=3D kernel_syms.lst =20 -symlist.c: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h gen= symlist.sh +symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gen= symlist.sh /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) =20 -kernel_syms.lst: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config= =2Eh genkernsyms.sh +kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config= =2Eh genkernsyms.sh /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) =20 # For boot.mod. =3D=3D=3D 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 =3D util/i386/efi/grub-install.in =20 # Modules. -pkglib_MODULES =3D kernel.mod chain.mod appleldr.mod \ +pkglib_MODULES =3D 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 =20 -# For kernel.mod. -kernel_mod_EXPORTS =3D no -kernel_mod_SOURCES =3D kern/x86_64/efi/startup.S kern/x86_64/efi/callwra= p.S \ +# For kernel.img. +kernel_img_EXPORTS =3D no +kernel_img_SOURCES =3D kern/x86_64/efi/startup.S kern/x86_64/efi/callwra= p.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 =3D boot.h cache.h device.h disk.h dl.h elf.h elfload= =2Eh \ +kernel_img_HEADERS =3D boot.h cache.h device.h disk.h dl.h elf.h elfload= =2Eh \ 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 =3D $(COMMON_CFLAGS) -kernel_mod_ASFLAGS =3D $(COMMON_ASFLAGS) -kernel_mod_LDFLAGS =3D $(COMMON_LDFLAGS) +kernel_img_CFLAGS =3D $(COMMON_CFLAGS) +kernel_img_ASFLAGS =3D $(COMMON_ASFLAGS) +kernel_img_LDFLAGS =3D $(COMMON_LDFLAGS) =20 MOSTLYCLEANFILES +=3D symlist.c MOSTLYCLEANFILES +=3D symlist.c kernel_syms.lst DEFSYMFILES +=3D kernel_syms.lst =20 -symlist.c: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h gen= symlist.sh +symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gen= symlist.sh /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) =20 -kernel_syms.lst: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config= =2Eh genkernsyms.sh +kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config= =2Eh genkernsyms.sh /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) =20 # For boot.mod. =3D=3D=3D 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; =20 - kernel_path =3D grub_util_get_path (dir, "kernel.mod"); + kernel_path =3D grub_util_get_path (dir, "kernel.img"); *size =3D grub_util_get_image_size (kernel_path); kernel_image =3D grub_util_read_image (kernel_path); free (kernel_path); @@ -945,7 +945,7 @@ int i; =20 /* Get the kernel image and check the format. */ - kernel_image =3D read_kernel_module (dir, &kernel_size); + kernel_image =3D read_kernel_image (dir, &kernel_size); e =3D (Elf_Ehdr *) kernel_image; if (! check_elf_header (e, kernel_size)) grub_util_error ("invalid ELF header"); --------------020509040804090000050201-- --------------enig02F25C5EE732A57FAAE27EFE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iF4EAREKAAYFAksWlhwACgkQNak7dOguQgmSYAEAsQOmwTlPaSDwsEo3OtnZph1I bct15zd2I/imxB1o4zABAK5YS16ISsAbCATskFYkrOkjWkRXA4J9D/pzqkh3sq5t =kxxn -----END PGP SIGNATURE----- --------------enig02F25C5EE732A57FAAE27EFE--