Adding a 2.6.12-rc1 ebuild because of the constantly changing version of 2.6.11.x. Includes updated Octane support (w/ SMP), remaining cobalt bits that have yet to be merged, and an experimental mips nptl patch for testing purposes. IP28 support is not available in this release, though.

(Portage version: 2.0.51.19)

4 files changed, 315 insertions, 2 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 000162fe3df5..22b2fdfef9da 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.69 2005/02/06 18:48:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.70 2005/03/25 02:30:09 kumba Exp $
+
+*mips-sources-2.6.12_rc1 (24 Mar 2005)
+
+  24 Mar 2005; Joshua Kinard <kumba@gentoo.org>
+  +mips-sources-2.6.12_rc1.ebuild:
+  Adding a 2.6.12-rc1 ebuild because of the constantly changing version of
+  2.6.11.x. Includes updated Octane support (w/ SMP), remaining cobalt bits that
+  have yet to be merged, and an experimental mips nptl patch for testing
+  purposes. IP28 support is not available in this release, though.
 
   06 Feb 2005; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.28-r1.ebuild,
   mips-sources-2.6.10-r1.ebuild:
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index a3c2074d7e30..2b8968ab45bb 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,12 +1,14 @@
-MD5 e894a41a16b5068f9cd5405da9b01530 ChangeLog 30059
+MD5 ac9312c6ff2ae6e0be77fe8bd6e3229a ChangeLog 30479
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
 MD5 0bb3bc67228fd8c143e42af31483c781 mips-sources-2.4.27-r8.ebuild 3472
 MD5 dc64184ac651cfeebd46d8e5d6f72a79 mips-sources-2.4.28-r1.ebuild 2904
 MD5 39dd88a5427064a8a1deeae88ff89739 mips-sources-2.6.10-r1.ebuild 10590
 MD5 d2f6055b952588b5add88a19d49af4e1 mips-sources-2.6.8.1-r8.ebuild 5286
 MD5 ce36e682ec524d5f200568d7a55ad77a mips-sources-2.6.9-r9.ebuild 6064
+MD5 2a8e4c3a993144f561435333e2c3c48c mips-sources-2.6.12_rc1.ebuild 9887
 MD5 9db9eec5526c874d63295b79eb110a3d files/digest-mips-sources-2.4.27-r8 388
 MD5 94fa9e15268b8fca5ff52f766247f223 files/digest-mips-sources-2.4.28-r1 388
 MD5 ceca8cd00c8e5497eb68a3aff9b16604 files/digest-mips-sources-2.6.10-r1 314
 MD5 a91ef54fc3b01497a816172bacd62628 files/digest-mips-sources-2.6.8.1-r8 390
 MD5 6d25918081d8bc7b57a10bb93f9b35e0 files/digest-mips-sources-2.6.9-r9 386
+MD5 cdcf588fcaeda36c7369845bac98c99b files/digest-mips-sources-2.6.12_rc1 385
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc1
new file mode 100644
index 000000000000..74b9fb693324
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc1
@@ -0,0 +1,5 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 22227f7b9175e6448509b1d42d398027 mipscvs-2.6.12-rc1-20050320.diff.bz2 271871
+MD5 7d6f9b08ed6335f50bdbb2c9abe55b21 mips-sources-security_patches-1.11.tar.bz2 71094
+MD5 cbba6ee3f2a72bc7bd4d13044b96506e mips-sources-generic_patches-1.7.tar.bz2 113764
+MD5 4a0ad3e1dc96d4a7bd93856df6c7adab patch-2.6.12-rc1.bz2 2463509
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.12_rc1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.12_rc1.ebuild
new file mode 100644
index 000000000000..a7ad85c0399d
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.12_rc1.ebuild
@@ -0,0 +1,297 @@
+# 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_rc1.ebuild,v 1.1 2005/03/25 02:30:09 kumba Exp $
+
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 20 Mar 2005
+# 3) Generic Fixes
+# 4) Security fixes
+# 5) Patch for IP30 Octane Support		(http://helios.et.put.poznan.pl/~sskowron/ip30/)
+# 6) Patch for Remaining Cobalt Bits		(http://www.colonel-panic.org/cobalt-mips/)
+# 7) Experimental patches
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20050320"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.11"			# Tarball version for security patches
+GENPATCHVER="1.7"			# Tarball version for generic patches
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+USERC="yes"				# If set to "yes", then attempt to use an RC kernel
+
+# Directories
+S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+MIPS_SECURITY="${WORKDIR}/security"
+
+# Inherit Eclasses 
+ETYPE="sources"
+inherit kernel eutils
+
+# Portage Vars
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-* ~mips"
+IUSE="cobalt ip28 ip30 livecd nptl"
+
+# If USERC == "yes", use a release candidate kernel (2.6.X-rcY)
+if [ "${USERC}" = "yes" ]; then
+	KVMjMn="${OKV%.*}"				# Kernel Major/Minor
+	KVREV="${OKV%%-*}"				# Kernel Revision Pt. 1
+	KVREV="${KVREV##*.}"				# Kernel Revision Pt. 2
+	KVRC="${OKV#*-}"				# Kernel RC
+	STABLEVER="${KVMjMn}.$((${KVREV} - 1))"		# Last stable Kernel version (Revision - 1)
+	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
+	EXTRAVERSION="-${KVRC}-mipscvs-${CVSDATE}"
+	KV="${OKV}-${EXTRAVERSION}"
+else
+	STABLEVER="${OKV}"
+	PATCHVER=""
+fi
+
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${STABLEVER}.tar.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		${PATCHVER}"
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Error message 
+err_only_one_arch_allowed() {
+	echo -e ""
+	eerror "A patchset for a specific machine-type has already been selected."
+	eerror "No other patches for machines-types are permitted.  You will need a"
+	eerror "separate copy of the kernel sources for each different machine-type"
+	eerror "you want to build a kernel for."
+	die "Only one machine-type patchset allowed"
+}
+
+
+# Check our USE flags for machine-specific flags and give appropriate warnings.
+# Hope the user isn't crazy enough to try using combinations of these flags.
+# Only use one machine-specific flag at a time for each type of desired machine-support.
+#
+# Affected machines:	ip30 ip28
+# Not Affected:		cobalt ip32
+pkg_setup() {
+	local arch_is_selected="no"
+
+	# See if we're using IP28 (Indigo2 Impact R10000)
+	if use ip28; then
+		eerror "!!! IP28 Support not available for this release"
+		die
+#//		if [ "${arch_is_selected}" = "no" ]; then
+#//			echo -e ""
+#//			einfo "Support for the Indigo2 Impact R10000 is probably even more experimental"
+#//			einfo "than Octane support.  If you seriously do not have a clue in the world about"
+#//			einfo "what you are doing, what an IP28 is, what a mips is, or even what gentoo is,"
+#//			einfo "then stop now, and return to regularly scheduled x86 programming.  Consider"
+#//			einfo "this the warning that you are about to venture into no-man's land with a"
+#//			einfo "machine that is barely supported, likely very unstable, and may very well"
+#//			einfo "eat your grandmother's pet cat Fluffy."
+#//			echo -e ""
+#//			einfo "That said, support for this system REQUIRES that you use the ip28 cascade"
+#//			einfo "profile (default-linux/mips/mips64/ip28/XXXX.Y), because a very special"
+#//			einfo "patch is used on the system gcc, kernel-gcc (gcc-mips64) and the kernel"
+#//			einfo "itself in order to support this machine.  These patches will only be applied"
+#//			einfo "if \"ip28\" is defined in USE, which the profile sets.  Other things to keep"
+#//			einfo "in mind are that this system can only be netbooted (no arcboot support),"
+#//			einfo "requires a full 64-bit kernel, serial-console only (Impact graphics not"
+#//			einfo "supported yet), and _nothing_ is guaranteed to work smoothly."
+#//			echo -e ""
+#//			arch_is_selected="yes"
+#//		else
+#//			err_only_one_arch_allowed
+#//		fi
+	fi
+
+
+	# See if we're using IP30 (Octane)
+	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."
+			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."
+			echo -e ""
+			arch_is_selected="yes"
+		else
+			err_only_one_arch_allowed
+		fi
+	fi
+
+
+	# See if we're on a cobalt system (must use the cobalt-mips profile)
+	if use cobalt; then
+		echo -e ""
+		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
+		einfo "systems that are still using the old Cobalt bootloader.  In"
+		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
+		einfo "Peter Horton's new bootloader, which does not have the kernel"
+		einfo "size limitation that the older bootloader has.  If you want"
+		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
+		einfo "installed and setup."
+		echo -e ""
+		arch_is_selected="yes"
+	fi
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Generic Patches - Safe to use globally
+do_generic_patches() {
+	echo -e ""
+	ebegin ">>> Generic Patches"
+		# IP32 Patches (Safe for non-IP32 use)
+		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-onion2-gbefb-fixes.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.10-ip32-tweak-makefile.patch
+
+		# Cobalt Patches (Safe for non-Cobalt use)
+		epatch ${MIPS_PATCHES}/misc-2.6.12-cobalt-bits.patch
+
+		# Generic
+		epatch ${MIPS_PATCHES}/misc-2.6.11-ths-mips-tweaks.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.11-add-ramdisk-back.patch
+		epatch ${MIPS_PATCHES}/misc-2.6-mips-iomap-functions.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.11-smptlb-64bit-fix.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-seccomp-no-default.patch
+
+
+		# Ugly Hacks (Long Story, ask about it on IRC if you really want to know)
+		if ! use ip30 and ! use ip28; then
+			epatch ${MIPS_PATCHES}/misc-2.6.11-ugly-wrong-kphysaddr-hack.patch
+		fi
+	eend
+}
+
+
+# NOT safe for production systems
+# Use at own risk, do _not_ file bugs on effects of these patches
+do_sekret_patches() {
+	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
+	# Patches used in building LiveCDs
+	if use livecd; then
+		epatch ${MIPS_PATCHES}/misc-2.6-livecd-partitioned-cdroms.patch
+	fi
+	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
+
+	# Insanity knows no bounds
+	if use nptl; then
+		echo -e ""
+		einfo ">>> Let the insanity begin ..."
+		epatch ${MIPS_PATCHES}/misc-2.6.12-nptl-support.patch
+	fi
+}
+
+
+do_security_patches() {
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		einfo "None to Apply!"
+	eend
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# These patches are separate from generic patches for a good reason - namely because it is
+# possible (but untested) that patches for one machine-type may conflict with patches from
+# another machine type and therefore produce unwanted side-effects.  We therefore enforce 
+# this by checking if an arch patch has already been applied, and if so, error out.
+
+# 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.10-rc2-ip28-i2_impact-support.patch
+#//	epatch ${MIPS_PATCHES}/misc-2.6.10-rc2-ip28-c_r4k-tweak.patch
+#//	mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip28
+#//	S="${S}.ip28"
+#// }
+
+
+# SGI Octane 'Speedracer' (IP30)
+do_ip30_support() {
+	echo -e ""
+	einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
+	epatch ${MIPS_PATCHES}/misc-2.6.12-rc1-ip30-octane-support.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.11-cgs-ioc3-eth-dow.patch
+	mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip30
+	S="${S}.ip30"
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/linux-${STABLEVER} ${WORKDIR}/linux-${OKV}-${CVSDATE}
+	cd ${S}
+
+
+	# If USERC == "yes", use a release candidate kernel (2.6.x-rcy)
+	if [ "${USERC}" = "yes" ]; then
+		echo -e ""
+		einfo ">>> linux-${STABLEVER} --> linux-${OKV} ..."
+		epatch ${WORKDIR}/patch-${OKV}
+	fi
+
+
+	# Update the vanilla sources with linux-mips CVS changes
+	echo -e ""
+	einfo ">>> linux-${OKV} --> linux-${OKV}-${CVSDATE} patch ..."
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
+
+	# Generic patches we always include
+	do_generic_patches
+
+	# Machine-specific patches
+	use ip28	&& do_ip28_support
+	use ip30	&& do_ip30_support
+	use cobalt	&& do_cobalt_support
+
+	# Patches for experimental use
+	do_sekret_patches
+
+	# Security Fixes
+	do_security_patches
+
+
+	# All done, resume normal portage work
+	kernel_universal_unpack
+}
+
+
+
+#//------------------------------------------------------------------------------