rpms/yaboot/devel yaboot-1.3.13-ofpath-firewire-usb.patch, NONE, 1.1 yaboot.spec, 1.39, 1.40

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30094

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.13-ofpath-firewire-usb.patch 
Log Message:
Resolves: 208768
USB and Firewire support for ofpath


yaboot-1.3.13-ofpath-firewire-usb.patch:
 ofpath |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE yaboot-1.3.13-ofpath-firewire-usb.patch ---
--- yaboot-1.3.13/ybin/ofpath.firewire	2006-11-16 12:58:15.000000000 +0000
+++ yaboot-1.3.13/ybin/ofpath	2006-11-16 13:03:03.000000000 +0000
@@ -250,7 +250,7 @@
 	DEVHOST="$(v=$(echo ${DEVINFO##*Host: scsi}) ; echo ${v%% *})"
 	[ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVHOST=$DEVHOST"
 
-	if [ "$DEVTYPE" = "Direct-Access" ] ; then
+	if [ "$DEVTYPE" = "Direct-Access" ] || [ "$DEVTYPE" = "Direct-Access-RBC" ] ; then
 	    DEVCOUNT="$(($DEVCOUNT + 1))"
 	    [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVCOUNT=$DEVCOUNT"
 	    if [ "$SUBDEV" = "$DEVCOUNT" ] ; then
@@ -311,9 +311,19 @@
 	    done
 	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$K2_DEVICE_ID/disk at 0:$PARTITION"
 	    ;;
-        sbp2)
+	usb-storage)
+            HOST_LIST="$(for i in `find /proc/device-tree -name name | grep usb` ; do
+                        lgrep "$i" "disk" ; done)"
+            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+            echo "${DEVICE_PATH##*device-tree}:$PARTITION"
+	    ;;
+	sbp2|"")
+            # sbp-2 driver may not have a dir in /proc/scsi
             HOST_LIST="$(for i in `find /proc/device-tree -name name` ; do
                         lgrep "$i" "sbp-2" ; done)"
+            if [ "$SCSI_HOSTNUMBER" = "" ] ; then
+                SCSI_HOSTNUMBER=1
+            fi
             DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
             echo "${DEVICE_PATH##*device-tree}/disk at 0:$PARTITION"
 	    ;;
@@ -821,7 +831,7 @@
 	    local DEVTYPE="$(v=$(echo ${DEVINFO##*Type: }) ; echo ${v%% *})"
 	    [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: fixdevfs: DEVTYPE=$DEVTYPE"
 
-	    if [ "$DEVTYPE" = "Direct-Access" ] ; then
+	    if [ "$DEVTYPE" = "Direct-Access" ] || [ "$DEVTYPE" = "Direct-Access-RBC" ] ; then
 		## Lets find out some more information
 		## get the device id.
 		local DEVID="$(v=$(echo ${DEVINFO##*Id: }) ; n=$(echo ${v%% *}) ; echo ${n#*0})"


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- yaboot.spec	9 Nov 2006 10:38:17 -0000	1.39
+++ yaboot.spec	16 Nov 2006 13:05:59 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -35,6 +35,7 @@
 Patch28: yaboot-1.3.13-multisata.patch
 Patch29: yaboot-1.3.13-dontwritehome.patch
 Patch30: yaboot-1.3.12-addnote.patch
+Patch31: yaboot-1.3.13-ofpath-firewire-usb.patch
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
@@ -79,6 +80,7 @@
 %patch28 -p1 -b .multisata
 %patch29 -p1 -b .bootwrite
 %patch30 -p1 -b .addnote
+%patch31 -p1 -b .firewire
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -112,6 +114,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Nov 16 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-4
+- Add support for usb/firewire from Alex Kanavin (#208768)
+
 * Thu Nov 09 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-3
 - Apply addnote patch (#184714)