Re-added the ffb_drv fix

4 files changed, 75 insertions, 4 deletions

diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index 66f133c722a8..908e75449b8b 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.46 2004/01/24 22:48:19 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.47 2004/01/26 22:06:26 joker Exp $
+
+*sparc-sources-2.4.24-r1 (26 Jan 2004)
+
+  26 Jan 2004; Christian Birchinger <joker@gentoo.org>
+  sparc-sources-2.4.24-r1.ebuild:
+  Re-added the ffb_drv fix
 
   24 Jan 2004; Markus Nigbur <pyrania@gentoo.org>
   sparc-sources-2.4.23-r1.ebuild, sparc-sources-2.4.24.ebuild:
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index b985d37e3f9a..96b64f76b1a7 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,10 +1,12 @@
-MD5 24f3b3fbcd94ce76807b80099ec6cb70 ChangeLog 7838
-MD5 203d0a879b5d77d69ad6928cd072c742 sparc-sources-2.4.24.ebuild 2145
-MD5 6063408ed75770023cecd6f424ce62e2 sparc-sources-2.4.23-r1.ebuild 2148
+MD5 73def6fcd9eb82d38419e93de4e34f6c sparc-sources-2.4.24.ebuild 2141
+MD5 0a76549ede09e2f4de45303c59a29b2b sparc-sources-2.4.23-r1.ebuild 2144
+MD5 b9005243235a395e095069873312cac3 sparc-sources-2.4.24-r1.ebuild 2142
+MD5 4bbe97bd38d427bcc2404b5e25aa5345 ChangeLog 8179
 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
 MD5 cf32a513759a5ee17efe4c1a30550266 files/digest-sparc-sources-2.4.24 140
 MD5 5456ce66ce5f748d464a2c14a67d4a6c files/digest-sparc-sources-2.4.23-r1 143
+MD5 e4fdeb6a44b43a924f34278f89c69eb6 files/digest-sparc-sources-2.4.24-r1 143
 MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
 MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
 MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.24-r1 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.24-r1
new file mode 100644
index 000000000000..46166fc2201f
--- /dev/null
+++ b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.24-r1
@@ -0,0 +1,2 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 f16f05819af64147513108ada4df3a53 patches-2.4.24-sparc-r1.tar.bz2 139408
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.24-r1.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.24-r1.ebuild
new file mode 100644
index 000000000000..02fd31ff699c
--- /dev/null
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.24-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.24-r1.ebuild,v 1.1 2004/01/26 22:06:26 joker Exp $
+
+IUSE="ultra1"
+
+# Kernel ebuilds using the kernel.eclass can remove any patch that you
+# do not want to apply by simply setting the KERNEL_EXCLUDE shell
+# variable to the string you want to exclude (for instance
+# KERNEL_EXCLUDE="grsecurity" would not patch any patches whose names match
+# *grsecurity*).  Kernels are only tested in the default configuration, but
+# this may be useful if you know that a particular patch is causing a
+# conflict with a patch you personally want to apply, or some other
+# similar situation.
+
+ETYPE="sources"
+inherit kernel
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+[ "$OKV" == "" ] && OKV="${PV}"
+
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	mirror://gentoo/patches-${KV}.tar.bz2"
+
+S=${WORKDIR}/linux-${KV}
+KEYWORDS="~x86 -ppc sparc"
+SLOT="${KV}"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
+	cd ${KV} || die "Unable to cd into ${KV}"
+
+	kernel_src_unpack
+
+	# Patch the HME driver only on Ultra1 machines.
+	use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch
+}
+
+pkg_postinst() {
+
+	kernel_pkg_postinst
+
+	# Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown.
+	if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then
+		einfo
+		einfo "For users with an Enterprise model Ultra 1 using the HME network interface,"
+		einfo "please emerge the kernel using the following command:"
+		einfo
+		einfo "USE=ultra1 emerge sparc-sources"
+		einfo
+	fi
+}