New yaboot. Version bump.

4 files changed, 109 insertions, 9 deletions

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 ##
+ ##########