rpms/yaboot/devel yaboot-relocatable-kernel.patch, NONE, 1.1 yaboot.spec, 1.56, 1.57
Joshua W. Boyer
jwboyer at fedoraproject.org
Thu Jan 22 18:34:07 UTC 2009
Author: jwboyer
Update of /cvs/pkgs/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3504
Modified Files:
yaboot.spec
Added Files:
yaboot-relocatable-kernel.patch
Log Message:
* Thu Jan 22 2009 Josh Boyer <jwboyer at gmail.com> - 1.3.14-9
- Add patch to handle relocatable kernels
yaboot-relocatable-kernel.patch:
--- NEW FILE yaboot-relocatable-kernel.patch ---
PPC64 relocatable kernels (built with CONFIG_RELOCATABLE=y) have the type of
ET_DYN. But yaboot code won't load the kernel if the ELF type is not
ET_EXEC. Attached patch adds support to yaboot to load relocatable kernels
also (ie load ET_DYN type also)
Signed-off-by: M. Mohan Kumar <mohan at in.ibm.com>
---
second/yaboot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- yaboot-1.3.14.orig/second/yaboot.c
+++ yaboot-1.3.14/second/yaboot.c
@@ -1606,7 +1606,7 @@ is_elf64(loadinfo_t *loadinfo)
e->e_ident[EI_MAG3] == ELFMAG3 &&
e->e_ident[EI_CLASS] == ELFCLASS64 &&
e->e_ident[EI_DATA] == ELFDATA2MSB &&
- e->e_type == ET_EXEC &&
+ (e->e_type == ET_EXEC || e->e_type == ET_DYN) &&
e->e_machine == EM_PPC64);
}
Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- yaboot.spec 27 Nov 2008 15:38:18 -0000 1.56
+++ yaboot.spec 22 Jan 2009 18:33:36 -0000 1.57
@@ -1,7 +1,7 @@
Summary: Linux bootloader for Power Macintosh "New World" computers.
Name: yaboot
Version: 1.3.14
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -24,6 +24,7 @@
Patch29: yaboot-1.3.14-baseaddr.patch
Patch30: yaboot-1.3.14-fix-bootonce-nvram.patch
Patch31: yaboot-1.3.14-bigger-max-token.patch
+Patch32: yaboot-relocatable-kernel.patch
URL: http://yaboot.ozlabs.org/
BuildRoot: %{_tmppath}/%{name}-root
@@ -58,6 +59,7 @@
%patch29 -p1 -b .baseaddr
%patch30 -p1 -b .bootonce
%patch31 -p1 -b .maxtoken
+%patch32 -p1 -b .relocatable
%build
make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -93,6 +95,9 @@
%ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
%changelog
+* Thu Jan 22 2009 Josh Boyer <jwboyer at gmail.com> - 1.3.14-9
+- Add patch to handle relocatable kernels
+
* Thu Nov 27 2008 Roman Rakus <rrakus at redhat.com> - 1.3.14-8
- Bumped release, so preupgrade is now silent and go through
More information about the fedora-extras-commits
mailing list