Fun fun updates. New ebuilds for 2.4.27 and 2.6.8.1, pulled from linux-mips CVS on 18 Aug 2004. Also included a patch from lmo cvs for 2.6.7 that should fix the ifconfig problem.

9 files changed, 240 insertions, 5 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 24c03d7458f7..9df49a082d89 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.53 2004/08/11 09:48:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.54 2004/08/15 03:59:02 kumba Exp $
+
+*mips-sources-2.6.8.1 (14 Aug 2004)
+
+  14 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/misc-2.6-compat_alloc_user_space.patch, +mips-sources-2.4.27.ebuild,
+  -mips-sources-2.6.7-r5.ebuild, +mips-sources-2.6.7-r6.ebuild,
+  +mips-sources-2.6.8.1.ebuild:
+  Fun fun updates. New ebuilds for 2.4.27 and 2.6.8.1, pulled from linux-mips
+  CVS on 18 Aug 2004. Also included a patch from lmo cvs for 2.6.7 that should
+  fix the ifconfig problem.
 
 *mips-sources-2.6.6-r8 (11 Aug 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 0f4cc56a8966..3b30935c86eb 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,17 +1,22 @@
-MD5 8955cdeb1afc859fb2743859dffd0c68 ChangeLog 21279
+MD5 9ca6b2f649f41f1b284cb558ef0996d7 ChangeLog 21724
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
 MD5 f389b6822fd8ee0618f3d178ea44c35c mips-sources-2.4.25-r8.ebuild 3258
 MD5 9a0ae8a9b5189133dd19b514545aad5b mips-sources-2.4.26-r8.ebuild 2568
 MD5 5816acb59a4df29ed0c7f56c0b1ed02e mips-sources-2.6.4-r8.ebuild 4081
 MD5 f0fad78236907bff7729ad2542e0b486 mips-sources-2.6.6-r8.ebuild 3715
-MD5 6856bb5251dec1cf05bfb33677430b97 mips-sources-2.6.7-r5.ebuild 3693
+MD5 b714f443f57909b12bad9e03f1c3b718 mips-sources-2.6.8.1.ebuild 3301
+MD5 b0c31379d2fbf8d10a0a188fc3817fdc mips-sources-2.4.27.ebuild 2250
+MD5 57f350535b5d18bb86193ad4fffdad66 mips-sources-2.6.7-r6.ebuild 3851
 MD5 005c705111f504798dfba298ad86e544 files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch 645
 MD5 1a9b6f9118a7f6bf33b80a3b0341c160 files/misc-2.6-force_mouse_detection.patch 490
 MD5 784f11bea2f673b5f773f27b6a104aec files/digest-mips-sources-2.4.25-r8 302
 MD5 6c8cf0e72c9be329657b1a344636005d files/digest-mips-sources-2.4.26-r8 303
 MD5 10c17a7e31acda8bc6433570050b74a2 files/digest-mips-sources-2.6.4-r8 384
 MD5 5e58c3a100fcb48b74d9dac476cc818c files/digest-mips-sources-2.6.6-r8 384
-MD5 09a849bbe9c516658420632e9ddcbfc8 files/digest-mips-sources-2.6.7-r5 384
+MD5 09a849bbe9c516658420632e9ddcbfc8 files/digest-mips-sources-2.6.7-r6 384
+MD5 2fc5d0e8a97a8d2e7c9e20552a795d96 files/misc-2.6-compat_alloc_user_space.patch 755
+MD5 d205ef18aaa52cfea67cd116df7e763c files/digest-mips-sources-2.4.27 303
+MD5 fa6b0c9324110b868df7cad2d83300ba files/digest-mips-sources-2.6.8.1 388
 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
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27
new file mode 100644
index 000000000000..0225f4264296
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27
@@ -0,0 +1,4 @@
+MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
+MD5 15a51fcc518466730f54fc6c87f11ee0 mipscvs-2.4.27-20040814.diff.bz2 194003
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r6
index aa7c4a78f9da..aa7c4a78f9da 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r6
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1
new file mode 100644
index 000000000000..e85347e64ffc
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1
@@ -0,0 +1,5 @@
+MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
+MD5 32ede06aa1be24008f703b5bb8016081 mipscvs-2.6.8.1-20040814.diff.bz2 277900
+MD5 95707c06f0f20e2d0775e2e687e98d07 cobalt-patches-26xx-1.6.tar.bz2 7485
+MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/files/misc-2.6-compat_alloc_user_space.patch b/sys-kernel/mips-sources/files/misc-2.6-compat_alloc_user_space.patch
new file mode 100644
index 000000000000..318e683d43f3
--- /dev/null
+++ b/sys-kernel/mips-sources/files/misc-2.6-compat_alloc_user_space.patch
@@ -0,0 +1,21 @@
+===================================================================
+RCS file: /home/cvs/linux/include/asm-mips/compat.h,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- linux/include/asm-mips/compat.h	2003/07/29 03:21:47	1.1
++++ linux/include/asm-mips/compat.h	2004/08/12 17:37:53	1.2
+@@ -132,10 +132,10 @@ static inline void *compat_ptr(compat_up
+ 
+ static inline void *compat_alloc_user_space(long len)
+ {
+-	unsigned long sp = (unsigned long) current_thread_info() +
+-	                    THREAD_SIZE - 32;
++	struct pt_regs *regs = (struct pt_regs *)
++		((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
+ 
+-	return (void *) (sp - len);
++	return (void *) (regs->regs[29] - len);
+ }
+ 
+ #endif /* _ASM_COMPAT_H */
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.27.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.27.ebuild
new file mode 100644
index 000000000000..e98b76f37286
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.27.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 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.4.27.ebuild,v 1.1 2004/08/15 03:59:03 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040814"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+COBALTPATCHVER="1.4"
+SECPATCHVER="1.2"
+
+# Miscellaneous stuff
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+IUSE=""
+
+# Eclass stuff
+ETYPE="sources"
+inherit kernel eutils
+
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 12 Jul 2004
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
+# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
+# 5) iso9660 fix
+# 6) Patches for Cobalt support
+
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-* mips"
+
+
+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
+
+	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
+	echo -e ""
+	einfo ">>> Generic Patches"
+	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
+
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
+		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
+	eend
+
+	# Cobalt Patches
+	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+		echo -e ""
+		einfo ">>> Patching kernel for Cobalt support ..."
+		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
+			epatch ${x}
+		done
+		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
+		cd ${WORKDIR}
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
+		S="${S}.cobalt"
+	fi
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r6.ebuild
index b4bf5737809d..a7e81dcef4c9 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.7-r5.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r6.ebuild,v 1.1 2004/08/15 03:59:03 kumba Exp $
 
 
 # Version Data
@@ -82,6 +82,10 @@ src_unpack() {
 	# Force detection of PS/2 mice on SGI Systems
 	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
 
+	# Something happened to compat_alloc_user_space between 2.6.6 and 2.6.7 that
+	# Breaks ifconfig.
+	epatch ${FILESDIR}/misc-2.6-compat_alloc_user_space.patch
+
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
 	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.8.1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1.ebuild
new file mode 100644
index 000000000000..a2661a865d24
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.8.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2004 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.8.1.ebuild,v 1.1 2004/08/15 03:59:03 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040814"
+COBALTPATCHVER="1.6"
+SECPATCHVER="1.2"
+IP32DIFFDATE="20040402"
+EXTRAVERSION=".$(echo ${OKV} | cut -d. -f4)-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 14 Aug 2004
+# 3) Patch to fix an O2 compile-time error
+# 4) Iluxa's minimal O2 Patchset
+# 5) Security fixes
+# 6) 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
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-*"
+IUSE=""
+
+
+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
+
+	# Fix a compile glitch for SGI O2/IP32
+	echo -e ""
+	einfo ">>> Generic Patches"
+	epatch ${FILESDIR}/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
+
+	# In order to use arcboot on IP32, the kernel entry address needs to be
+	# set to 0x98000000, not 0xa8000000.
+	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+
+	# Force detection of PS/2 mice on SGI Systems
+	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
+
+	# iluxa's minpatchset for SGI O2
+	echo -e ""
+	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
+	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
+
+
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
+	eend
+
+
+	# 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
+}