New 2.4.26 snapshot from linux-mips CVS.

6 files changed, 93 insertions, 8 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index b9cbf7e6eb05..5a71632a2d72 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.47 2004/07/01 23:39:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.48 2004/07/13 09:28:43 kumba Exp $
+
+*mips-sources-2.4.26-r4 (13 Jul 2004)
+
+  13 Jul 2004; Joshua Kinard <kumba@gentoo.org>
+  +mips-sources-2.4.26-r4.ebuild:
+  New 2.4.26 snapshot from linux-mips CVS.
 
 *mips-sources-2.6.4-r4 (01 Jul 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 625d02960d8c..675ff33866d7 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,11 +1,12 @@
-MD5 e12350bbdf90acb07a5c64e6774a37c5 ChangeLog 16764
+MD5 6e35b2b6a4b0f9f75a09ea48fea92c60 ChangeLog 16929
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 b27f2ed21342355f64f885cae3075239 mips-sources-2.4.25-r4.ebuild 2802
-MD5 41d08d95e1480a3fdd19439f49f5b5b4 mips-sources-2.4.26-r3.ebuild 2159
+MD5 fcd03ac235921704ee515dd9e0b2faf2 mips-sources-2.4.25-r4.ebuild 2802
+MD5 c1dab98a6d3c2dbf14c34da52ac26cbc mips-sources-2.4.26-r3.ebuild 2159
 MD5 5a9cd22f7c0c7663a90ba2deb5a1fd12 mips-sources-2.6.4-r4.ebuild 3295
 MD5 d9714e60a0d213a0ae2e9ced652ab035 mips-sources-2.6.5-r3.ebuild 3431
 MD5 9416d9ee2a7680353ccf05421e725c05 mips-sources-2.6.6-r2.ebuild 2918
 MD5 a4f386966543767e4614a7931480a17c mips-sources-2.6.7-r1.ebuild 2959
+MD5 bbaea24ffd46a5adf4b3f6041c61a24b mips-sources-2.4.26-r4.ebuild 2159
 MD5 6f4bba5dda7a99d77b1564f5489fef6e files/CAN-2004-0075-2.6-vicam_usb.patch 1129
 MD5 21f3a4f186017d925067335e24db36a1 files/CAN-2004-0109-2.4-iso9660.patch 1877
 MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/CAN-2004-0109-2.6-iso9660.patch 2072
@@ -37,3 +38,4 @@ MD5 fd5b99bc2a9e4c7f9825c9aab6a76b52 files/misc-2.6-iptables_headers.patch 1786
 MD5 dc18e982f8149588a291956481885a8c files/CAN-2004-0495-2.4-sparse.patch 17549
 MD5 0f66013f643c79c97fda489618a4e2fd files/CAN-2004-0535-2.4-e1000.patch 476
 MD5 c91330cc5b4044b6f59696095c2dc0fb files/CAN-2004-0626-death_packet.patch 423
+MD5 1e86c5a6d88da0ee787ddda716a86502 files/digest-mips-sources-2.4.26-r4 218
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r4
new file mode 100644
index 000000000000..da6d2d913f2f
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r4
@@ -0,0 +1,3 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 36be1f4dfebd34b9ad7b69dab9add812 mipscvs-2.4.26-20040712.diff.bz2 343699
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r4.ebuild
index 03ab22eafada..1884114be253 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r4.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.4.25-r4.ebuild,v 1.1 2004/07/01 23:39:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r4.ebuild,v 1.2 2004/07/13 09:28:43 kumba Exp $
 
 
 # Version Data
@@ -21,7 +21,7 @@ inherit kernel eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 28 Nov 2003
+# 2) linux-mips.org CVS snapshot diff from 22 Feb 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) Security Fixes
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r3.ebuild
index 9e7d91899385..1bd22d846803 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r3.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.4.26-r3.ebuild,v 1.1 2004/07/01 23:39:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r3.ebuild,v 1.2 2004/07/13 09:28:43 kumba Exp $
 
 
 # Version Data
@@ -21,7 +21,7 @@ inherit kernel eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 28 Nov 2003
+# 2) linux-mips.org CVS snapshot diff from 15 Apr 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
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r4.ebuild
new file mode 100644
index 000000000000..30e8b28d6eb2
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r4.ebuild
@@ -0,0 +1,74 @@
+# 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.26-r4.ebuild,v 1.1 2004/07/13 09:28:43 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040712"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+COBALTPATCHVER="1.4"
+
+# 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"
+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)
+	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
+
+	# Security Fixes
+	echo -e ""
+	ebegin "Applying Security Fixes"
+		epatch ${FILESDIR}/CAN-2004-0394-panic.patch
+		epatch ${FILESDIR}/CAN-2004-0495-2.4-sparse.patch
+		epatch ${FILESDIR}/CAN-2004-0535-2.4-e1000.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
+}