linux-mips.org CVS Snapshot (20030703), branch linux_2_4 (to go with the same sources)

5 files changed, 46 insertions, 66 deletions

diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index aebb77459920..71dc69fc437b 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,5 +1,5 @@
-MD5 b577fd6fd3903b50a41dfacf9851467b ChangeLog 718
-MD5 7842ff1d9fe39ff55260e33a20d348d0 mips-headers-2.4.21_pre4-r1.ebuild 1247
+MD5 91c353589e18c3f1eec712d49c3c491c ChangeLog 717
+MD5 b8841bb2fd1d36bd65bb481c5bed8088 mips-headers-2.4.21_pre4-r1.ebuild 1247
 MD5 f584baa396fe777485640f1f49e57527 files/digest-mips-headers-2.4.21_pre4-r1 170
 MD5 538c2d572195a560219589ab6a584356 files/2.4.21-pre4/mips-sources-r4k-cache-fix.patch 1557
 MD5 9bc51a03dd26dee8e0ebe0048ef67145 files/2.4.21-pre4/mips-sources-gcc32-makefile-fix.patch 651
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21 b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21
deleted file mode 100644
index f8c2b5e1219b..000000000000
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 81297c9ab836b6fba26726aa941fb497 patch-2.4.21-pre5.bz2 2741941
-MD5 f15babd3d5fcfa26d26f703c40167a03 linux-2.4.21-pre5-20030323-mips-cvs.patch.bz2 552771
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21_pre4-r1 b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21_pre4-r1
new file mode 100644
index 000000000000..853f4b3c4c61
--- /dev/null
+++ b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21_pre4-r1
@@ -0,0 +1,2 @@
+MD5 1c980fa21db21635e06a2a86bcee9637 linux-mips-2.4.21-pre4-20030703.tar.bz2 27985636
+MD5 212d82e9deaf51ae8c319d2d11e3a271 mips-patches-2.4.21-pre4-20030703.tar.bz2 1255
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21.ebuild
deleted file mode 100644
index 7e9a163d5f73..000000000000
--- a/sys-kernel/mips-headers/mips-headers-2.4.21.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21.ebuild,v 1.1 2003/03/23 21:26:06 zwelch Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-IUSE=""
-DEPEND=""
-
-ETYPE="headers"
-inherit kernel eutils
-
-# What's in this kernel?
-# INCLUDED:
-#   stock 2.4.20 kernel sources
-#   2.4.21-pre5 patch
-#   mips patches 
-
-DESCRIPTION="Full sources for the Gentoo MIPS/Linux kernel"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-KEYWORDS="-arm -hppa -x86 -ppc -sparc -alpha mips"
-
-# set the kernel version now
-OKV=2.4.20
-EXTRAVERSION="pre5"
-KV="2.4.21-${EXTRAVERSION}"
-S=${WORKDIR}/linux-${KV}
-SLOT="${KV}"
-
-# testing kernel patch
-EXTRA_KERNEL_PATCH="patch-${KV}"
-
-# this is the main MIPS Kernel Patch
-MIPS_KERNEL_PATCH="linux-${KV}-20030323-mips-cvs.patch"
-
-
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 \
-	http://www.kernel.org/pub/linux/kernel/v2.4/testing/${EXTRA_KERNEL_PATCH}.bz2 \
-	http://cvs.gentoo.org/~dragon/${MIPS_KERNEL_PATCH}.bz2"
-
-
-src_unpack() {
-	# base vanilla source
-	unpack "linux-${OKV}.tar.bz2" || die
-	[ "${OKV}" != "${KV}" ] && \
-		mv "${WORKDIR}/linux-${OKV}" "${WORKDIR}/linux-${KV}"
-
-	# plus the testing kernel patch
-	unpack "${EXTRA_KERNEL_PATCH}.bz2" || die
-
-	# plus MIPS cvs kernel patch
-	unpack "${MIPS_KERNEL_PATCH}.bz2" || die
-
-	# do the actual patching
-	cd ${S} || die
-	einfo "Applying ${ARM_KERNEL_PATCH}"
-	epatch "${WORKDIR}/${EXTRA_KERNEL_PATCH}" || die
-	epatch "${WORKDIR}/${MIPS_KERNEL_PATCH}" || die
-
-	kernel_universal_unpack
-}
-
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21_pre4-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21_pre4-r1.ebuild
new file mode 100644
index 000000000000..ba3b4bb07f9e
--- /dev/null
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21_pre4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21_pre4-r1.ebuild,v 1.1 2003/07/04 05:09:05 kumba Exp $
+
+
+ETYPE="headers"
+inherit kernel
+OKV=${PV/_/-}
+CVSDATE=20030703
+S=${WORKDIR}/linux-${OKV}
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux-mips.org CVS snapshot from 03 Jul 2003
+# 2) patch off linux-mips ML to fix r4k cache handling
+# 3) patch to fix arch/mips/Makefile to pass appropriate CFLAGS
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines"
+SRC_URI="mirror://gentoo/linux-mips-${OKV}-${CVSDATE}.tar.bz2
+		mirror://gentoo/mips-patches-${OKV}-${CVSDATE}.tar.bz2"
+HOMEPAGE="http://www.linux-mips.org/" 
+KEYWORDS="-* ~mips"
+SLOT="${OKV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix R4K Cache Handling
+	cat ${WORKDIR}/mips-patches-r4k-cache-fix.patch | patch -p1
+
+	# Determine the gcc version and patch arch/mips/Makefile appropriately	
+	GCCVER=$(gcc -dumpversion | cut -d. -f1,2)
+	case ${GCCVER} in
+		3.2) cat ${WORKDIR}/mips-patches-gcc32-makefile-fix.patch | patch -p0;;
+		3.3) cat ${WORKDIR}/mips-patches-gcc33-makefile-fix.patch | patch -p0;;
+	esac
+
+
+	kernel_universal_unpack
+}