Add mips-sources-3.0.4, and remove old ebuilds and associated eblits.

Package-Manager: portage-2.1.10.13/cvs/Linux x86_64

4 files changed, 70 insertions, 21 deletions

diff --git a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
index 4ad563f6bd34..9f6fa2e69ace 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
 
 # Eblit with information/warnings for IP22 (Indy/Indigo2 R4x00) users.
 #
@@ -16,10 +16,6 @@ show_ip22_info() {
 	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."
+	einfo "\t- A driver for Extreme (XZ) does not exist at present."
 	echo -e ""
 }
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit
new file mode 100644
index 000000000000..1b886521b143
--- /dev/null
+++ b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 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_ip30_info-v2.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
+
+# Eblit with information/warnings for IP30 (Octane) 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_ip30_info() {
+	echo -e ""
+	eerror "!!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!!"
+	eerror "!!!                                                               !!!"
+	eerror "!!! As of the 2.6.30-series of kernels, SGI Octane Support is     !!!"
+	eerror "!!! broken.  This ebuild includes a patch that does NOT work      !!!"
+	eerror "!!! but is here in case someone has the desire to try and fix it  !!!"
+	eerror "!!! and bring Octane support back to life.                        !!!"
+	eerror "!!!                                                               !!!"
+	eerror "!!! Areas that need HEAVY review are IRQ handling, PCI Bridge     !!!"
+	eerror "!!! support, and DMA handling.  Currently, this patch, if         !!!"
+	eerror "!!! applied, will allow the kernel to boot, but that's it.  The   !!!"
+	eerror "!!! root filesystem WILL mount, and it is possible that /bin/init !!!"
+	eerror "!!! is able to execute one or two processes.  At this point, Bus  !!!"
+	eerror "!!! Errors will appear at random if the ImpactSR Early Console    !!!"
+	eerror "!!! hack/patch is applied.  The cause of these errors is not yet  !!!"
+	eerror "!!! known.                                                        !!!"
+	eerror "!!!                                                               !!!"
+	eerror "!!! Any help is appreciated.  Please stop by #gentoo-mips on the  !!!"
+	eerror "!!! Freenode IRC Network (irc.freenode.com) if you think you can  !!!"
+	eerror "!!! help.                                                         !!!"
+	eerror "!!!                                                               !!!"
+	eerror "!!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!!"
+	echo -e ""
+
+# Commented out until Octane lives again.
+#	einfo "Things to keep in mind when building a kernel for an SGI Octane:"
+#	einfo "\t- Impact (MGRAS) console and X driver work, please report any bugs."
+#	einfo "\t- VPro (Odyssey) console works, 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- Do not use OHCI-based USB cards in Octane.  They're broke on this machine."
+#	einfo "\t\040\040Patches are welcome to fix the issue."
+#	einfo "\t- Equally, UHCI Cards are showing issues in this release, but should still"
+#	einfo "\t\040\040function somewhat.  This issue manifests itself when using pl2303 USB->Serial"
+#	einfo "\t\040\040adapters."
+#	einfo "\t- Other XIO-based devices like MENET and various Impact addons remain"
+#	einfo "\t\040\040untested and are not guaranteed to work.  This applies to various"
+#	einfo "\t\040\040digital video conversion boards as well."
+#	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-v3.eblit
index 5617bfc59815..57e4036e2d52 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v2.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
 
 # Eblit with information/warnings for IP32 (O2) users.
 #
@@ -24,11 +24,10 @@ show_ip32_info() {
 	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."
+		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"
diff --git a/sys-kernel/mips-sources/files/eblits/src_unpack-v1.eblit b/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit
index fc3de1c70c28..f61b3bfc29ec 100644
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/src_unpack-v1.eblit,v 1.1 2009/03/16 06:39:10 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
 
 # Eblit to handle src_unpack.
 
@@ -9,10 +9,10 @@ eblit-mips-sources-src_unpack() {
 	# and apply the latest patch from linux-mips git.
 	kernel-2_src_unpack
 
-	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${F_KV}.
+	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
 	echo -e ""
 	cd "${WORKDIR}"
-	unpack "${PN}-${F_KV}-patches-v${GENPATCHREV}.tar.bz2"
+	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
 
 	# Create a new folder, patch-symlinks, and create symlinks to
 	# mips-patches in there.  If we want to exclude a patch, we'll
@@ -20,7 +20,7 @@ eblit-mips-sources-src_unpack() {
 	local psym="patch-symlinks"
 	mkdir "${psym}"
 	cd "${psym}"
-	for x in ../mips-patches-${F_KV}/*.patch; do
+	for x in ../mips-patches-${BASE_KV}/*.patch; do
 		ln -s "${x}" "${x##../mips-patches-*/}"
 	done
 
@@ -30,23 +30,26 @@ eblit-mips-sources-src_unpack() {
 	# 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_impactdebug="6002*" p_odysseydebug="6003*"
 	use ip27 && unset p_generic p_ip27
 	use ip28 && unset p_ip28
 	use ip30 && unset p_generic p_ip30
 	use ip32r10k && unset p_ip32r10k
+	use impactdebug && unset p_impactdebug
+	use odysseydebug && unset p_odysseydebug
 
 	# 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} ${p_ip32r10k} ${p_impactdebug} ${p_odysseydebug}"
 	for x in $patchlist; do rm -f "./${x}"; done
 
 	# Rename the source tree to match the linux-mips git checkout date and
 	# machine type.
 	local v="${F_KV}${EXTRAVERSION}-${GITDATE}"
 	for x in {ip27,ip28,ip30,cobalt}; do use ${x} && v="${v}.${x}" && break; done
-	mv "${WORKDIR}/linux-${F_KV}${EXTRAVERSION}" "${WORKDIR}/linux-${v}"
+	mv "${WORKDIR}/linux-${F_KV}${EXTRAVERSION}" "${WORKDIR}/linux-${v}" || die
 	S="${WORKDIR}/linux-${v}"
 
 	# Now go into the kernel source and patch it.