Update to 2.6.34. Octane support is actually marked as testing in this release (persuant to the last log entry). The patches apply, but have not been built. New patches are in the works, as time permits. Current hold-up is a lockup in the 8250 Serial Core when the system boots. This release also adds an experimental RTC Driver for SGI O2 systems and their Dallas/Maxim DS1685/DS1687 timekeeping chips. Slated to be submitted upstream soon.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 92 insertions, 184 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 3e7cb3284fe7..7e4d5d67a81f 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.132 2010/04/26 07:38:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.133 2010/06/07 06:43:17 kumba Exp $
+
+*mips-sources-2.6.34 (07 Jun 2010)
+
+  07 Jun 2010; Joshua Kinard <kumba@gentoo.org>
+  +files/eblits/show_ip22_info-v2.eblit, -mips-sources-2.6.27.21-r1.ebuild,
+  +mips-sources-2.6.34.ebuild, +files/eblits/show_ip32_info-v2.eblit,
+  -mips-sources-2.6.28.9-r1.ebuild:
+  Update to 2.6.34. Octane support is actually marked as testing in this
+  release (persuant to the last log entry). The patches apply, but have not
+  been built. New patches are in the works, as time permits. Current hold-up
+  is a lockup in the 8250 Serial Core when the system boots. This release
+  also adds an experimental RTC Driver for SGI O2 systems and their
+  Dallas/Maxim DS1685/DS1687 timekeeping chips. Slated to be submitted
+  upstream soon.
 
   26 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Update Manifest for deblob support in kernel-2 eclass.
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit
new file mode 100644
index 000000000000..4ad563f6bd34
--- /dev/null
+++ b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit,v 1.1 2010/06/07 06:43:17 kumba Exp $
+
+# Eblit with information/warnings for IP22 (Indy/Indigo2 R4x00) users.
+#
+# If you need to add whitespace for formatting in 'einfo', 'ewarn', or 'eerror', use
+# \040 for a space instead of the standard space.  These functions will strip
+# redundant white space.
+
+show_ip22_info() {
+	echo -e ""
+	einfo "IP22 systems with an R5000 processor should work with this release."
+	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
+	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
+	einfo ""
+	einfo "Some Notes:"
+	einfo "\t- Supported graphics card right now is Newport (XL)."
+	einfo "\t- A driver for Extreme (XZ) supposedly exists, but its author"
+	einfo "\t\040\040has steadfastly refused to release the code for various reasons."
+	einfo "\t\040\040Any questions regarding its status should be directed to ${HILITE}onion${NORMAL}"
+	einfo "\t\040\040in ${GOOD}#mipslinux${NORMAL} on the Freenode IRC network.  Given that he is the"
+	einfo "\t\040\040author, he will know the most current status of the driver."
+	echo -e ""
+}
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v2.eblit b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v2.eblit
new file mode 100644
index 000000000000..5617bfc59815
--- /dev/null
+++ b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v2.eblit
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip32_info-v2.eblit,v 1.1 2010/06/07 06:43:17 kumba Exp $
+
+# Eblit with information/warnings for IP32 (O2) users.
+#
+# If you need to add whitespace for formatting in 'einfo', 'ewarn', or 'eerror', use
+# \040 for a space instead of the standard space.  These functions will strip
+# redundant white space.
+
+show_ip32_info() {
+	echo -e ""
+	einfo "IP32 systems function well, however there are some notes:"
+	einfo "\t- A sound driver now exists for IP32.  Celebrate!"
+	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
+	einfo "\t\040\040specified when building the kernel will likely oops"
+	einfo "\t\040\040or panic the kernel."
+	einfo "\t- A new RTC driver is included that uses the RTC class"
+	einfo "\t\040\040framework to interface with the O2's Dallas/Maxim 1687-5"
+	einfo "\t\040\040RTC chip.  Please report any bugs to the MIPS Team."
+	einfo "\t- X support is limited to the generic fbdev driver.  No X"
+	einfo "\t\040\040gbefb driver exists for O2 yet.  Feel free to submit"
+	einfo "\t\040\040patches!"
+	echo -e ""
+
+	if use ip32r10k; then
+		eerror "The R10K patch for IP32 is out of date and doesn't apply.  It might or"
+		eerror "might not be updated in the future to apply.  When it did apply and boot,"
+		eerror "however, it was flaky at best, and didn't stay online for long before"
+		eerror "locking up.  Don't attempt to play with this unless you are seriously"
+		eerror "interested in kernel hacking."
+		echo -e ""
+		eerror "We're interesting in finding anyone with knowledge of the R10000"
+		eerror "workaround for speculative execution listed in the R10000 Processor"
+		eerror "manual, or those who are familiar with the IP32 chipset and the feature"
+		eerror "called \"Juice\"."
+		echo -e ""
+	fi
+
+	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
+	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
+	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
deleted file mode 100644
index 46ec43b6e780..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild,v 1.4 2010/02/13 19:07:33 kumba Exp $
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org GIT snapshot diff
-# 3) Generic Fixes
-# 4) Patch for the IOC3 Metadriver (IP27, IP30)
-# 5) Patch for IP30 Support
-# 6) Patch for IP28 Graphics Support (SolidImpact)
-# 7) Experimental patches (if needed)
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-OKV=${PV/_/-}
-GITDATE="20090315"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="3"				# Tarball revision for patches
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${GITDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="1"
-K_NOUSENAME="0"
-K_NOUSEPR="0"
-K_USEPV="0"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2 eutils
-detect_version
-
-# Version Data
-F_KV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources virtual/alsa"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 ip32r10k"
-DEPEND=">=sys-devel/gcc-4.1.1"
-RDEPEND=""
-
-# Machine Support Control Variables
-DO_IP22="yes"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="yes"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
-
-DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
-SRC_URI="${KERNEL_URI}
-	 mirror://gentoo/mipsgit-${F_KV}${KVE}-${GITDATE}.diff.bz2
-	 mirror://gentoo/${PN}-${F_KV}-patches-v${GENPATCHREV}.tar.bz2"
-
-UNIPATCH_STRICTORDER="1"
-UNIPATCH_LIST="${DISTDIR}/mipsgit-${F_KV}${KVE}-${GITDATE}.diff.bz2"
-
-#//------------------------------------------------------------------------------
-
-# Eblit Handling Functions
-#
-# They'll likely be superseded someday by better ideas, possibly elibs.
-
-# eblit-core
-# Usage: <function> [version]
-# Main eblit engine
-eblit-core() {
-	local e v func=$1 ver=$2
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Runs the pkg_* functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core pkg_$1 $2
-}
-
-#//------------------------------------------------------------------------------
-
-load_eblit_funcs() {
-	# This is a sanity check to avoid QA issues.  It prevents
-	# eblits from being referenced during metadata operations.
-	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
-
-	# All are in ${FILESDIR}/eblits
-	# If a message for a given machine needs to change,
-	# then we create a new eblit and increment the
-	# version and reference it here.
-	eblit-include err_disabled_mach v1
-	eblit-include err_only_one_mach_allowed v1
-	eblit-include show_ip22_info v1
-	eblit-include show_ip27_info v1
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v1
-	eblit-include show_ip32_info v1
-	eblit-include show_cobalt_info v1
-
-	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-	eblit-pkg setup v1
-	eblit-pkg postinst v1
-
-	# Eblit load complete
-	MIPS_SOURCES_EBLITS_LOADED=1
-}
-
-pkg_setup() {
-	load_eblit_funcs
-	pkg_setup
-}
-
-src_unpack() { eblit-run src_unpack v1 ; }
-
-#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.34.ebuild
index 8d0e677f252a..e64c2fc719f4 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild,v 1.4 2010/02/13 19:07:33 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.34.ebuild,v 1.1 2010/06/07 06:43:17 kumba Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -15,8 +15,8 @@
 
 # Version Data
 OKV=${PV/_/-}
-GITDATE="20090315"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="3"				# Tarball revision for patches
+GITDATE="20100605"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
 S="${WORKDIR}/linux-${OKV}-${GITDATE}"
@@ -42,15 +42,15 @@ HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources virtual/alsa"
 KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 ip32r10k"
+IUSE="cobalt ip27 ip28 ip30 ip32r10k impactdebug"
 DEPEND=">=sys-devel/gcc-4.1.1"
 RDEPEND=""
 
 # Machine Support Control Variables
 DO_IP22="yes"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
+DO_IP27="test"				# 		   IP27 support		(SGI Origin)
 DO_IP28="yes"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
+DO_IP30="test"				# 		   IP30 support		(SGI Octane)
 DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
 DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
 
@@ -148,11 +148,11 @@ load_eblit_funcs() {
 	# version and reference it here.
 	eblit-include err_disabled_mach v1
 	eblit-include err_only_one_mach_allowed v1
-	eblit-include show_ip22_info v1
+	eblit-include show_ip22_info v2
 	eblit-include show_ip27_info v1
 	eblit-include show_ip28_info v1
 	eblit-include show_ip30_info v1
-	eblit-include show_ip32_info v1
+	eblit-include show_ip32_info v2
 	eblit-include show_cobalt_info v1
 
 	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
@@ -169,6 +169,6 @@ pkg_setup() {
 	pkg_setup
 }
 
-src_unpack() { eblit-run src_unpack v1 ; }
+src_unpack() { eblit-run src_unpack v2 ; }
 
 #//------------------------------------------------------------------------------