Added patch to fix devspec path on newer kernels.

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

4 files changed, 102 insertions, 5 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index ab9a2e1e4f82..d228fb55c908 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.41 2012/05/05 12:38:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.42 2012/05/12 03:08:26 josejx Exp $
+
+*yaboot-1.3.17-r2 (12 May 2012)
+
+  12 May 2012; Joseph Jezak <josejx@gentoo.org> +yaboot-1.3.17-r2.ebuild,
+  +files/new-ofpath-devspec.patch:
+  Add patch to fix devspec location.
 
   05 May 2012; Joseph Jezak <josejx@gentoo.org> files/yaboot-stubfuncs.patch:
   Update the stub functions to work with e2fsprogs-1.42.0.
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 36e374606996..7cb04f7255f6 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX chrpfix.patch 979 RMD160 3614e117f5430fbe7e19fe79fd9ec950d5cab30b SHA1 08657c233ad4ac151bf0d4fe0a1c950558c9c3a1 SHA256 cbd5d5e1df0111619b58975d8605d36ce30767a129dd9de53fc302d750e03045
 AUX new-ofpath 4319 RMD160 b86557264798e47d1ecfd3dc0b98f788d8132619 SHA1 d88c2df11c29f5bb1eef394da08b222e556877d8 SHA256 7a20474bdb92f0f99b1142c45583883932807bcb3534cdc14c1238a438152dcc
+AUX new-ofpath-devspec.patch 936 RMD160 e77a55d05c0b0b4fb02726736904990db25621a9 SHA1 293b99a8ed16650f48a0cc35c5e9bc181f43d928 SHA256 dc01e8fbfcd90a6361ee77c7d8e21a8f94e415155c2101dbd0d381bee1559e5b
 AUX sysfs-ofpath.patch 3432 RMD160 9cd4283cb45db5139c6200feca6ceeebcbd3bef8 SHA1 cd001ebbd3fa63a753311521be8394dc4f2768b5 SHA256 a00601f12a361f19ec6ab7ef38c65b1f424624d65f80e30d9591618dc22a1f0e
 AUX yaboot-1.3.16-memalign.patch 889 RMD160 e5ed2a0b6f0c9262ba9a9d3469c4a0c16e775383 SHA1 ee96d95f16098afeb97483287eb1306e6daa7243 SHA256 babf5a43e40197a234cb4c637e8f542b89c26ab801175f1977aaf05882d8592f
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1495 RMD160 e79f715a1aff784b9fee789c41a8fa6deeab7b89 SHA1 e35d0c217ec5ff16fb293814fe95bca9009ff333 SHA256 b49b64f54de33026f9a8238685735bd737f007b898650b2a42eac4c4dbbc205d
@@ -16,13 +17,14 @@ DIST yaboot-1.3.17.tar.gz 224325 RMD160 6dce388238a6a4e554c1ab3e7cae4fbe4416dde3
 EBUILD yaboot-1.3.14-r2.ebuild 1268 RMD160 dddd538a19b1720f3410f0c3d7089d64895ce78c SHA1 6b817e1c7169c1c8c43a71e5be0baed1aa6fa8d6 SHA256 7b47d3446fb9f7f26be7f17191a93082400643958792eb6f405a7dd732de73a6
 EBUILD yaboot-1.3.16.ebuild 1341 RMD160 4b2126940730b0b9741c598426bea086cd7826e6 SHA1 853d744db363364f0c5b9af85b24b0f2f9a63192 SHA256 6a21594179712ca4819fdb7265cc6aa259a69a108f82de6529e7fa97c86bef7c
 EBUILD yaboot-1.3.17-r1.ebuild 1488 RMD160 83212670ff0c43be96bec56cae6853994533d39a SHA1 7bc235469a41e9f40d1c54e91555e2f604feef01 SHA256 6e33d3551c269fa56651de2dd96c55a53747dd269ecb8db12037e0b4a8e6b661
+EBUILD yaboot-1.3.17-r2.ebuild 1641 RMD160 c251248ac5f13ce759b9f72ad7ff886d75827ac1 SHA1 be02494c168351fedb8749980f9cd33275c23f2e SHA256 24ab05a65b99f47517eea800ac4c3c64aa7011753f177020f4a0084eba44e9b3
 EBUILD yaboot-1.3.17.ebuild 1382 RMD160 a72b1e10eb053cadbb91ce70798fb3a8a6a39a4d SHA1 69456b6a0525fec2ff2b826f18f6b16f7b9abe8e SHA256 6193823e37ae89c66d483848b660f91ffd41189c14173a0995299cc3e1287c89
-MISC ChangeLog 10450 RMD160 4629cf08f9bbc07cf896a8d0be6a8b9944af7ec4 SHA1 d4060aa9324ab46febfa733bdaf658f6ef5940b0 SHA256 06d7ffe832a921893176160676278fbbf8a53ba4b0b0fe8f1222ccb8f27674e3
+MISC ChangeLog 10630 RMD160 774e8503cfbd41a938d2ceb22e519994a837d616 SHA1 f78cf6e645fc84c202cf9c00d5dd1359530f9e1e SHA256 c7e221d97d6be56a2658078df76de30a6aae6bd336c32b895d61a97ee1b4eb03
 MISC metadata.xml 175 RMD160 a674189a82ea2172e0949ce49eb80dd5bc23ddf5 SHA1 c203d37a08bfb7b826b080650c3019705490bfb1 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+lHzwACgkQcsIHjyDViGS8ewCgxSSDS0wnwVpXPMizFPQTIXoW
-R30An304WWJ7+VtO1GTaS+rqn5BmD4ta
-=B2OS
+iEYEARECAAYFAk+t1C8ACgkQcsIHjyDViGTv2gCfZov/H0q1BIPo9PwOnZlZKvOw
+0EwAoOgWawCH9qUnq+iTmbhZtbk6u054
+=vh5s
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/files/new-ofpath-devspec.patch b/sys-boot/yaboot/files/new-ofpath-devspec.patch
new file mode 100644
index 000000000000..ac03c15d8dd7
--- /dev/null
+++ b/sys-boot/yaboot/files/new-ofpath-devspec.patch
@@ -0,0 +1,28 @@
+--- ybin/ofpath.bak	2012-05-09 12:24:51.709911981 -0400
++++ ybin/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/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
new file mode 100644
index 000000000000..10a60ac85ac8
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.1 2012/05/12 03:08:26 josejx Exp $
+
+EAPI=2
+
+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
+		sys-fs/e2fsprogs[static-libs]"
+RDEPEND="!ibm? ( sys-fs/hfsutils
+				 sys-fs/hfsplusutils
+				 sys-fs/mac-fdisk )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
+}
+
+src_prepare() {
+	# dual boot patch
+	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
+	epatch "${FILESDIR}/chrpfix.patch"
+	if [[ "$(gcc-major-version)" -eq "3" ]]; then
+		epatch "${FILESDIR}/${PN}-nopiessp.patch"
+	fi
+	if [[ "$(gcc-major-version)" -eq "4" ]]; then
+		epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
+	fi
+
+	# Error only on real errors, for prom printing format compile failure
+	sed -i "s:-Werror:-Wno-error:g" Makefile
+
+	# Stub out some functions that are not provided (and unneeded)
+	epatch "${FILESDIR}/${PN}-stubfuncs.patch"
+
+	# Fix the devspec path on newer kernels
+	epatch "${FILESDIR}/new-ofpath-devspec.patch"
+}
+
+src_compile() {
+	export -n CFLAGS
+	export -n CXXFLAGS
+	[ -n "$(tc-getCC)" ] || CC="gcc"
+	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	sed -i -e 's/\/local//' etc/yaboot.conf
+	make ROOT="${D}" PREFIX=/usr MANDIR=share/man install || die
+	mv "${D}/etc/yaboot.conf" "${D}/etc/yaboot.conf.sample"
+}