Stefan Fiedler:

package/powerpc/yaboot/gcc34.patch

@@ -1,38 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/powerpc/yaboot/gcc34.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-
-The usual gcc-3.4 fixes.
-
-  - Rene Rebe <rene@exactcode.de>
-
-diff -ur yaboot-1.3.11-orig/lib/strstr.c yaboot-1.3.11/lib/strstr.c
---- yaboot-1.3.11-orig/lib/strstr.c	2001-09-20 15:15:31.000000000 +0200
-+++ yaboot-1.3.11/lib/strstr.c	2004-05-04 11:23:49.000000000 +0200
-@@ -76,7 +76,9 @@
- 	      a = *++haystack;
- 	      if (a == '\0')
- 		goto ret0;
--shloop:	    }
-+shloop:
-+	  ((void)0);
-+          }
-           while (a != b);
- 
- jin:	  a = *++haystack;

package/powerpc/yaboot/prefix.patch

@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/powerpc/yaboot/prefix.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- yaboot-1.3.10/Makefile.orig	1904-01-01 00:59:57.000000000 +0000
-+++ yaboot-1.3.10/Makefile	1904-01-01 01:07:44.000000000 +0000
-@@ -7,7 +7,7 @@
- DEBUG = 0
- # make install vars
- ROOT =
--PREFIX = usr/local
-+PREFIX = usr
- MANDIR = man
- # command used to get root (needed for tarball creation)
- GETROOT = fakeroot

package/powerpc/yaboot/yaboot.conf

@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -21,25 +21,18 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+var_append makeopt " " "ROOT=$root PREFIX=/usr CROSS=$archprefix MANDIR=/share/man"
+var_append makeinstopt " " "ROOT=$root PREFIX=/usr CROSS=$archprefix MANDIR=/share/man"
+
+hook_add postinstall 3 "yaboot_pi"
 yaboot_pi(){
 	cp -v $confdir/stone_mod_yaboot.sh $root/etc/stone.d/mod_yaboot.sh
 
-	# create a specially prepared binary that can be run from OF directly
-	cp -v $root/$prefix/lib/yaboot/{yaboot,yaboot.rs6k}
-	$root/$prefix/lib/yaboot/addnote $root/$prefix/lib/yaboot/yaboot.rs6k
+	if [ "$ROCKCFG_CROSSBUILD" = 0 ] ; then
+		# create a specially prepared binary that can be run from OF directly
+		cp -v $root/$prefix/lib/yaboot/{yaboot,yaboot.rs6k}
+		$root/$prefix/lib/yaboot/addnote $root/$prefix/lib/yaboot/yaboot.rs6k
+	fi
 
 	echo '$STONE yaboot yaboot_setup' > $root/etc/stone.d/setup_yaboot.sh
 }
-
-hook_add postinstall 3 "yaboot_pi"
-hook_add premake 3 "yaboot_premake"
-
-yaboot_premake() {
-	if [ $ROCKCFG_CROSSBUILD = 1 ] ; then
-		# tell yaboot how to cross-compile
-		sed -i "s,^ROOT =,ROOT = $xroot," Makefile
-		sed -i "s,^CROSS =,CROSS = $archprefix," Makefile
-	else
-		sed -i "s,^ROOT =,ROOT = $root," Makefile
-	fi
-}

package/powerpc/yaboot/yaboot.desc

@@ -39,7 +39,7 @@
 
 [L] GPL
 [S] Stable
-[V] 1.3.13
-[P] X -1---5---9 218.200
+[V] 1.3.14
+[P] X --X--5---9 218.200
 
-[D] 1961696557 yaboot-1.3.13.tar.gz http://yaboot.ozlabs.org/releases/
+[D] 4271877210 yaboot-1.3.14.tar.gz http://yaboot.ozlabs.org/releases/

package/target-finish/bootloader/powerpc/build.sh

@@ -3,8 +3,10 @@ use_yaboot=1
 
 cd $disksdir
 
-echo "Creating cleaning boot directory:"
-rm -rfv boot/*-rock boot/System.map boot/kconfig*
+# yaboot doesn't seem to like the symlink.
+echo "Renaming kernel image:"
+rm -vf boot/vmlinux
+mv -vf boot/vmlinux_* boot/vmlinux
 
 if [ $use_yaboot -eq 1 ]
 then
@@ -12,11 +14,9 @@ then
 	#
 	echo "Extracting yaboot boot loader images."
 	mkdir -p boot etc
-	tar -O $taropt $base/build/${ROCKCFG_ID}/ROCK/pkgs/yaboot.tar.bz2 \
-	    usr/lib/yaboot/yaboot > boot/yaboot
-	tar -O $taropt $base/build/${ROCKCFG_ID}/ROCK/pkgs/yaboot.tar.bz2 \
-            usr/lib/yaboot/yaboot.rs6k > boot/yaboot.rs6k
-	cp boot/yaboot.rs6k install.bin
+	cp -v $root/usr/lib/yaboot/yaboot boot/
+	cp -v $root/usr/lib/yaboot/yaboot.rs6k boot/
+	cp -v boot/yaboot.rs6k install.bin
 	#
 	echo "Creating yaboot config files."
 	cp -v $confdir/powerpc/{boot.msg,ofboot.b} \
@@ -30,9 +30,6 @@ then
 		cat $confdir/powerpc/yaboot.conf
 	) > boot/yaboot.conf
 	#
-	echo "Moving image (initrd) to boot directory."
-	mv -v initrd.gz boot/
-	#
 	echo "Copy more config files."
 	cp -v $confdir/powerpc/mapping .
 	#
@@ -41,7 +38,6 @@ then
 		BOOT	-hfs -part -map $datadir/mapping -hfs-volid "ROCK_Linux_CD"
 		BOOTx	-hfs-bless boot -sysid PPC -l -L -r -T -chrp-boot
 		BOOTx   --prep-boot install.bin
-		DISK1	$datadir/boot/ boot/
 		DISK1	$datadir/etc/ etc/
 		DISK1	$datadir/install.bin install.bin
 	EOT