From owner-svn-src-all@FreeBSD.ORG  Thu May 12 15:03:18 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 08B76106564A;
	Thu, 12 May 2011 15:03:18 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EC34B8FC19;
	Thu, 12 May 2011 15:03:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4CF3HH2041987;
	Thu, 12 May 2011 15:03:17 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4CF3HuI041985;
	Thu, 12 May 2011 15:03:17 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105121503.p4CF3HuI041985@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 12 May 2011 15:03:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221814 - head/release/powerpc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 May 2011 15:03:18 -0000

Author: nwhitehorn
Date: Thu May 12 15:03:17 2011
New Revision: 221814
URL: http://svn.freebsd.org/changeset/base/221814

Log:
  Add (somewhat speculative) bootable CD support for PAPR/pSeries-type
  systems. In principle, FreeBSD should run on at least some of these
  already, and support for the remainder will hopefully show up eventually,
  so add this while I'm thinking about it.

Modified:
  head/release/powerpc/mkisoimages.sh

Modified: head/release/powerpc/mkisoimages.sh
==============================================================================
--- head/release/powerpc/mkisoimages.sh	Thu May 12 14:27:28 2011	(r221813)
+++ head/release/powerpc/mkisoimages.sh	Thu May 12 15:03:17 2011	(r221814)
@@ -24,6 +24,7 @@
 # into base-bits-dir as part of making the image.
 
 if [ "x$1" = "x-b" ]; then
+	# Apple boot code
 	uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu
 	bzip2 -d /tmp/hfs-boot-block.bz2
 	OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ')
@@ -31,6 +32,19 @@ if [ "x$1" = "x-b" ]; then
 	dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
 
 	bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
+
+	# pSeries/PAPR boot code
+	mkdir $4/ppc
+	cat > $4/ppc/bootinfo.txt << EOF
+<CHRP-BOOT>
+<DESCRIPTION>FreeBSD/powerpc</DESCRIPTION>
+<OS-NAME>FreeBSD</OS-NAME>
+<BOOT-SCRIPT>
+boot &device;:&partition;,\boot\loader &device;:0
+</BOOT-SCRIPT>
+</CHRP-BOOT>
+EOF
+
 	shift
 else
 	bootable=""
@@ -48,3 +62,5 @@ echo "/dev/iso9660/`echo $LABEL | tr '[:
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab
 rm /tmp/hfs-boot-block
+rm -rf $1/ppc
+