Adding an ebuild for 2.6.6 sources and some comment fixes in the other 2.6.x ebuilds.

7 files changed, 125 insertions, 15 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 0ca40e292949..cb7e503d7852 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.41 2004/05/03 07:41:37 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.42 2004/05/11 03:08:29 kumba Exp $
+
+*mips-sources-2.6.6 (10 May 2004)
+
+  10 May 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.6.3-r4.ebuild,
+  mips-sources-2.6.4-r2.ebuild, mips-sources-2.6.5-r1.ebuild,
+  +mips-sources-2.6.6.ebuild:
+  Adding an ebuild for 2.6.6 sources and some comment fixes in the other 2.6.x
+  ebuilds.
 
   03 May 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.23-r8.ebuild,
   mips-sources-2.4.25-r2.ebuild:
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index e7ad6b452d93..cd8e96fca248 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,9 +1,10 @@
-MD5 c37d2dc4ba3a75d791062a1effa30588 ChangeLog 13811
+MD5 fb8c38e747bac6e97e1ac9fcdee6473b ChangeLog 14107
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
 MD5 c629d75296a8cee92224e5f436b372ad mips-sources-2.4.26-r1.ebuild 1948
-MD5 9ce480aad39ba18d71910adf13cda367 mips-sources-2.6.3-r4.ebuild 3476
-MD5 7bffea7875310844dbd3be7259c790ff mips-sources-2.6.4-r2.ebuild 3473
-MD5 43bfebeea831c74fd77aa169bd8bfba8 mips-sources-2.6.5-r1.ebuild 3545
+MD5 1b39f940c71e909a82398b004b2168bb mips-sources-2.6.3-r4.ebuild 3628
+MD5 c34bf904d1fc86a98c6c682c38af97da mips-sources-2.6.4-r2.ebuild 3628
+MD5 7d14b94464a3ae3ea0c79feee40b5e80 mips-sources-2.6.5-r1.ebuild 3749
+MD5 a5147fe5fd1b55935fbf0d4d5ddc0e30 mips-sources-2.6.6.ebuild 2745
 MD5 dd2951c21f50fee5662f76c627dfcc4d mips-sources-2.4.21-r9.ebuild 2783
 MD5 4b38bf0b5c0a7b16df45ef3cabe75693 mips-sources-2.4.22-r12.ebuild 2618
 MD5 6e0db1dd40ba72782fafd2b24a2b071f mips-sources-2.4.23-r8.ebuild 3403
@@ -40,3 +41,4 @@ MD5 ac42024b6e6ee1e2165914db4b22a61c files/CAN-2004-0178-sbblaster.patch 424
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/CAN-2004-0177-ext3_jbd.patch 384
 MD5 eb9f26d678449f22ce5b7c00762eeb91 files/digest-mips-sources-2.6.5-r1 299
 MD5 098807e58d4f8bc7efcaea114ba28fcd files/digest-mips-sources-2.4.26-r1 218
+MD5 6be9a61a23f202281c721c3b85760efb files/digest-mips-sources-2.6.6 299
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6
new file mode 100644
index 000000000000..934a8f6c876c
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6
@@ -0,0 +1,4 @@
+MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
+MD5 2281ab1f72c8a090ed87b9039d92e504 mipscvs-2.6.6-20040510.diff.bz2 368319
+MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
+MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild
index 0ef6aa2df3ce..53b7347d1b44 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild,v 1.2 2004/05/11 03:08:29 kumba Exp $
 
 
 # Version Data
@@ -24,8 +24,11 @@ inherit kernel eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 18 Feb 2004
-# 3) Patches for Cobalt support
+# 2) linux-mips.org CVS snapshot diff from 05 Mar 2004
+# 3) Patch to tweak arch/mips/Makefile to build proper kernels under binutils-2.15.x
+# 4) Iluxa's minimal O2 patchset
+# 5) CAN-2004-0109: ISO9660 patch
+# 6) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild
index c4cd4d4849af..35bd45114702 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild,v 1.2 2004/05/11 03:08:29 kumba Exp $
 
 
 # Version Data
@@ -21,8 +21,11 @@ inherit kernel eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 18 Feb 2004
-# 3) Patches for Cobalt support
+# 2) linux-mips.org CVS snapshot diff from 11 Mar 2004
+# 3) Patch to tweak arch/mips/Makefile to build proper kernels under binutils-2.15.x
+# 4) Iluxa's minimal O2 patchset
+# 5) CAN-2004-0109: ISO9660 patch
+# 6) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
@@ -70,7 +73,7 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
-	# Binutils-2.14.90.0.8 and does some magic with page alignment
+	# Binutils-2.14.90.0.8 and up does some magic with page alignment
 	# that prevents the kernel from booting.  This patch fixes it.
 	epatch ${FILESDIR}/mipscvs-2.6.x-no-page-align.patch
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild
index d3dbd287c13c..f3a595743f13 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild,v 1.2 2004/05/11 03:08:29 kumba Exp $
 
 
 # Version Data
@@ -21,8 +21,12 @@ inherit kernel eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 18 Feb 2004
-# 3) Patches for Cobalt support
+# 2) linux-mips.org CVS snapshot diff from 12 Apr 2004
+# 3) Patch to fix the Swap issue in 2.6.5+ (Credit: Peter Horton <cobalt@colonel-panic.org>
+# 4) Iluxa's minimal O2 patchset
+# 5) Patch to fix linking issue for initrd's
+# 6) CAN-2004-0109: ISO9660 patch
+# 7) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.6.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.6.ebuild
new file mode 100644
index 000000000000..bbdfa36a3edc
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6.ebuild,v 1.1 2004/05/11 03:08:29 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040510"
+COBALTPATCHVER="1.4"
+IP32DIFFDATE="20040402"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+
+# Miscellaneous stuff
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+
+# Eclass stuff
+ETYPE="sources"
+inherit kernel eutils
+
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 10 May 2004
+# 3) Patch to fix the Swap issue in 2.6.5+ (Credit: Peter Horton <cobalt@colonel-panic.org>
+# 4) Iluxa's minimal O2 Patchset
+# 5) Patches for Cobalt support
+
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2
+		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2"
+
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-*"
+
+
+pkg_setup() {
+	# See if we're on a cobalt system (must use the cobalt-mips profile)
+	if [ "${PROFILE_ARCH}" = "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 ""
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
+	cd ${S}
+
+	# Update the vanilla sources with linux-mips CVS changes
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
+
+	# Bug in 2.6.6 that triggers a kernel oops when swap is activated
+	epatch ${FILESDIR}/mipscvs-2.6.5-swapbug-fix.patch
+
+	echo -e ""
+	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
+	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
+
+	# Cobalt Patches
+	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+		echo -e ""
+		einfo ">>> Patching kernel for Cobalt support ..."
+		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
+			epatch ${x}
+		done
+		cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
+		cd ${WORKDIR}
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
+		S="${S}.cobalt"
+	fi
+
+	kernel_universal_unpack
+}