address bug 45286, chrp support

4 files changed, 38 insertions, 10 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 9492f8ffea3f..2cf846360b98 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.3 2004/03/01 20:05:24 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.4 2004/03/22 18:26:46 tgall Exp $
+
+  22 Mar 2004; Tom Gall <tgall@gentoo.org> yaboot-1.3.11.ebuild:
+  add fix for creation of a proper yaboot on chrp hardware
 
 *yaboot-1.3.10-r1 (08 Dec 2003)
 *yaboot-1.3.11 (08 Dec 2003)
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 8defbcb572fb..237c6cde4812 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,13 +1,14 @@
+MD5 49a737bd4ba0127ab6fde7385fd4f9d7 ChangeLog 3769
+MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 MD5 4c8d5ac00a1131330a8d2492d50793ee yaboot-1.3.10-r1.ebuild 982
-MD5 0a29994f14bd4538c04d17eb2efb1009 yaboot-1.3.10.ebuild 979
 MD5 5cc966a93b5487bb79c5fa007fd7a60a yaboot-1.3.10-r2.ebuild 1022
-MD5 73954f0377f5e287791d205c08572940 yaboot-1.3.11.ebuild 1025
-MD5 93ed2d1addca9bf0fbbf12f21cdbf863 ChangeLog 3643
-MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
-MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898
+MD5 0a29994f14bd4538c04d17eb2efb1009 yaboot-1.3.10.ebuild 979
+MD5 841c64f4eb1b40fe560c3b5ef12d5cd8 yaboot-1.3.11.ebuild 1056
+MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
 MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10 65
-MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11 65
-MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987
 MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10-r1 65
 MD5 cdcf832620e73598eb112a6000509afd files/digest-yaboot-1.3.10-r2 270
+MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11 65
+MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898
+MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987
 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987
diff --git a/sys-boot/yaboot/files/chrpfix.patch b/sys-boot/yaboot/files/chrpfix.patch
new file mode 100644
index 000000000000..e64369ba899a
--- /dev/null
+++ b/sys-boot/yaboot/files/chrpfix.patch
@@ -0,0 +1,23 @@
+--- Makefile.orig	2004-03-22 12:04:32.056149336 -0600
++++ Makefile	2004-03-22 12:05:51.824138328 -0600
+@@ -103,9 +103,11 @@
+ 
+ all: yaboot addnote mkofboot
+ 
+-yaboot: $(OBJS)
++yaboot: $(OBJS) addnote
+ 	$(LD) $(LFLAGS) $(OBJS) $(LLIBS) $(lgcc) -o second/$@
+ 	chmod -x second/yaboot
++	cp second/yaboot second/yaboot.chrp
++	util/addnote second/yaboot.chrp
+ 
+ addnote:
+ 	$(CC) $(UCFLAGS) -o util/addnote util/addnote.c
+@@ -185,6 +187,7 @@
+ 	install -d -o root -g root -m 0755 ${ROOT}/${PREFIX}/${MANDIR}/man5/
+ 	install -d -o root -g root -m 0755 ${ROOT}/${PREFIX}/${MANDIR}/man8/
+ 	install -o root -g root -m 0644 second/yaboot ${ROOT}/$(PREFIX)/lib/yaboot
++	install -o root -g root -m 0644 second/yaboot.chrp ${ROOT}/$(PREFIX)/lib/yaboot
+ 	install -o root -g root -m 0755 util/addnote ${ROOT}/${PREFIX}/lib/yaboot/addnote
+ 	install -o root -g root -m 0644 first/ofboot ${ROOT}/${PREFIX}/lib/yaboot/ofboot
+ 	install -o root -g root -m 0755 ybin/ofpath ${ROOT}/${PREFIX}/sbin/ofpath
diff --git a/sys-boot/yaboot/yaboot-1.3.11.ebuild b/sys-boot/yaboot/yaboot-1.3.11.ebuild
index 5585582ca6eb..ffcf02ca5041 100644
--- a/sys-boot/yaboot/yaboot-1.3.11.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.11.ebuild,v 1.3 2004/02/23 00:34:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.11.ebuild,v 1.4 2004/03/22 18:26:46 tgall Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ src_compile() {
 	[ -n "${CC}" ] || CC="gcc"
 	# dual boot patch
 	epatch ${FILESDIR}/yabootconfig-${PV}.patch
+	epatch ${FILESDIR}/chrpfix.patch
 	emake ${MAKEOPTS} CC="${CC}" || die
 }