Added 2.6.12 final. Includes a number of enhancements: Octane (IP30) users will discover qla1280 support and VPro support; O2 (IP32) users will notice slightly increased scsi; and Origin (IP27) users will discover sources that *gasp* actually work! (dramatic cue).

(Portage version: 2.0.51.22-r1)

5 files changed, 36 insertions, 28 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 39a3625ad6f0..5d49a6a180ec 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.77 2005/06/11 20:50:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.78 2005/07/06 04:18:45 kumba Exp $
+
+*mips-sources-2.6.12 (05 Jul 2005)
+
+  05 Jul 2005; Joshua Kinard <kumba@gentoo.org> +mips-sources-2.6.12.ebuild,
+  -mips-sources-2.6.12_rc6.ebuild:
+  Added 2.6.12 final. Includes a number of enhancements: Octane (IP30) users
+  will discover qla1280 support and VPro support; O2 (IP32) users will notice
+  slightly increased scsi; and Origin (IP27) users will discover sources that
+  *gasp* actually work! (dramatic cue).
 
 *mips-sources-2.4.31 (11 Jun 2005)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 421d93975612..643bf8e0a412 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,8 +1,8 @@
 MD5 203d91a747283e44e10c6b2e81bf6578 ChangeLog 33849
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
+MD5 a57cb613d0abf86c50133e164dea9192 mips-sources-2.6.12.ebuild 11033
 MD5 9c451cc8e9d7708ef0e513567a271a4f mips-sources-2.4.31.ebuild 1912
 MD5 2bcef40a019778e84f9c9188ae97b5d0 mips-sources-2.6.10-r4.ebuild 12779
-MD5 9bd4ddeb75149d9276015aae85718634 mips-sources-2.6.12_rc6.ebuild 11124
 MD5 8aa07663823de29a8abba4e176da6576 files/digest-mips-sources-2.4.31 316
 MD5 3e5274d4d23180cde5daf51b751d2cc5 files/digest-mips-sources-2.6.10-r4 316
-MD5 9eb17483112ba99e3d053bf600ff4498 files/digest-mips-sources-2.6.12_rc6 386
+MD5 4e00a498debdcbfe02ab1c216f587d8b files/digest-mips-sources-2.6.12 316
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12
new file mode 100644
index 000000000000..a544796d1fbd
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12
@@ -0,0 +1,4 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 df24d440182035e8ab4bfa305410b5e3 mipscvs-2.6.12-20050703.diff.bz2 368631
+MD5 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
+MD5 2bfdaaa1ba8fdbda9e8e1aa7dfe167ea mips-sources-generic_patches-1.13.tar.bz2 114518
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc6
deleted file mode 100644
index 936e2592be88..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc6
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 e281c80774e433e19ea1c1d52340f417 mipscvs-2.6.12-rc6-20050610.diff.bz2 329828
-MD5 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
-MD5 463d4901c7f44a9922ab69179adc0b47 mips-sources-generic_patches-1.12.tar.bz2 178249
-MD5 a83e0f80a3fb8561e47ff208bb9207d9 patch-2.6.12-rc6.bz2 4659982
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.12_rc6.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.12.ebuild
index 05b7fcfdd781..e89644a40ad9 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.12_rc6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 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.12_rc6.ebuild,v 1.1 2005/06/11 20:50:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.12.ebuild,v 1.1 2005/07/06 04:18:45 kumba Exp $
 
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 29 May 2005
+# 2) linux-mips.org CVS snapshot diff from 03 Jul 2005
 # 3) Generic Fixes
 # 4) Security fixes
 # 5) Patch for IP30 Octane Support		(http://helios.et.put.poznan.pl/~sskowron/ip30/)
@@ -19,12 +19,12 @@
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20050610"			# Date of diff between kernel.org and lmo CVS
+CVSDATE="20050703"			# Date of diff between kernel.org and lmo CVS
 SECPATCHVER="1.14"			# Tarball version for security patches
-GENPATCHVER="1.12"			# Tarball version for generic patches
+GENPATCHVER="1.13"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-USERC="yes"				# If set to "yes", then attempt to use an RC kernel
+USERC="no"				# If set to "yes", then attempt to use an RC kernel
 
 # Directories
 S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
@@ -129,9 +129,9 @@ pkg_setup() {
 			ewarn "patch is used on the system gcc, kernel-gcc (gcc-mips64) and the kernel"
 			ewarn "itself in order to support this machine.  These patches will only be applied"
 			ewarn "if \"ip28\" is defined in USE, which the profile sets.  Other things to keep"
-			ewarn "in mind are that this system can only be netbooted (no arcboot support),"
-			ewarn "requires a full 64-bit kernel, serial-console only (Impact graphics not"
-			ewarn "supported yet), and _nothing_ is guaranteed to work smoothly."
+			ewarn "in mind are that this system requires a full 64-bit kernel, serial-console"
+			einfo "only (Impact graphics not supported yet), and _nothing_ is guaranteed to"
+			einfo "work smoothly."
 			echo -e ""
 			arch_is_selected="yes"
 		else
@@ -144,15 +144,13 @@ pkg_setup() {
 	if use ip30; then
 		if [ "${arch_is_selected}" = "no" ]; then
 			echo -e ""
-			einfo "Octane support is still considered experimental, but runs reasonably"
-			einfo "well.  There is still the limitation of using only one SCSI disk (two"
-			einfo "or more will panic the kernel), serial is still limited to 96008N1, and"
-			einfo "there is no X support as of this release.  Framebuffer Console only"
-			einfo "works on ImpactSR, no VPro support yet, and Octane can only be netbooted"
-			einfo "for the time being."
+			einfo "With this release, Octane now uses the qla1280 driver.  Please refrain"
+			einfo "from using the old qlogicisp driver.  It is marked BROKEN and will be"
+			einfo "removed from the kernel soon.  qla1280 is a much better driver, as you"
+			einfo "can now use multiple disks with it."
 			echo -e ""
-			einfo "SMP on Octane is also available with this release, however it is still"
-			einfo "in testing and thus should be considered very experimental."
+			einfo "This release also has a basic driver for VPro-based systems now.  Like"
+			einfo "MGRAS, it's console-only, no X support yet."
 			echo -e ""
 			arch_is_selected="yes"
 		else
@@ -196,7 +194,7 @@ do_generic_patches() {
 		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-stupid-gbefb-typo.patch
 
 		# Cobalt Patches (Safe for non-Cobalt use)
-		epatch ${MIPS_PATCHES}/misc-2.6.12-rc6-cobalt-bits.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-cobalt-bits.patch
 
 		# Generic
 		epatch ${MIPS_PATCHES}/misc-2.6.12-ths-mips-tweaks.patch
@@ -204,8 +202,8 @@ do_generic_patches() {
 		epatch ${MIPS_PATCHES}/misc-2.6.12-add-ramdisk-back.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.12-mips-iomap-functions.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.12-seccomp-no-default.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.11-add-byteorder-to-proc.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.12-rem-qlogicisp-scsi_to_pci_dma_dir.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.11-add-byteorder-to-proc.patch
 
 		# Ugly Hacks (Long Story, ask about it on IRC if you really want to know)
 		if ! use ip30 && ! use ip28; then
@@ -250,13 +248,14 @@ do_ip27_support() {
 	echo -e ""
 	einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
 	epatch ${MIPS_PATCHES}/misc-2.6.11-ip27-horrible-hacks_may-eat-kittens.patch
+#	epatch ${MIPS_PATCHES}/misc-2.6.12-ip27-iluxa-fixes.patch
 }
 
 # SGI Indigo2 Impact R10000 (IP28)
 do_ip28_support() {
 	echo -e ""
 	einfo ">>> Patching kernel for SGI Indigo2 Impact R10000 (IP28) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.12-rc2-ip28-i2_impact-support.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.12-ip28-i2_impact-support.patch
 }
 
 
@@ -264,7 +263,8 @@ do_ip28_support() {
 do_ip30_support() {
 	echo -e ""
 	einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.12-rc2-ip30-octane-support.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.12-ip30-octane-support.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.12-ip30-switch-to-plat_setup.patch
 }