From 4d2302ad0d29ede501ed13bfa3586851e4ab8e7b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:41:12 +0000 Subject: [PATCH 1/4] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 2e96c112e8a15ae9a83eefffc1679458bd8d9f02 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 7 Jun 2009 08:06:37 +0000 Subject: [PATCH 2/4] Remove bi_recs. The kernel doesn't use them and overwriting the middle of the kernel text is considered harmful --- yaboot-1.3.14-no-birecs.patch | 11 +++++++++++ yaboot.spec | 7 ++++++- 2 files changed, 17 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 2b63c03..c7d88ed 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: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz @@ -26,6 +26,7 @@ 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-better_netboot.patch +Patch34: yaboot-1.3.14-no-birecs.patch URL: http://yaboot.ozlabs.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -62,6 +63,7 @@ yaboot can also bootload IBM pSeries machines. %patch31 -p1 -b .maxtoken %patch32 -p1 -b .relocatable %patch33 -p1 -b .netboot +%patch34 -p1 -b .birecs %build make VERSIONEXTRA='\ (Red Hat %version-%release)' @@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf %changelog +* Sun Jun 07 2009 David Woodhouse - 1.3.14-13 +- Don't set up bi_recs. Especially not in the middle of the kernel text. + * Mon Apr 06 2009 tony@bakeyournoodle.com - 1.3.14-12 - Increase the TFTP load buffer from 20MiB to 25MiB. (#483051) From be640f146cb97e789725d41777b8e2c1ea860238 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:01 +0000 Subject: [PATCH 3/4] 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 55fdfef640070ff7ebc171ad3461e40131ebdf9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:18:12 +0000 Subject: [PATCH 4/4] 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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11