Add patch for sysfs paths in ofpath from bug #253614.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 165 insertions, 3 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 16a22b0980f4..07b869037caf 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/yaboot
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.29 2008/05/13 03:21:09 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.30 2010/05/31 23:47:51 josejx Exp $
+
+*yaboot-1.3.14-r1 (31 May 2010)
+
+  31 May 2010; Joseph Jezak <josejx@gentoo.org> +yaboot-1.3.14-r1.ebuild,
+  +files/sysfs-ofpath.patch:
+  Add patch for sysfs paths in ofpath from bug #253614.
 
   13 May 2008; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.14.ebuild:
   Added mac-fdisk as a dependency for bug #220431.
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 8521a6be66da..079d186097a6 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX chrpfix.patch 979 RMD160 3614e117f5430fbe7e19fe79fd9ec950d5cab30b SHA1 08657c233ad4ac151bf0d4fe0a1c950558c9c3a1 SHA256 cbd5d5e1df0111619b58975d8605d36ce30767a129dd9de53fc302d750e03045
+AUX sysfs-ofpath.patch 3432 RMD160 9cd4283cb45db5139c6200feca6ceeebcbd3bef8 SHA1 cd001ebbd3fa63a753311521be8394dc4f2768b5 SHA256 a00601f12a361f19ec6ab7ef38c65b1f424624d65f80e30d9591618dc22a1f0e
 AUX yaboot-nopiessp.patch 1885 RMD160 ad6bc10b7f9eca86a155691ed11e7e8b234ff6bf SHA1 6adb7f426fede91e9f2a5276bf87b6f2ad0bea1d SHA256 69fcfa7a6c464304b8a9c68da8331909948686955f4a9e10d23505f700bee1ab
 AUX yabootconfig-1.3.13.patch 1655 RMD160 fd3e62c5cddbe359df3f2abee225392e0ff86144 SHA1 c50bd7dabe553e00c466cfa63cbdb9f20257a74b SHA256 ee662c068ba7800d1d0c85a927f3990658cc488ebd3672e40740b7473ba3bb20
 DIST yaboot-1.3.14.tar.gz 219089 RMD160 dd46fc044732c5bdf3dc23b3faa1dd746895cdd5 SHA1 2bf7594a921075371acf468a46776d0f93e315a6 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933
+EBUILD yaboot-1.3.14-r1.ebuild 1149 RMD160 5acee78ff99dddfbe7d8a1095f9fd33748475a02 SHA1 9b8f8bc5495dce2e822e07df1ac916c8d2a83d3d SHA256 341be4b8ea3e740fd187a07d615b979d5c7ac0564337ad9086bfc07df6e2659c
 EBUILD yaboot-1.3.14.ebuild 1107 RMD160 bb5c8e9696b67fe71e7a7e6e4e34be34a5f515a7 SHA1 7d04fa7ab77371eb5bedc54821cc077115c99b00 SHA256 3f9635300d11136feb5a26bb03c05c76e60c6923695049abc95e5c25efafaf6a
-MISC ChangeLog 8464 RMD160 a49ab26fc51b8b65c7bc4d4cb86175af08264c74 SHA1 023c813813bb1f2e0c03a6b22b4f674fef227931 SHA256 afce848a7a39ad129f15c640a3f90c88ae2fe6c629bc1ac7d9e9a96e9a7ef3c5
+MISC ChangeLog 8657 RMD160 b9646dfe345656963a748f502299be9638e58c8a SHA1 58f0b54e4007622b1234eacccd5d1ff313ce1a7a SHA256 8ccdd8a76f631f88440d92c91efdaae1f0d17661ae171e38b912ebf51eac1c67
 MISC metadata.xml 175 RMD160 a674189a82ea2172e0949ce49eb80dd5bc23ddf5 SHA1 c203d37a08bfb7b826b080650c3019705490bfb1 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkwESnMACgkQcsIHjyDViGTT2ACgtzqjRnamay3/QUk3EzlQpRD8
+Rh8AoILkN4jDhlZ1OUuse47p2aSmzjxq
+=+PCC
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/files/sysfs-ofpath.patch b/sys-boot/yaboot/files/sysfs-ofpath.patch
new file mode 100644
index 000000000000..7ebc0bfac86f
--- /dev/null
+++ b/sys-boot/yaboot/files/sysfs-ofpath.patch
@@ -0,0 +1,105 @@
+--- ybin/ofpath	2008-08-03 04:00:35.000000000 -0400
++++ ybin/ofpath	2009-01-09 13:46:12.000000000 -0500
+@@ -337,15 +337,18 @@
+ 
+ ide_ofpath()
+ {
+-    if [ ! -L "/proc/ide/$DEVNODE" ] ; then
++    if [ ! -L "/proc/ide/$DEVNODE" ] && [ ! -e "/sys/block/$DEVNODE" ] ; then
+ 	echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
+ 	return 1
+     fi
+ 
+-    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
+-    if [ -z "$IDEBUS" ] ; then
+-	echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
+-	return 1
++    if [ -L "/proc/ide/$DEVNODE" ] ; then
++    	    local USE_OLD_PROC=1
++	    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
++	    if [ -z "$IDEBUS" ] ; then
++		echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
++		return 1
++   	 fi
+     fi
+ 
+     case "$(uname -r)" in
+@@ -363,7 +366,8 @@
+ 		echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
+ 		return 1
+ 	    fi
+-	    local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
++	    local OF1275IDE=$(cd -P "${SYS}/block/${DEVNODE}/device" && pwd)
++	    OF1275IDE="${OF1275IDE}/../../devspec"
+ 	    ;;
+ 	*)
+ 	    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
+@@ -402,34 +406,41 @@
+ 	    return 1
+ 	fi
+ 
+-	if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
+-	    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
+-	    return 1
+-	fi
+-
+-	case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
+-	    ide|ata)
+-		local MASTER="/disk@0"
+-		local SLAVE="/disk@1"
+-		;;
+-	    pci-ide|pci-ata)
+-		local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
+-		local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
+-		;;
+-	    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
+-		local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
+-		local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
+-		;;
+-	    spi)
+-		local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
+-		local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
+-		;;
+-	    *)
+-		echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
+-		return 1
+-		;;
+-	esac
++	
++	if [ "${USE_OLD_PROC}" = "1" ] ; then
++		if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
++		    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
++		    return 1
++		fi
+ 
++		case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
++		    ide|ata)
++			local MASTER="/disk@0"
++			local SLAVE="/disk@1"
++			;;
++		    pci-ide|pci-ata)
++			local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
++			local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
++			;;
++		    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
++			local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
++			local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
++			;;
++		    spi)
++			local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
++			local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
++			;;
++		    *)
++			echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
++			return 1
++			;;
++		esac
++	else
++	    ### I don't know what other disks would look like... FIXME
++	    local MASTER="/disk@0"
++	    local SLAVE="/disk@1"
++	fi
++	
+ 	case "$DEVNODE" in
+ 	    hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
+ 		echo "${DEVSPEC}${MASTER}:$PARTITION"
diff --git a/sys-boot/yaboot/yaboot-1.3.14-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.14-r1.ebuild
new file mode 100644
index 000000000000..3a910c6ee1da
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.14-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.14-r1.ebuild,v 1.1 2010/05/31 23:47:51 josejx Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="PPC Bootloader"
+SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
+HOMEPAGE="http://yaboot.ozlabs.org"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~ppc -ppc64"
+IUSE="ibm"
+
+DEPEND="sys-apps/powerpc-utils"
+RDEPEND="!ibm? ( sys-fs/hfsutils
+				 sys-fs/hfsplusutils
+				 sys-fs/mac-fdisk )"
+
+PROVIDE="virtual/bootloader"
+
+src_compile() {
+	export -n CFLAGS
+	export -n CXXFLAGS
+	[ -n "$(tc-getCC)" ] || CC="gcc"
+	# dual boot patch
+	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
+	epatch "${FILESDIR}/chrpfix.patch"
+	epatch "${FILESDIR}/yaboot-nopiessp.patch"
+	epatch "${FILESDIR}/sysfs-ofpath.patch"
+	emake PREFIX=/usr MANDIR=share/man 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}" PREFIX=/usr MANDIR=share/man install || die
+}