dist-git conversion

#2781)

Makefile

@@ -1,22 +0,0 @@
-# Makefile for source rpm: yaboot
-# $Id: Makefile,v 1.2 2004/09/18 08:21:27 pnasrat 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
-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)

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).
+ 	        *

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 <David.Woodhouse@intel.com> - 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)