From c5d6f96ae86d625c11b9d1fceea7620b8cf66141 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:43:14 +0000 Subject: [PATCH 1/8] Initialize branch F-10 for yaboot --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From d2db8d3b5ee806557b59aeca8ae62985e9acc610 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 21 Nov 2008 17:29:54 +0000 Subject: [PATCH 2/8] fix bootonce, MAX_TOKEN --- yaboot.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yaboot.spec b/yaboot.spec index f022427..83a66b2 100644 --- a/yaboot.spec +++ b/yaboot.spec @@ -1,7 +1,7 @@ Summary: Linux bootloader for Power Macintosh "New World" computers. Name: yaboot Version: 1.3.14 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz @@ -22,6 +22,8 @@ Patch22: yaboot-1.3.13-allow-deep-mntpoint.patch Patch27: yaboot-ppc64.patch Patch28: yaboot-1.3.13-dontwritehome.patch 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 URL: http://yaboot.ozlabs.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -54,6 +56,8 @@ yaboot can also bootload IBM pSeries machines. %patch27 -p1 -b .ppc64 %patch28 -p1 -b .bootwrite %patch29 -p1 -b .baseaddr +%patch30 -p1 -b .bootonce +%patch31 -p1 -b .maxtoken %build make VERSIONEXTRA='\ (Red Hat %version-%release)' @@ -89,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf %changelog +* Fri Nov 21 2008 David Woodhouse - 1.3.14-7 +- Fix 'ybin --bootonce' (#471425) +- Fix maximum token length, to fix preupgrade (#471321) + * Wed Nov 05 2008 Roman Rakus - 1.3.14-6 - Changed kernel load base address Resolves: #468492 From e53a11ca3877e51b8f50cf58a507c5fee7a57a11 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 21 Nov 2008 17:40:13 +0000 Subject: [PATCH 3/8] bump release --- yaboot.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yaboot.spec b/yaboot.spec index 83a66b2..1368817 100644 --- a/yaboot.spec +++ b/yaboot.spec @@ -1,7 +1,7 @@ Summary: Linux bootloader for Power Macintosh "New World" computers. Name: yaboot Version: 1.3.14 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz @@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf %changelog -* Fri Nov 21 2008 David Woodhouse - 1.3.14-7 +* Fri Nov 21 2008 David Woodhouse - 1.3.14-8 - Fix 'ybin --bootonce' (#471425) - Fix maximum token length, to fix preupgrade (#471321) From e444c199311880ba5695137de204255949355fbc Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 21 Nov 2008 17:55:07 +0000 Subject: [PATCH 4/8] oops, missing patches --- yaboot-1.3.14-bigger-max-token.patch | 12 ++++++++++++ yaboot-1.3.14-fix-bootonce-nvram.patch | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 yaboot-1.3.14-bigger-max-token.patch create mode 100644 yaboot-1.3.14-fix-bootonce-nvram.patch diff --git a/yaboot-1.3.14-bigger-max-token.patch b/yaboot-1.3.14-bigger-max-token.patch new file mode 100644 index 0000000..b1a7d32 --- /dev/null +++ b/yaboot-1.3.14-bigger-max-token.patch @@ -0,0 +1,12 @@ +diff -up yaboot-1.3.14/second/cfg.c.bigger-max-token yaboot-1.3.14/second/cfg.c +--- yaboot-1.3.14/second/cfg.c.bigger-max-token 2008-11-12 14:39:11.000000000 -0500 ++++ yaboot-1.3.14/second/cfg.c 2008-11-12 14:39:17.000000000 -0500 +@@ -41,7 +41,7 @@ typedef struct { + void *data; + } CONFIG; + +-#define MAX_TOKEN 200 ++#define MAX_TOKEN 511 + #define MAX_VAR_NAME MAX_TOKEN + #define EOF -1 + diff --git a/yaboot-1.3.14-fix-bootonce-nvram.patch b/yaboot-1.3.14-fix-bootonce-nvram.patch new file mode 100644 index 0000000..c7d20ba --- /dev/null +++ b/yaboot-1.3.14-fix-bootonce-nvram.patch @@ -0,0 +1,21 @@ +diff -up yaboot-1.3.14/ybin/ybin.fix-bootonce-nvram yaboot-1.3.14/ybin/ybin +--- yaboot-1.3.14/ybin/ybin.fix-bootonce-nvram 2008-11-12 14:51:28.000000000 -0500 ++++ yaboot-1.3.14/ybin/ybin 2008-11-13 12:15:21.000000000 -0500 +@@ -1689,14 +1689,15 @@ checkconf || exit 1 + + if [ "x$bootonce" != "x" ]; then + foundlabel=`sed s/\#.*// $bootconf | grep "label=$bootonce$" | wc -l` +- if [ "$nonvram" = 0 ]; then ++ if [ "$nonvram" = 1 ]; then + echo 1>&2 "$PRG: --bootonce specified, but nvsetenv not available." + exit 1 + fi + if [ "$foundlabel" = 1 ]; then + nvsetenv boot-once "$bootonce" + foundlabel=`nvsetenv boot-once` +- if [ "$foundlabel" != "boot-once=$bootonce" ]; then ++ if [ "$foundlabel" != "boot-once=$bootonce" -a \ ++ "$foundlabel" != "$bootonce" ]; then + echo 1>&2 "$PRG: Could not nvsetenv boot-once $bootonce" + exit 1 + fi From a5bf0aa8dfecffa5e8e5ab4b6ca29b7cf58e856b Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Thu, 29 Jan 2009 14:48:38 +0000 Subject: [PATCH 5/8] Add patch to handle relocatable kernels. Resolves: #483041 --- yaboot-relocatable-kernel.patch | 21 +++++++++++++++++++++ yaboot.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 yaboot-relocatable-kernel.patch diff --git a/yaboot-relocatable-kernel.patch b/yaboot-relocatable-kernel.patch new file mode 100644 index 0000000..10e08ea --- /dev/null +++ b/yaboot-relocatable-kernel.patch @@ -0,0 +1,21 @@ +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 +--- + 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); + } + diff --git a/yaboot.spec b/yaboot.spec index 1368817..04a6c6a 100644 --- a/yaboot.spec +++ b/yaboot.spec @@ -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 @@ Patch28: yaboot-1.3.13-dontwritehome.patch 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 @@ yaboot can also bootload IBM pSeries machines. %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,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf %changelog +* Thu Jan 29 2009 Roman Rakus - 1.3.14-9 +- Add patch to handle relocatable kernels + Resolves: #483041 + * Fri Nov 21 2008 David Woodhouse - 1.3.14-8 - Fix 'ybin --bootonce' (#471425) - Fix maximum token length, to fix preupgrade (#471321) From 7c8e08944664102b9967c163cc970612a78d4c6a Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Tue, 11 Aug 2009 00:45:04 +0000 Subject: [PATCH 6/8] Backport the no birecs patch from F-11/rawhide uptil a better solution is available upstream. --- yaboot-1.3.14-no-birecs.patch | 11 +++++++++++ yaboot.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 yaboot-1.3.14-no-birecs.patch diff --git a/yaboot-1.3.14-no-birecs.patch b/yaboot-1.3.14-no-birecs.patch new file mode 100644 index 0000000..96748c7 --- /dev/null +++ b/yaboot-1.3.14-no-birecs.patch @@ -0,0 +1,11 @@ +--- yaboot-1.3.14/second/yaboot.c~ 2009-06-07 08:57:58.000000000 +0100 ++++ yaboot-1.3.14/second/yaboot.c 2009-06-07 09:02:03.000000000 +0100 +@@ -1243,7 +1243,7 @@ yaboot_text_ui(void) + flush_icache_range ((long)loadinfo.base, (long)loadinfo.base+loadinfo.memsize); + DEBUG_F(" done\n"); + +- if (flat_vmlinux) { ++ if (0 && flat_vmlinux) { + /* + * Fill new boot infos (only if booting a vmlinux). + * diff --git a/yaboot.spec b/yaboot.spec index 04a6c6a..a3bb91f 100644 --- a/yaboot.spec +++ b/yaboot.spec @@ -1,7 +1,7 @@ Summary: Linux bootloader for Power Macintosh "New World" computers. Name: yaboot Version: 1.3.14 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz @@ -25,6 +25,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 +Patch33: yaboot-1.3.14-no-birecs.patch URL: http://yaboot.ozlabs.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -60,6 +61,7 @@ yaboot can also bootload IBM pSeries machines. %patch30 -p1 -b .bootonce %patch31 -p1 -b .maxtoken %patch32 -p1 -b .relocatable +%patch33 -p1 -b .nobirecs %build make VERSIONEXTRA='\ (Red Hat %version-%release)' @@ -95,6 +97,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf %changelog +* Tue Aug 11 2009 tony@bakeyournoodle.com - 1.3.14-10 +- Backported the "no birecs" patch from F-11, rawhide. See below for details: + https://www.redhat.com/archives/fedora-kernel-list/2009-June/msg00002.html + http://lists.ozlabs.org/pipermail/linuxppc-dev/2009-August/074571.html + * Thu Jan 29 2009 Roman Rakus - 1.3.14-9 - Add patch to handle relocatable kernels Resolves: #483041 From 4eea81408cab1788aa90cd374b757ec751ed2ab2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:01 +0000 Subject: [PATCH 7/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c014f1e..4234502 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ # Makefile for source rpm: yaboot -# $Id: Makefile,v 1.2 2004/09/18 08:21:27 pnasrat Exp $ +# $Id: Makefile,v 1.3 2007/10/15 19:38:27 notting Exp $ NAME := yaboot SPECFILE = $(firstword $(wildcard *.spec)) UPSTREAM_CHECKS = sig define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0d0c5bd3f05466843c0bfcbc465ed58fa24a7dd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:18:00 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 22 ---------------------- branch | 1 - 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4234502..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Makefile for source rpm: yaboot -# $Id: Makefile,v 1.3 2007/10/15 19:38:27 notting Exp $ -NAME := yaboot -SPECFILE = $(firstword $(wildcard *.spec)) -UPSTREAM_CHECKS = sig - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10