Upgrade to 2.6.2-rc2 and add block on old pciutils.

4 files changed, 86 insertions, 3 deletions

diff --git a/sys-kernel/sparc-dev-sources/ChangeLog b/sys-kernel/sparc-dev-sources/ChangeLog
index 12d49f878435..f8d5e3585e0b 100644
--- a/sys-kernel/sparc-dev-sources/ChangeLog
+++ b/sys-kernel/sparc-dev-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/sparc-dev-sources
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-dev-sources/ChangeLog,v 1.4 2004/01/09 10:05:12 wesolows Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-dev-sources/ChangeLog,v 1.5 2004/01/27 04:07:17 wesolows Exp $
+
+*sparc-dev-sources-2.6.2_rc2 (26 Jan 2004)
+
+  26 Jan 2004; Keith M Wesolowski <wesolows@gentoo.org>
+  sparc-dev-sources-2.6.2_rc2.ebuild:
+  Upgrade to 2.6.2-rc2, add block on old pcituils.
 
 *sparc-dev-sources-2.6.1 (09 Jan 2004)
 
diff --git a/sys-kernel/sparc-dev-sources/Manifest b/sys-kernel/sparc-dev-sources/Manifest
index 37caece436fe..cff661e76662 100644
--- a/sys-kernel/sparc-dev-sources/Manifest
+++ b/sys-kernel/sparc-dev-sources/Manifest
@@ -1,11 +1,13 @@
 MD5 53d3441ff8971a44fdfb5eacc30d168f sparc-dev-sources-2.6.1.ebuild 2526
-MD5 eb4f0342f2abcf9a16018a807db65b2d ChangeLog 1241
+MD5 777e39fc121f2ee0cadfc651cfb3cc7b ChangeLog 1431
 MD5 a4a4e3febcacb7664d2bec3a8688a130 metadata.xml 454
 MD5 614b885e43abc025fcb5945b2427b07d sparc-dev-sources-2.6.0_beta11.ebuild 2310
+MD5 a16290a6ecbabce690965f249b7d6fc1 sparc-dev-sources-2.6.2_rc2.ebuild 2560
 MD5 eacf7bb2664f6a2dfd5fa151ad46aac5 sparc-dev-sources-2.6.0.ebuild 2353
 MD5 174c49f5be715d2ab731084c5c90553d sparc-dev-sources-2.6.1_rc2.ebuild 2530
 MD5 d316fe1a1cac4250f1bf79cff61e2de7 files/digest-sparc-dev-sources-2.6.1 137
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
+MD5 706dd217e97e173585f3936bbb00d8bf files/digest-sparc-dev-sources-2.6.2_rc2 145
 MD5 fb4fce3b5a4c112344c12703061949a7 files/digest-sparc-dev-sources-2.6.0 137
 MD5 820affff037feb299cee2467dc799f99 files/digest-sparc-dev-sources-2.6.1_rc2 145
 MD5 a984a556d93ffaf4f43336ad6a6e5f1e files/digest-sparc-dev-sources-2.6.0_beta11 151
diff --git a/sys-kernel/sparc-dev-sources/files/digest-sparc-dev-sources-2.6.2_rc2 b/sys-kernel/sparc-dev-sources/files/digest-sparc-dev-sources-2.6.2_rc2
new file mode 100644
index 000000000000..9c85474923ae
--- /dev/null
+++ b/sys-kernel/sparc-dev-sources/files/digest-sparc-dev-sources-2.6.2_rc2
@@ -0,0 +1,2 @@
+MD5 0b2d91e56adf83abb4f5f32c771ce708 linux-2.6.2-rc2.tar.bz2 33881379
+MD5 d1c43a81ee58a734d56b99e1f0f43b7f patches-2.6.2-rc2-sparc.tar.bz2 38718
diff --git a/sys-kernel/sparc-dev-sources/sparc-dev-sources-2.6.2_rc2.ebuild b/sys-kernel/sparc-dev-sources/sparc-dev-sources-2.6.2_rc2.ebuild
new file mode 100644
index 000000000000..ab4db6989a75
--- /dev/null
+++ b/sys-kernel/sparc-dev-sources/sparc-dev-sources-2.6.2_rc2.ebuild
@@ -0,0 +1,73 @@
+# 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-dev-sources/sparc-dev-sources-2.6.2_rc2.ebuild,v 1.1 2004/01/27 04:07:17 wesolows 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
+
+#Original Kernel Version before Patches
+# eg: 2.6.0-test11
+OKV=${PV/_beta/-test}
+OKV=${OKV/_rc/-rc}
+KV=${OKV}
+
+#Kernel version after patches
+# eg: 2.6.0-test8-bk1
+EXTRAVERSION=$(echo ${KV} | sed -e 's/[0-9]*\.[0-9]*\.[0-9]*//')
+EXTRAVERSION="${EXTRAVERSION}-${PN/-*/}"
+KV=${KV//-*/}
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${KV}${EXTRAVERSION}"
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/sparc-sources-dev-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the Gentoo Sparc Linux development kernel"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+	http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-${OKV}.tar.bz2
+	mirror://gentoo/patches-${KV}.tar.bz2"
+
+S=${WORKDIR}/linux-${KV}
+KEYWORDS="~x86 -ppc ~sparc"
+SLOT="${KV}"
+
+DEPEND="${DEPEND} sys-apps/module-init-tools !<sys-apps/pciutils-2.1.11-r1"
+[ `uname -m` = "sparc64" ] && DEPEND="${DEPEND} >=sys-devel/gcc-sparc64-3.2.3"
+
+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
+	keepdir /sys
+
+	# 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-dev"
+		einfo
+	fi
+}