New snapshot for 2.6.7

5 files changed, 115 insertions, 6 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 93e9114bbced..935e1436c33d 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2004/06/07 01:32:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.45 2004/06/24 01:20:22 kumba Exp $
+
+*mips-sources-2.6.7 (23 Jun 2004)
+
+  23 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch, +mips-sources-2.6.7.ebuild:
+  New snapshot for 2.6.7
 
   07 Jun 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.6.6-r1.ebuild:
   Change the IP32DIFFDATE back to a known working date.
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 4299dad9132a..094c5e3eaf6c 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 387dcdecbd9344013bd1c2e65881597d ChangeLog 15830
+MD5 aa11bd7180b3120eefa4f6e8e6ffae11 ChangeLog 16017
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
 MD5 c505904f996de9caf29752fd254fc183 mips-sources-2.4.25-r3.ebuild 2707
 MD5 8da9a1238b4d58122debbfa6666c4275 mips-sources-2.4.26-r2.ebuild 2064
@@ -6,14 +6,15 @@ MD5 c1cd3e9f368ca4898f380ad1e59bacb6 mips-sources-2.6.4-r3.ebuild 3931
 MD5 02e7101cdeb8aebaedceb958bd367389 mips-sources-2.6.5-r2.ebuild 3998
 MD5 5cb248155b159f1e3a387ce33443acb5 mips-sources-2.6.6-r1.ebuild 2747
 MD5 3c4b86dd8ba76fec3513a2a3db0c8034 mips-sources-2.6.6.ebuild 2744
+MD5 2d84eda2f028a4d83975e59a5f43df91 mips-sources-2.6.7.ebuild 2676
 MD5 6f4bba5dda7a99d77b1564f5489fef6e files/CAN-2004-0075-2.6-vicam_usb.patch 1129
-MD5 5bf9836a632a861728d33f9736bb7431 files/CAN-2004-0133-xfs_ext3.patch 427
-MD5 de75cfa969ed092578d9ddda6c5be334 files/CAN-2004-0181-2.4-jfs_ext3.patch 1233
-MD5 c8b7be9ee0da1415fa0274da5859aa62 files/CAN-2004-0181-2.6-jfs_ext3.patch 1366
 MD5 21f3a4f186017d925067335e24db36a1 files/CAN-2004-0109-2.4-iso9660.patch 1877
 MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/CAN-2004-0109-2.6-iso9660.patch 2072
+MD5 5bf9836a632a861728d33f9736bb7431 files/CAN-2004-0133-xfs_ext3.patch 427
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/CAN-2004-0177-ext3_jbd.patch 384
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/CAN-2004-0178-sbblaster.patch 424
+MD5 de75cfa969ed092578d9ddda6c5be334 files/CAN-2004-0181-2.4-jfs_ext3.patch 1233
+MD5 c8b7be9ee0da1415fa0274da5859aa62 files/CAN-2004-0181-2.6-jfs_ext3.patch 1366
 MD5 1dd59d14a720c0c23e47e28d0b4fd6f9 files/CAN-2004-0228-cpufreq.patch 437
 MD5 a92712e41465c49670ef7a54c2d16040 files/CAN-2004-0229-fb_copy_cmap.patch 471
 MD5 d4a740ae56c2049247083af387a22a85 files/CAN-2004-0394-panic.patch 350
@@ -23,8 +24,8 @@ MD5 5c6bf5770bf59976861382f45bdeb7ff files/digest-mips-sources-2.4.25-r3 217
 MD5 098807e58d4f8bc7efcaea114ba28fcd files/digest-mips-sources-2.4.26-r2 218
 MD5 497365345d8a39da49a8bd2495a17d8c files/digest-mips-sources-2.6.4-r3 299
 MD5 eb9f26d678449f22ce5b7c00762eeb91 files/digest-mips-sources-2.6.5-r2 299
-MD5 ff47ec7e8b4282773743aa192d3a73b6 files/digest-mips-sources-2.6.6-r1 299
 MD5 6be9a61a23f202281c721c3b85760efb files/digest-mips-sources-2.6.6 299
+MD5 ff47ec7e8b4282773743aa192d3a73b6 files/digest-mips-sources-2.6.6-r1 299
 MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.25-makefile-fix.patch 428
 MD5 95ba3093147f4188db0ea4949e4317cf files/mipscvs-2.4.25-makefile-inlinelimit.patch 1588
 MD5 764740b749fd1f81313aa941c55000ac files/mipscvs-2.4.25-no-page-align.patch 1013
@@ -32,3 +33,5 @@ MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.26-makefile-fix.patch 428
 MD5 008eff91c704bd23097666a1cd94ada3 files/mipscvs-2.6.5-swapbug-fix.patch 1329
 MD5 db1aaa77e691906f3857e54e363c4ff4 files/mipscvs-2.6.5-unistd-linkage.patch 515
 MD5 c65ca9f967d25e79aadfe387f7ce6fa3 files/mipscvs-2.6.x-no-page-align.patch 483
+MD5 2802496e6b2dcc4e5ff19fac6826c7f7 files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch 339
+MD5 5b7a4b7f8c4baea56b4cd1332cb0948b files/digest-mips-sources-2.6.7 299
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7
new file mode 100644
index 000000000000..0b0e6e5494a9
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7
@@ -0,0 +1,4 @@
+MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
+MD5 4d59f1ecb42edff3d704bb7c22c42305 mipscvs-2.6.7-20040621.diff.bz2 385542
+MD5 c66fffb69cbe68549df23066e95684d6 cobalt-patches-26xx-1.5.tar.bz2 7842
+MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
new file mode 100644
index 000000000000..098c9abfc88b
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
@@ -0,0 +1,10 @@
+--- include/asm-mips/mach-ip32/mc146818rtc.h.orig	2004-06-21 00:47:35.931657976 -0400
++++ include/asm-mips/mach-ip32/mc146818rtc.h	2004-06-21 00:47:50.704412176 -0400
+@@ -13,6 +13,7 @@
+ 
+ #include <asm/io.h>
+ #include <asm/ip32/mace.h>
++#include <asm/ip32/ip32_ints.h>
+ 
+ #define RTC_PORT(x)	(0x70 + (x))
+ #define RTC_IRQ		MACEISA_RTC_IRQ
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7.ebuild
new file mode 100644
index 000000000000..1e4e4d0a7708
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7.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.7.ebuild,v 1.1 2004/06/24 01:20:22 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040621"
+COBALTPATCHVER="1.5"
+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 21 Jun 2004
+# 3) Patch to fix an O2 compile-time error
+# 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
+
+	echo -e ""
+	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
+	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
+
+	# Fix a compile glitch for SGI O2/IP32
+	epatch ${FILESDIR}/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
+
+	# 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
+}