Update the patchset with a patch to bring the uber experimental IP32 R10k support up to par, as well as update the info text of the various machines. No rev bump needed as no sane person should be using the IP32 R10k system anyways.

(Portage version: 2.1.2.7)

3 files changed, 47 insertions, 54 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 502a848fea1e..f5ae864597b0 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.109 2007/05/19 01:59:53 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.110 2007/05/20 07:20:39 kumba Exp $
+
+  20 May 2007; Joshua Kinard <kumba@gentoo.org>
+  mips-sources-2.6.20.11.ebuild:
+  Update the patchset with a patch to bring the uber experimental IP32 R10k
+  support up to par, as well as update the info text of the various machines.
+  No rev bump needed as no sane person should be using the IP32 R10k system
+  anyways.
 
   19 May 2007; Joshua Kinard <kumba@gentoo.org>
   mips-sources-2.6.20.11.ebuild:
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.11 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.11
index ea2ec3258d9d..3cc4d1739601 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.11
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.11
@@ -1,9 +1,9 @@
 MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
 RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
 SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
-MD5 b1d6a03db8666632baa8442867638f4d mips-sources-generic_patches-1.28.tar.bz2 735258
-RMD160 c1728be6a7926a0b354c1e58f28644a9c846fbbc mips-sources-generic_patches-1.28.tar.bz2 735258
-SHA256 cc74bdff161f1bbe697537b82c9e83f52118b47d74ee2fb8077983b654e7b42f mips-sources-generic_patches-1.28.tar.bz2 735258
+MD5 5e30a549cfa607130cad896974e67595 mips-sources-generic_patches-1.29.tar.bz2 736751
+RMD160 c1fe5a07ccc06141004d6e8a59c007c318ebe2cb mips-sources-generic_patches-1.29.tar.bz2 736751
+SHA256 62c55bc399ac779f654c48b4a67b558ef158cae4213f15338b9b53452a2609e8 mips-sources-generic_patches-1.29.tar.bz2 736751
 MD5 7ee74b19254021e32f5608580285413d mipsgit-2.6.20-20070415.diff.bz2 86454
 RMD160 cb754953afef92fe1e9bf2e30cbc213b952cb323 mipsgit-2.6.20-20070415.diff.bz2 86454
 SHA256 a634ffe60f7eb0217d5823339e4b2ba63e416eee3f6a812c782d8c5cdad065b4 mipsgit-2.6.20-20070415.diff.bz2 86454
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.20.11.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.20.11.ebuild
index 55d3cc58de65..a7fcb40bad4e 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.20.11.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.20.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.20.11.ebuild,v 1.2 2007/05/19 01:59:53 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.20.11.ebuild,v 1.3 2007/05/20 07:20:39 kumba Exp $
 
 
 # INCLUDED:
@@ -21,7 +21,7 @@
 # Version Data
 OKV=${PV/_/-}
 GITDATE="20070415"			# Date of diff between kernel.org and lmo GIT
-GENPATCHVER="1.28"			# Tarball version for generic patches
+GENPATCHVER="1.29"			# Tarball version for generic patches
 EXTRAVERSION="-mipsgit-${GITDATE}"
 KV="${OKV}${EXTRAVERSION}"
 F_KV="${OKV}"				# Fetch KV, used to know what mipsgit diff to grab.
@@ -150,53 +150,39 @@ err_disabled_mach() {
 
 show_ip22_info() {
 	echo -e ""
-	einfo "IP22 systems should work well with this release, however, R4600"
-	einfo "setups may still experience bugs.  Please report any encountered"
-	einfo "problems."
+	einfo "IP22 systems with an R5000 processor should work well 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) is in the works, but remains"
-	einfo "\t\040\040unreleased by its author for public consumption."
+	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 "onion" in"
+	einfo "\t\040\040#mipslinux on the Freenode IRC network.  Given he is the author, he"
+	einfo "\t\040\040will know the most current status of the driver."
 	echo -e ""
 }
 
 show_ip27_info() {
 	echo -e ""
-	einfo "IP27 support can be considered a game of Russian Roulette.  It'll work"
-	einfo "great for some but not for others.  It also uses some rather horrible"
-	einfo "hacks to get going -- hopefully these will be repaired in the future."
-	echo -e ""
-	ewarn "Please keep all kittens and any other small, cute, and fluffy creatures"
-	ewarn "away from an IP27 Box running these sources.  Failure to do so may cause"
-	ewarn "the IP27 to consume the hapless creature.  Consider this your only"
-	ewarn "warning regarding the experimental nature of this particular machine."
+	ewarn "IP27 support can be considered a game of Russian Roulette.  It'll work"
+	ewarn "great for some but not for others.  We don't get a chance to test this"
+	ewarn "machine very often with each new kernel, so your mileage may vary."
 	echo -e ""
 }
 
 show_ip28_info() {
 	echo -e ""
-	einfo "Support for the Indigo2 Impact R10000 is very experimental.  If you do not"
-	einfo "have a clue in the world about what an IP28 is, what the mips architecture"
-	einfo "is about, or are new to Gentoo, then it is highly advised that you steer"
-	einfo "clear of messing with this machine.  Due to the experimental nature of this"
-	einfo "particular class of system, we have to provide such warnings, as it is only"
-	einfo "for use by those who know what they are doing."
-	echo -e ""
-	einfo "Be advised that attempting to run Gentoo/Linux (or any Linux distro) on this"
-	einfo "system may cause the sudden, unexplained disappearence of any nearby furry"
-	einfo "creatures.  So please keep any and all small pets away from this system at"
-	einfo "all times."
-	echo -e ""
-	ewarn "That said, support for this system REQUIRES that you use the ip28 cascade"
-	ewarn "profile (${HILITE}default-linux/mips/2006.1/ip28/o32${NORMAL}), because a very special"
-	ewarn "patch is used on the kernel-gcc (${GOOD}gcc-mips64${NORMAL}) and the kernel itself"
-	ewarn "in order to support this machine.  These patches will only be applied"
-	ewarn "if \"ip28\" is defined in USE, which the profile sets.  As of gcc-4.1.1,"
-	ewarn "this patch is automatically applied.  In time, ${HILITE}kgcc64${NORMAL} will replace ${GOOD}gcc-mips64${NORMAL}"
+	einfo "Support for the Indigo2 Impact R10000 is experimental, and will likely remain so."
+	einfo "As such, If you do not have a clue in the world about what an IP28 is, what the"
+	einfo "mips architecture is about, are new to Gentoo, or even Linux in particular, then"
+	einfo "it is highly advised that you steer clear of messing with this machine.  Due to"
+	einfo "the experimental nature of this particular class of system, we have to provide"
+	einfo "such warnings, as it is only for use by those who know what they are doing."
 	echo -e ""
-	ewarn "As a final warning, _nothing_ is guaranteed to work smoothly.  However,"
-	ewarn "the Impact console driver and X driver do work somewhat decently."
+	ewarn "Remember, due to the R10000 Speculative Execution issue that exists with this"
+	ewarn "machine class, _nothing_ is guaranteed to work smoothly.  Your mileage may vary."
 	echo -e ""
 }
 
@@ -221,16 +207,19 @@ show_ip30_info() {
 show_ip32_info() {
 	echo -e ""
 	einfo "IP32 systems function well, however there are some notes:"
-	einfo "\t- No driver exists yet for the sound card."
+	einfo "\t- No driver exists yet for the sound card.  There is active work on one,"
+	einfo "\t\040\040however.  Interested parties are encouraged to browse the Linux/MIPS"
+	einfo "\t\040\040mailing list archives during the first few months of 2007 for more"
+	einfo "\t\040\040information on this driver's status."
 	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
 	einfo "\t\040\040specified when building the kernel will likely oops or panic"
 	einfo "\t\040\040the kernel."
 	einfo "\t- X support is limited to the generic fbdev driver.  No X gbefb"
-	einfo "\t\040\040driver exists for O2 yet."
+	einfo "\t\040\040driver exists for O2 yet.  Patches are welcome, however :)"
 	echo -e ""
 
 	if use ip32r10k; then
-		eerror "R10000/R12000 Support on IP32 is HIGHLY EXPERIMENTAL!"
+		eerror "R10000/R12000 Support on IP32 is ${HILITE}HIGHLY EXPERIMENTAL!${NORMAL}"
 		eerror "This is intended ONLY for people interested in fixing it up.  And"
 		eerror "by that, I mean people willing to SEND IN PATCHES!  If you're not"
 		eerror "interested in debugging this issue seriously or just want to run it"
@@ -247,22 +236,19 @@ show_ip32_info() {
 		eerror "manual, or those who are familiar with the IP32 chipset and the feature"
 		eerror "called \"Juice\"."
 		echo -e ""
-		eerror "To build this kernel tree, make sure you re-merge your kernel compiler"
-		eerror "with the \"ip32r10k\" USE flag enabled via crossdev.  This uses a"
-		eerror "tweaked version of the gcc cache barriers patch that makes gcc emit "
-		eerror "more barriers, as IP32 needs them to have any hope of staying online."
 	fi
 
 	eerror "!!! BIG FAT WARNING"
 	eerror "!!! To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
-	eerror "!!! systems, you _need_ to be using a >=gcc-4.1.1 compiler.  In prior times, an"
-	eerror "!!! ugly hack was used to build an ELF64 binary that resembled an ELF32 binary in"
-	eerror "!!! order to make the ARCS PROMs on these systems boot the kernel. This hack is no"
-	eerror "!!! longer in use nor supported in 2.6.17 and beyond.  In order to achieve the same"
-	eerror "!!! effect, a new flag available in >=gcc-4.x is used, and as such, makes"
-	eerror "!!! >=gcc-4.1.1 the preferred compiler for 2.6.17 and beyond."
+	eerror "!!! systems, you _need_ to be using a >=gcc-4.1.1 compiler, have CONFIG_BUILD_ELF64"
+	eerror "!!! disabled in your kernel config, and building with the ${HILITE}vmlinux.32${NORMAL} make target."
+	eerror "!!! In prior times, an ugly hack was used to build an ELF64 binary that resembled"
+	eerror "!!! an ELF32 binary in order to make the ARCS PROMs on these systems boot the"
+	eerror "!!! kernel. This hack is no longer in use nor supported in 2.6.17 and beyond.  In"
+	eerror "!!! order to achieve the same effect, a new flag available in >=gcc-4.x is used,"
+	eerror "!!! and as such, makes >=gcc-4.1.1 the preferred compiler for 2.6.17 and beyond."
 	eerror ""
-	eerror "!!! One side effect of this is the need to build 64bit IP32 and IP22 kernels with the"
+	eerror "!!! Remember, build your IP22 and IP32 kernels with the following command:"
 	eerror "!!! following make command: ${GOOD}make vmlinux.32${NORMAL}"
 	eerror "!!! Once done, copy the ${GOOD}vmlinux.32${NORMAL} file and boot that.  Do not use the"
 	eerror "!!! ${BAD}vmlinux${NORMAL} file -- this will either not boot on IP22 or result in"
@@ -394,7 +380,7 @@ do_sekrit_patches() {
 		# Modified version of the IP28 cache barriers patch for the kernel
 		# that removes all the IP28 specific pieces and leaves behind only
 		# the generic segments.
-		epatch ${MIPS_PATCHES}/misc-2.6.17-ip32-r10k-support.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.20-ip32-r10k-support.patch
 	fi
 
 ##	# No Sekrit Patches!