From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OYbYR-0002kL-1T
	for mharc-grub-devel@gnu.org; Tue, 13 Jul 2010 05:13:31 -0400
Received: from [140.186.70.92] (port=37191 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OYYMI-0006Bd-SQ
	for grub-devel@gnu.org; Tue, 13 Jul 2010 01:48:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <anton@ozlabs.org>) id 1OYYMH-0003Qo-IO
	for grub-devel@gnu.org; Tue, 13 Jul 2010 01:48:46 -0400
Received: from ozlabs.org ([203.10.76.45]:58607)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anton@ozlabs.org>) id 1OYYMH-0003QO-6f
	for grub-devel@gnu.org; Tue, 13 Jul 2010 01:48:45 -0400
Received: by ozlabs.org (Postfix, from userid 1010)
	id 26084B6F11; Tue, 13 Jul 2010 15:48:40 +1000 (EST)
Date: Tue, 13 Jul 2010 15:45:23 +1000
From: Anton Blanchard <anton@samba.org>
To: grub-devel@gnu.org
Message-ID: <20100713054523.GC10155@kryten>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Tue, 13 Jul 2010 05:13:28 -0400
Subject: [PATCH] Fix for relocatable PowerPC kernels
X-BeenThere: grub-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: The development of GNU GRUB <grub-devel@gnu.org>
List-Id: The development of GNU GRUB <grub-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grub-devel>
List-Post: <mailto:grub-devel@gnu.org>
List-Help: <mailto:grub-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jul 2010 05:48:49 -0000


Hi,

PowerPC Linux kernels can now be built relocatable so we need to check
for that in the loader.

Anton

--

2010-07-13  Anton Blanchard  <anton@samba.org>

	* loader/powerpc/ieee1275/linux.c (grub_cmd_linux): Do not reject
	ET_DYN files.

Index: grub/loader/powerpc/ieee1275/linux.c
===================================================================
--- grub.orig/loader/powerpc/ieee1275/linux.c	2010-07-11 12:05:16.443242734 +1000
+++ grub/loader/powerpc/ieee1275/linux.c	2010-07-12 14:56:20.301991065 +1000
@@ -220,7 +220,7 @@ grub_cmd_linux (grub_command_t cmd __att
   if (! elf)
     goto out;
 
-  if (elf->ehdr.ehdr32.e_type != ET_EXEC)
+  if (elf->ehdr.ehdr32.e_type != ET_EXEC && elf->ehdr.ehdr32.e_type != ET_DYN)
     {
       grub_error (GRUB_ERR_UNKNOWN_OS,
 		  "this ELF file is not of the right type");