New yaboot. Version bump.

8 files changed, 197 insertions, 25 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index fc6e6a87b545..6894c9917040 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.12 2004/10/29 00:21:40 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.13 2004/11/05 04:16:30 dostrow Exp $
+
+*yaboot-1.3.13 (04 Nov 2004)
+  04 Nov 2004; Daniel Ostrow<dostrow@gentoo.org> yaboot-1.3.13.ebuild,
+  files/yabootconfig-1.3.13.patch, files/yaboot-1.3.13-ofpath.patch,
+  files/yaboot-1.3.12-k2sata-ofpath.patch:
+  Version bump and mild typo fix
 
   29 Oct 2004; Luca Barbato <lu_zero@gentoo.org> yaboot-1.3.10-r1.ebuild,
   yaboot-1.3.10-r2.ebuild, yaboot-1.3.10.ebuild, yaboot-1.3.11-r1.ebuild,
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 1762f6e87da5..4ab43ada4424 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,24 +1,28 @@
+MD5 018e6db94ff2d59d9bd3dff51f8810f1 ChangeLog 5427
+MD5 9c2a69b11bc766ffdc32016e0bb1e967 metadata.xml 219
+MD5 c816c61ba9381009fbb5b253d9103ab3 yaboot-1.3.10-r1.ebuild 978
 MD5 2157fda472b545042f8d78fadd66a513 yaboot-1.3.10-r2.ebuild 1029
-MD5 7ae8f165f89fe501bff0f10efa29fab5 ChangeLog 5181
-MD5 b75c6d97fc875ac5694e40476434f554 yaboot-1.3.12-r1.ebuild 1732
-MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 MD5 f33daf795b9038483303d31ef0132bc6 yaboot-1.3.10.ebuild 975
-MD5 73fa8f1a6c4173c368676d6e1174e8ef yaboot-1.3.12.ebuild 1066
-MD5 c816c61ba9381009fbb5b253d9103ab3 yaboot-1.3.10-r1.ebuild 978
 MD5 fc40bee881205e599e86e8468d38e373 yaboot-1.3.11-r1.ebuild 1162
 MD5 62ae8a4dc856f35a26bbb4042f42b9b0 yaboot-1.3.11.ebuild 1103
-MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65
+MD5 b75c6d97fc875ac5694e40476434f554 yaboot-1.3.12-r1.ebuild 1732
+MD5 73fa8f1a6c4173c368676d6e1174e8ef yaboot-1.3.12.ebuild 1066
+MD5 e61c03af5b614842559ce2cf62e4a3c2 yaboot-1.3.13.ebuild 1726
+MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
 MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10 65
-MD5 d0f2552953da4d05dfe1cd68662a3ca2 files/yaboot-1.3.12-k2sata-ofpath.patch 1102
-MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.12.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 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987
+MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65
+MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12 65
+MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12-r1 65
 MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974
+MD5 627830060775688b9e45e1b1a6dd4cfe files/yaboot-1.3.12-k2sata-ofpath.patch 792
 MD5 707fd650a40d63439e1417660b062d2a files/yaboot-3.4.patch 292
-MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
-MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987
-MD5 cdcf832620e73598eb112a6000509afd files/digest-yaboot-1.3.10-r2 270
-MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12-r1 65
-MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12 65
-MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10-r1 65
 MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898
+MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987
+MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987
+MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.12.patch 1987
+MD5 de48fb3a5eb3326145096a19c6b07a6a files/yaboot-1.3.13-ofpath.patch 2921
+MD5 116ac118087f29161456b653a8429522 files/yabootconfig-1.3.13.patch 1655
+MD5 7ec6d127710031625482bca6563021eb files/digest-yaboot-1.3.13 65
diff --git a/sys-boot/yaboot/files/digest-yaboot-1.3.13 b/sys-boot/yaboot/files/digest-yaboot-1.3.13
new file mode 100644
index 000000000000..05cbce5d22c0
--- /dev/null
+++ b/sys-boot/yaboot/files/digest-yaboot-1.3.13
@@ -0,0 +1 @@
+MD5 f12798d1b2063f21d07e0ae7f602ccaf yaboot-1.3.13.tar.gz 275886
diff --git a/sys-boot/yaboot/files/yaboot-1.3.12-k2sata-ofpath.patch b/sys-boot/yaboot/files/yaboot-1.3.12-k2sata-ofpath.patch
index c9c345e3ee71..64fd28a36fc2 100644
--- a/sys-boot/yaboot/files/yaboot-1.3.12-k2sata-ofpath.patch
+++ b/sys-boot/yaboot/files/yaboot-1.3.12-k2sata-ofpath.patch
@@ -1,14 +1,5 @@
 --- yaboot-1.3.12.orig/ybin/ofpath	2004-05-23 17:20:56.382633120 -0400
 +++ yaboot-1.3.12/ybin/ofpath	2004-05-23 17:20:26.013249968 -0400
-@@ -293,7 +293,7 @@
- 	    ;;
- 	mesh)
- 	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
--			lgrep "$i" "mesh" ; done)"
-+			lg/rep "$i" "mesh" ; done)"
- 	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
- 	    echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
- 	    ;;
 @@ -301,7 +301,13 @@
  	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
  			lgrep "$i" "k2-s-ata" ; done)"
diff --git a/sys-boot/yaboot/files/yaboot-1.3.13-ofpath.patch b/sys-boot/yaboot/files/yaboot-1.3.13-ofpath.patch
new file mode 100644
index 000000000000..33461266feac
--- /dev/null
+++ b/sys-boot/yaboot/files/yaboot-1.3.13-ofpath.patch
@@ -0,0 +1,66 @@
+--- yaboot-1.3.13.orig/ybin/ofpath	2004-11-04 21:57:17.000000000 -0500
++++ yaboot-1.3.13/ybin/ofpath	2004-11-04 22:36:41.234195024 -0500
+@@ -8,6 +8,9 @@
+ ## Portions based on show_of_path.sh:
+ ##
+ ## Copyright (C) 2000 Olaf Hering <olh@suse.de>
++##
++## sbp2 patch:
++## Copyright (C) 2004 Christiaan Welvaart <cjw@time4t.net>
+ ## 
+ ## This program is free software; you can redistribute it and/or
+ ## modify it under the terms of the GNU General Public License
+@@ -301,7 +304,52 @@
+ 	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
+ 			lgrep "$i" "k2-s-ata" ; done)"
+ 	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+-	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$DEVICE_ID/disk@0:$PARTITION"
++	    K2_DEVICE_ID=0
++	    while [ "$DEVICE_PATH" = "" ] ; do
++	        SCSI_HOSTNUMBER=`expr $SCSI_HOSTNUMBER - 1`
++	        let "K2_DEVICE_ID += 1"
++	        DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
++	    done
++	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$K2_DEVICE_ID/disk@0:$PARTITION"
++	    ;;
++	usb-storage)
++	    if [ ! -d /sys/devices ]
++	    then
++	        echo 1>&2 "sysfs must be mounted on /sys for usb-storage support"
++	        return 1
++	    fi
++	    local USBDEV=`readlink /sys/block/$DEVNODE/device`
++	    local PCIADDR=`echo ${USBDEV#../../devices/} |sed -re 's#(pci[^/]*/[^/]*)/.*#\1#'`
++	    local USBPATH=`echo ${USBDEV} |sed -re 's#.*/[0-9]*-([0-9\.]*):[0-9\.]*/host[0-9]*/[^/]*#\1#'`
++	    local DEVSPEC=`cat /sys/devices/$PCIADDR/devspec`
++	    local DISKPATH=`echo $USBPATH |sed -re 's#((.*\.)*)([0-9]*)$#\1disk@\3#' |sed -re 's#([0-9]*)\.#hub@\1/#'`
++	    if [ `cat /proc/device-tree${DEVSPEC}/device_type` = ehci ]
++	    then
++	        local USB2PORT=`echo ${DEVSPEC} |sed -re 's#^.*,([0-9]+)#\1#'`
++	        local USB1PORT=`echo ${DISKPATH} |sed -re 's#^[^@]+@([0-9]+).*#\1#'`
++	        USB1PORT=`expr $USB1PORT - 1`
++	        DISKPATH=`echo ${DISKPATH} |sed -re "s/^([^@]+)@${USB2PORT}(.*)/\1@1\2/"`
++	        DEVSPEC=`echo ${DEVSPEC} |sed -re "s/^(.*),${USB2PORT}\$/\1,${USB1PORT}/"`
++	    fi
++	    echo "${DEVSPEC#,0}/${DISKPATH}:${PARTITION}"
++	    ;;
++	"")
++	    # sbp-2 driver does not have a dir in /proc/scsi
++	    if [ -d /sys/devices ]
++	    then
++	        local SYSFSDEV=`readlink /sys/block/$DEVNODE/device`
++	        local FWNODE=`echo ${SYSFSDEV} |sed -re 's#^.*/fw-host[0-9]+/([^/]+)/.*#\1#'`
++	        local PCIADDR=`echo ${SYSFSDEV#../../devices/} |sed -re 's#(pci[^/]*/[^/]*)/.*#\1#'`
++	        local DEVSPEC=`cat /sys/devices/$PCIADDR/devspec`
++	        local OFNODE="${DEVSPEC}/node@${FWNODE}/sbp-2/disk@0"
++	        if [ -f /proc/device-tree${OFNODE}/device_type ]
++	        then
++	            echo "${OFNODE}:${PARTITION}"
++	            return 0
++	        fi
++	    fi
++	    echo 1>&2 "$PRG: cannot find SCSI driver for ${DEVNODE}"
++	    return 1
+ 	    ;;
+ 	*)
+ 	    echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"
diff --git a/sys-boot/yaboot/files/yabootconfig-1.3.13.patch b/sys-boot/yaboot/files/yabootconfig-1.3.13.patch
new file mode 100644
index 000000000000..4bc13eef8b18
--- /dev/null
+++ b/sys-boot/yaboot/files/yabootconfig-1.3.13.patch
@@ -0,0 +1,42 @@
+--- yaboot-1.3.13.orig/ybin/yabootconfig	2004-11-04 21:57:17.000000000 -0500
++++ yaboot-1.3.13/ybin/yabootconfig	2004-11-04 22:40:45.503060512 -0500
+@@ -5,6 +5,8 @@
+ ## yabootconfig generates a simple /etc/yaboot.conf
+ ## Copyright (C) 2001, 2002, 2003 Ethan Benson
+ ##
++## Patched for Gentoo and dual boot - Mark Guertin <gerk@gentoo.org>
++##
+ ## This program is free software; you can redistribute it and/or
+ ## modify it under the terms of the GNU General Public License
+ ## as published by the Free Software Foundation; either version 2
+@@ -264,6 +266,30 @@
+     return 0
+ }
+ 
++dualboot()
++{
++       DRIVELIST=`ls -d /dev/?d?* | grep "[sh]d[abcdefghijkl]" | cut -b 6-8 | sort -u`
++
++       for i in $DRIVELIST
++       do
++               HFS=`mac-fdisk -l "/dev/$i" | grep '\<Apple_HFS\>' | grep -v "CDROM" | cut -d" " -f1`
++               for h in $HFS
++               do
++                       if [ !-x `hpmount -r $h` > /dev/null 2>&1 ] ; then
++                               if [ `hpls mach_kernel 2>/dev/null` ] ; then
++                                       [ "$QUIET" = 0 ] && echo "Found possible OS X/Darwin partition at $h"
++                                       OSX=$h
++                               fi
++                               if [ "`hpls "System Folder" 2>/dev/null`" ] ; then
++                                       [ "$QUIET" = 0 ] && echo "Found possible Mac OS partition at $h"
++                                       MACOS=$h
++                               fi
++                               hpumount $h > /dev/null 2>&1
++                       fi
++               done
++       done
++}
++
+ ##########
+ ## Main ##
+ ##########
diff --git a/sys-boot/yaboot/metadata.xml b/sys-boot/yaboot/metadata.xml
index 034c09eb248a..63090d546dfb 100644
--- a/sys-boot/yaboot/metadata.xml
+++ b/sys-boot/yaboot/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>ppc</herd>
+<maintainer>
+  <email>dostrow@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/yaboot/yaboot-1.3.13.ebuild b/sys-boot/yaboot/yaboot-1.3.13.ebuild
new file mode 100644
index 000000000000..c52bb9ed7f11
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.13.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.13.ebuild,v 1.1 2004/11/05 04:16:30 dostrow Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="PPC Bootloader"
+SRC_URI="http://penguinppc.org/projects/yaboot/${P}.tar.gz"
+HOMEPAGE="http://penguinppc.org/projects/yaboot/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc -ppc64"
+IUSE=""
+
+DEPEND="sys-apps/powerpc-utils
+	sys-fs/hfsutils
+	sys-fs/hfsplusutils"
+
+PROVIDE="virtual/bootloader"
+
+MAKEOPTS='PREFIX=/usr MANDIR=share/man'
+
+pkg_setup() {
+	case "$(uname -r)" in
+		2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*)
+		eerror "You are running Linux kernel `uname -r` which is not supported"
+		eerror "Please note if you are running a 2.6 kernel the verison"
+		eerror "of ofpath included in this revision of yaboot requires"
+		eerror "that you run a kernel >= 2.6.3."
+		die
+		;;
+	esac
+}
+
+src_compile() {
+	export -n CFLAGS
+	export -n CXXFLAGS
+	[ -n "$(tc-getCC)" ] || CC="gcc"
+	# dual boot patch
+	epatch ${FILESDIR}/yabootconfig-${PV}.patch
+	epatch ${FILESDIR}/chrpfix.patch
+	epatch ${FILESDIR}/yaboot-3.4.patch
+	epatch ${FILESDIR}/yaboot-${PV}-ofpath.patch
+	emake ${MAKEOPTS} CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	cp etc/yaboot.conf etc/yaboot.conf.bak
+	sed -e 's/\/local//' etc/yaboot.conf >| etc/yaboot.conf.edit
+	mv -f etc/yaboot.conf.edit etc/yaboot.conf
+	make ROOT=${D} ${MAKEOPTS} install || die
+}
+
+pkg_postinst() {
+	ewarn "Please note if you are running a 2.6 kernel the verison"
+	ewarn "of ofpath included in this revision of yaboot requires"
+	ewarn "that you run a kernel >= 2.6.3 Prior versions are unsupported."
+}