Added patch to fix devspec path on newer kernels.

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

4 files changed, 72 insertions, 5 deletions

diff --git a/sys-boot/yaboot-static/ChangeLog b/sys-boot/yaboot-static/ChangeLog
index 188fb15eb5f6..373ca3042284 100644
--- a/sys-boot/yaboot-static/ChangeLog
+++ b/sys-boot/yaboot-static/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/yaboot-static
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.26 2012/02/24 15:18:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.27 2012/05/12 03:20:41 josejx Exp $
+
+*yaboot-static-1.3.17-r1 (12 May 2012)
+
+  12 May 2012; Joseph Jezak <josejx@gentoo.org>
+  +yaboot-static-1.3.17-r1.ebuild, +files/new-ofpath-devspec.patch:
+  Add patch to fix devspec location.
 
 *yaboot-static-1.3.17 (24 Feb 2012)
 *yaboot-static-1.3.16-r1 (24 Feb 2012)
diff --git a/sys-boot/yaboot-static/Manifest b/sys-boot/yaboot-static/Manifest
index 620cfde6bc5f..1d60dfe6662c 100644
--- a/sys-boot/yaboot-static/Manifest
+++ b/sys-boot/yaboot-static/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX new-ofpath-devspec.patch 944 RMD160 5e6b4c020e43881006805e1c2dadae1a9f5e384f SHA1 3afa6096c390e6d98b0aa6843f8f2eab66ba1c93 SHA256 8723dc88c09028e0724976aecad6f6b2a383996f74dcb1fc39ea70b171c2bc91
 AUX sysfs-ofpath.patch 3440 RMD160 da11a99c81ddf6794fb8b3b5ea911bbcadc5c34c SHA1 2042100c13caab240ebce6cd8280e67e2a14d87a SHA256 6fe57d768b400cdbf7774ec127dcc61a1a7a098869c9708785cfbf16d6c72c45
 DIST yaboot-static-1.3.14.tbz2 154587 RMD160 6f2951b19cf7ad61a39b490468c028621238eb02 SHA1 b36b7cfcba6a3f756d11b4edaf0c2ec2c361ed7c SHA256 e9632c87b4982cfbc614c6cc58e64740d8af5bd3c52ae78c0a9e0b1d062825f0
 DIST yaboot-static-1.3.16.tbz2 159798 RMD160 d8237c94f6f374025f288024aa3d4cfa63ec0eb0 SHA1 b27f9a2fc3f215e31dc6a9a60d6316f9ad015437 SHA256 17ef850e3cdf614d45fff7d837960227d40f09071c418d3b69dd6b82d06f3135
 DIST yaboot-static-1.3.17.tbz2 162142 RMD160 158afe6afdf593980e3a9ffed5dedb2aa0e05354 SHA1 8b71d4ae33fb14fa9e51148b3e23a25451d0d61a SHA256 88f5f080bf99624c969bbf7e04cee86a1699142bd58396f1c2ac027b3385ae3f
 EBUILD yaboot-static-1.3.14-r1.ebuild 911 RMD160 55bdc668dddce89402b9947ccd25c48e3d48d547 SHA1 1c9e35f559bbfa58342cb4c2aa346232b205cc0c SHA256 0bbdd02d69ef6fbb25e8ef3e53e20630893afe49ab6f0a9e5cc82d5711877769
 EBUILD yaboot-static-1.3.16-r1.ebuild 766 RMD160 e4ae59b56cbca716888a7c8dbe0747d2e98ede17 SHA1 182bbca7e8b4c86b16da3beaa1880bb458e1d38b SHA256 3e4cb0149d2f5e93ee8e0b0fbeb9b21827d73128e03ab7d26eb0befbcd89896c
+EBUILD yaboot-static-1.3.17-r1.ebuild 881 RMD160 f5d81953a174eb197d47eafa3544e1b4e1091a59 SHA1 18ef2ac9fc9c4c87445bde780138d935e686736b SHA256 d4706e3347b1c02bc179a49b8a1c866a9b2ce1a9fe80dd5c023b3a6994ffc5b8
 EBUILD yaboot-static-1.3.17.ebuild 763 RMD160 4f3632e51cf5317d57a8d3a934174a53516a57ef SHA1 b7ea92dd114b3c558a462dc30ba8a37053f93fd6 SHA256 8241fc35cba38e770b1a4e6dcfb2fac0b03d29a013e51f33fdab889a5932e024
-MISC ChangeLog 4121 RMD160 62381b1fc8f9c2fad7fd130363eaeb244ef49175 SHA1 14269d899dd184bcae817dda3b4a68b18252126a SHA256 9516ccb24fe8c5a4a46a1841435ec8b699bfbeab7766898cd79831e9e3d7b69a
+MISC ChangeLog 4315 RMD160 e3a679d628c4571cd03f4ede7f92af9e60f9cea0 SHA1 5906732bfae9b401a86307de82482f805b7cf52c SHA256 28ca66ec4f5df4ae8d834be20b6cf303c5baf586e9ff908af7702414a406949d
 MISC metadata.xml 158 RMD160 068114516cc9a3b6e8b75f075faf584a4de6dc9e SHA1 ffce34392a9adadf4df1243fdceb2ab7d0386e93 SHA256 32350539e29186f246efdc4907b750f94365676eaf013b11832b2a7015e8e218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9HqmQACgkQcsIHjyDViGSr5QCfZGZ49cNLxhxt14M//PiEJw4M
-pB8An1pzjN0mYp+mDGtzvHWBUKXRPTw9
-=Duff
+iEYEARECAAYFAk+t1w4ACgkQcsIHjyDViGS2LgCeLmsp7Mm4T0Qx5ObKVbEwokEP
+M08AoIo9nibs0ggOlscgGvhrOBI3qKTg
+=XGNj
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
new file mode 100644
index 000000000000..eec840ee10fe
--- /dev/null
+++ b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
@@ -0,0 +1,28 @@
+--- usr/sbin/ofpath.bak	2012-05-09 12:24:51.709911981 -0400
++++ usr/sbin/ofpath	2012-05-09 12:32:19.661560544 -0400
+@@ -85,11 +85,20 @@
+ [ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
+ 
+ ### Get the OF Path of the controller
+-case ${DISK_NAME} in
+-	sd*|sg*|sr*) CONTROLLER_PATH=$(cat ${DEVPATH}/../../../devspec) ;;
+-	hd*) CONTROLLER_PATH=$(cat ${DEVPATH}/../../devspec) ;;
+-	*) CONTROLLER_PATH="" ;;
+-esac
++if [ -e  "${DEVPATH}/../../devspec" ]; then
++	### /dev/hd*
++	CONTROLLER_PATH=$(cat ${DEVPATH}/../../devspec);
++elif [ -e "${DEVPATH}/../../../devspec" ]; then
++	### /dev/sd* on kernel <3.3
++	CONTROLLER_PATH=$(cat ${DEVPATH}/../../../devspec);
++elif [ -e "${DEVPATH}/../../../../devspec" ]; then
++	### /dev/sd* on kernel 3.3+	
++	CONTROLLER_PATH=$(cat ${DEVPATH}/../../../../devspec);
++else
++	### None of the above...
++	CONTROLLER_PATH="";
++fi
++
+ if [ -z "$CONTROLLER_PATH" ]; then
+ 	echo "Unable to determine controller path!"
+ 	exit 1
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild
new file mode 100644
index 000000000000..e11b59b31884
--- /dev/null
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild,v 1.1 2012/05/12 03:20:41 josejx Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
+### Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe
+
+HOMEPAGE="http://penguinppc.org/projects/yaboot/"
+SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc64"
+IUSE="ibm"
+DEPEND="!sys-boot/yaboot
+		sys-apps/powerpc-utils"
+RDEPEND="!ibm? ( sys-fs/hfsutils
+				 sys-fs/hfsplusutils
+				 sys-fs/mac-fdisk )"
+
+src_prepare() {
+	# Fix the devspec path on newer kernels
+	epatch "${FILESDIR}/new-ofpath-devspec.patch"
+}
+
+src_install() {
+	cp -pPR "${WORKDIR}"/* "${D}" || die "cp failed"
+}