From dfbf9dd9c75f0792d1956804ec821598e03496f9 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 31 Mar 2004 00:30:54 +0000 Subject: ~ppc, fix --- sys-boot/yaboot/ChangeLog | 11 ++++- sys-boot/yaboot/Manifest | 21 ++++---- sys-boot/yaboot/files/digest-yaboot-1.3.11-r1 | 1 + .../yaboot/files/yaboot-1.3.11-ofpath-fix.patch | 56 ++++++++++++++++++++++ sys-boot/yaboot/yaboot-1.3.11-r1.ebuild | 42 ++++++++++++++++ 5 files changed, 120 insertions(+), 11 deletions(-) create mode 100644 sys-boot/yaboot/files/digest-yaboot-1.3.11-r1 create mode 100644 sys-boot/yaboot/files/yaboot-1.3.11-ofpath-fix.patch create mode 100644 sys-boot/yaboot/yaboot-1.3.11-r1.ebuild (limited to 'sys-boot') diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog index 2cf846360b98..76474e3df4db 100644 --- a/sys-boot/yaboot/ChangeLog +++ b/sys-boot/yaboot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-boot/yaboot -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.4 2004/03/22 18:26:46 tgall Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.5 2004/03/31 00:30:54 lu_zero Exp $ + +*yaboot-1.3.11-r1 (31 Mar 2004) + + 31 Mar 2004; Luca Barbato yaboot-1.3.11-r1.ebuild, + files/yaboot-1.3.11-ofpath-fix.patch: + Fix for bug #46023, thanks to Daniel Ostrow for + pointing the fix 22 Mar 2004; Tom Gall yaboot-1.3.11.ebuild: add fix for creation of a proper yaboot on chrp hardware diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest index 237c6cde4812..401cc4403812 100644 --- a/sys-boot/yaboot/Manifest +++ b/sys-boot/yaboot/Manifest @@ -1,14 +1,17 @@ -MD5 49a737bd4ba0127ab6fde7385fd4f9d7 ChangeLog 3769 +MD5 d4d3e0e01dfca14da3e679fb305aeaa7 yaboot-1.3.10-r2.ebuild 1021 +MD5 8daac736a4894d8dd6d458e35c63804d ChangeLog 4014 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156 -MD5 4c8d5ac00a1131330a8d2492d50793ee yaboot-1.3.10-r1.ebuild 982 -MD5 5cc966a93b5487bb79c5fa007fd7a60a yaboot-1.3.10-r2.ebuild 1022 -MD5 0a29994f14bd4538c04d17eb2efb1009 yaboot-1.3.10.ebuild 979 -MD5 841c64f4eb1b40fe560c3b5ef12d5cd8 yaboot-1.3.11.ebuild 1056 -MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979 +MD5 8c3e7d088d129e4c1c8b8ec25b109a1f yaboot-1.3.10.ebuild 978 +MD5 2d05efc729863a1642217a609b660ef7 yaboot-1.3.10-r1.ebuild 981 +MD5 5f1316a5d4d3aac6611729f10bae8b4f yaboot-1.3.11-r1.ebuild 1154 +MD5 24aabea0fd8727dc21aba9c5162e1d30 yaboot-1.3.11.ebuild 1055 +MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65 MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10 65 -MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10-r1 65 -MD5 cdcf832620e73598eb112a6000509afd files/digest-yaboot-1.3.10-r2 270 MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11 65 -MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987 +MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974 +MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987 +MD5 cdcf832620e73598eb112a6000509afd files/digest-yaboot-1.3.10-r2 270 +MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10-r1 65 +MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898 diff --git a/sys-boot/yaboot/files/digest-yaboot-1.3.11-r1 b/sys-boot/yaboot/files/digest-yaboot-1.3.11-r1 new file mode 100644 index 000000000000..a881271edca5 --- /dev/null +++ b/sys-boot/yaboot/files/digest-yaboot-1.3.11-r1 @@ -0,0 +1 @@ +MD5 338be176b2767498fd42e9e9c2f4f3da yaboot-1.3.11.tar.gz 272953 diff --git a/sys-boot/yaboot/files/yaboot-1.3.11-ofpath-fix.patch b/sys-boot/yaboot/files/yaboot-1.3.11-ofpath-fix.patch new file mode 100644 index 000000000000..9e2d0ccb2cf6 --- /dev/null +++ b/sys-boot/yaboot/files/yaboot-1.3.11-ofpath-fix.patch @@ -0,0 +1,56 @@ +diff -ruN yaboot-1.3.11.orig/ybin/ofpath yaboot-1.3.11/ybin/ofpath +--- yaboot-1.3.11.orig/ybin/ofpath 2004-03-31 01:53:42.429814600 +0200 ++++ yaboot-1.3.11/ybin/ofpath 2004-03-28 06:58:21.000000000 +0200 +@@ -27,7 +27,7 @@ + + PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" + PRG="${0##*/}" +-VERSION=1.0.5 ++VERSION=1.0.6-pre2 + DEBUG=0 + export LC_COLLATE=C + +@@ -297,7 +297,7 @@ + DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)" + echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION" + ;; +- ata_k2) ++ ata_k2|sata_svw) + 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)" +@@ -323,11 +323,32 @@ + echo 1>&2 "$PRG: BUG: IDEBUS == NULL" + return 1 + fi +- local OF1275IDE="/proc/ide/$IDEBUS/devspec" ++ ++ case "$(uname -r)" in ++ 2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*) ++ echo "$PRG: Linux kernel `uname -r` is not supported" ++ return 1 ++ ;; ++ 2.6.*|2.7.*) ++ if ! (grep -q '.* .* sysfs ' /proc/mounts 2> /dev/null) ; then ++ echo 1>&2 "$PRG: sysfs must be mounted for ofpath to support this system" ++ return 1 ++ fi ++ local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)" ++ if [ -z "$SYS" -o ! -d "$SYS" ] ; then ++ echo 2>&1 "$PRG: Unable to determine sysfs mountpoint" ++ return 1 ++ fi ++ local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec" ++ ;; ++ *) ++ local OF1275IDE="/proc/ide/$IDEBUS/devspec" ++ ;; ++ esac + + if [ ! -f "$OF1275IDE" ] ; then + case "$(cat /proc/device-tree/model)" in +- "PowerMac3,6") ++ PowerMac3*|PowerMac4*|PowerMac5*|PowerMac6*|PowerMac7*|X*) + local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)" + if [ -z "$CDROM" ] ; then + echo 1>&2 "$PRG: WARNING: Your kernel is too old for proper support, device may be innaccurate." diff --git a/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild new file mode 100644 index 000000000000..61c3156986af --- /dev/null +++ b/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild,v 1.1 2004/03/31 00:30:54 lu_zero Exp $ + +inherit eutils + +S=${WORKDIR}/${P} +DESCRIPTION="PPC Bootloader" +SRC_URI="http://penguinppc.org/projects/yaboot/${P}.tar.gz" +HOMEPAGE="http://penguinppc.org/projects/yaboot/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc ppc64" + +DEPEND="sys-apps/powerpc-utils + sys-fs/hfsutils + sys-fs/hfsplusutils" + +PROVIDE="virtual/bootloader" + +MAKEOPTS='PREFIX=/usr MANDIR=share/man' + +src_compile() { + export -n CFLAGS + export -n CXXFLAGS + [ -n "${CC}" ] || CC="gcc" + # dual boot patch + epatch ${FILESDIR}/yabootconfig-${PV}.patch + epatch ${FILESDIR}/chrpfix.patch + #took from http://penguinppc.org/~eb/files/ofpath + epatch ${FILESDIR}/${P}-ofpath-fix.patch + emake ${MAKEOPTS} CC="${CC}" || 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} ${MAKEOPTS} install || die +} + -- cgit v1.2.3-65-gdbad