Update to 4.1.6/4.2.0, update several eblits, and fix copyright dates.

Package-Manager: portage-2.2.20.1

10 files changed, 24 insertions, 37 deletions

diff --git a/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit b/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit
index 631ca4679cc3..6f9ff7e81eff 100644
--- a/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit b/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit
index e312204329c2..c3562cf8cb16 100644
--- a/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
index a28fb8c09268..7c76ffd68051 100644
--- a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit b/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
index d9eaf60db16a..b1b4ff9d145f 100644
--- a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,9 +16,9 @@ eblit-mips-sources-pkg_setup() {
 	# See if we're on a cobalt system first (must use the cobalt-mips profile)
 	if use cobalt; then
 		arch_is_selected="yes"
-		[ "${DO_CBLT}" = "test" ] 						\
+		[ "${DO_CBLT}" = "test" ]						\
 			&& err_disabled_mach "Cobalt Microsystems" "CBLT" "cobalt" "test"
-		[ "${DO_CBLT}" = "no" ] 						\
+		[ "${DO_CBLT}" = "no" ]							\
 			&& err_disabled_mach "Cobalt Microsystems" "CBLT" "cobalt"
 		show_cobalt_info
 	fi
diff --git a/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit
index 68f62cab9e49..b1ff8ff3f84b 100644
--- a/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
index 0d2568060e67..e926d3133c92 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit
index f6be936f2e52..2ad25cdc10ea 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
index 1c1a160b5c7f..90c3e5bfdf89 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
@@ -10,19 +10,19 @@
 
 show_ip30_info() {
 	echo -e ""
-	einfo "Octane boots again as-of 3.14!  Celebrate!"
+	einfo "Octane SMP support works again as-of 4.1!  Celebrate!"
 	echo -e ""
 	eerror "Things that DON'T work:"
-	eerror "\t- SMP SUPPORT IS CURRENTLY BROKEN!  I require help in getting CPU1 to"
-	eerror "\t\040\040'tick' properly, as it hangs up in the generic MIPS SMP code."
-	eerror "\t- R14000 ONLY: Do NOT use CONFIG_TRANSPARENT_HUGEPAGE on an Octane with"
-	eerror "\t\040\040an R14000 CPU, otherwise, when the machine starts to boot into"
-	eerror "\t\040\040userland, it will trigger Instruction Bus Errors (IBEs), which"
-	eerror "\t\040\040requires a complete powerdown of the machine for about 15 seconds"
-	eerror "\t\040\040to clear."
-	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
+	eerror "\t- Do NOT use CONFIG_TRANSPARENT_HUGEPAGE, otherwise, when the machine"
+	eerror "\t\040\040starts to boot into userland, it will trigger Instruction"
+	eerror "\t\040\040Bus Errors (IBEs), which requires a complete powerdown of the"
+	eerror "\t\040\040machine for about 15 seconds to clear."
+	eerror "\t- DO NOT USE CONFIG_SLUB, otherwise, you'll get errors when booting"
 	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in"
 	eerror "\t\040\040sysfs."
+	eerror "\t- Greater than 2GB memory causes problems with DMA.  This is a long-standing"
+	eerror "\t\040\040problem and patches to fix it by DMA experts would be greatly"
+	eerror "\t\040\040appreciated!"
 	eerror "\t- Do not use OHCI-based USB cards in Octane.  They're broke on this machine."
 	eerror "\t\040\040Patches are welcome to fix the issue."
 	echo -e ""
@@ -46,11 +46,12 @@ show_ip30_info() {
 	ewarn "\t\040\040video conversion boards as well."
 	echo -e ""
 	einfo "Things that DO work:"
+	einfo "\t- SMP works again, celebrate!"
 	einfo "\t- Impact (MGRAS) console and X driver, please report any bugs."
 	einfo "\t- VPro (Odyssey) console, but no X driver exists yet."
 	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
 	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
 	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
-	einfo "\t\040\040 report any problems with these devices."
+	einfo "\t\040\040report any problems with these devices."
 	echo -e ""
 }
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
index 112b44c0823a..daac6d931a23 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,19 +23,6 @@ show_ip32_info() {
 	einfo "\t\040\040patches!"
 	echo -e ""
 
-	if use ip32r10k; then
-		eerror "The R10K patch for IP32 is now updated and will apply to 3.0.x kernels."
-		eerror "When it did apply and booted, it was flaky at best, and didn't stay online"
-		eerror "for long before locking up.  Don't attempt to play with this unless you"
-		eerror "are seriously 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/files/eblits/src_unpack-v5.eblit b/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
index dade9b268a6b..c1428ea6f47d 100644
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v5.eblit
+++ b/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
@@ -28,18 +28,17 @@ eblit-mips-sources-src_unpack() {
 	# machine patches and if a machine USE flag is enabled, then unset
 	# its corresponding variable.
 	# See 0000_README for the patch numbers and their meanings.
-	local p_generic="501*"
-	local p_ip27="502*" p_ip28="503*" p_ip30="504*" p_ip32r10k="6001*"
+	local p_generic="51*"
+	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
 	use ip27 && unset p_generic p_ip27
 	use ip28 && unset p_ip28
 	use ip30 && unset p_generic p_ip30
-	use ip32r10k && unset p_ip32r10k
 
 	# Remove symlinks for any patches that we don't want applied.  We do
 	# this by looping through all the above variables, and deleting
 	# matching symlinks that point to the corresponding patches.
 	# The remaining symlinks will be applied to the kernel source.
-	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_ip32r10k}"
+	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30}"
 	for x in $patchlist; do rm -f "./${x}"; done
 
 	# Rename the source tree to match the linux-mips git checkout date and