New CVS snap that contains 2.4.23-rc2

5 files changed, 134 insertions, 15 deletions

diff --git a/sys-kernel/mips-prepatch-sources/Manifest b/sys-kernel/mips-prepatch-sources/Manifest
index d53313d64415..d38b119dd3d9 100644
--- a/sys-kernel/mips-prepatch-sources/Manifest
+++ b/sys-kernel/mips-prepatch-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 d4b365dd5ed255c956ddf8b568f880ae ChangeLog 1092
+MD5 2d3a9f842c12653e17bff912d42fd530 ChangeLog 1092
 MD5 0bfb6b59036d1fe3e8075bc8879e772b metadata.xml 412
-MD5 5586d0cb6a0209b112606c890a739eff mips-prepatch-sources-2.4.22_rc2-r1.ebuild 1721
-MD5 d477f648e5e5457866409100adbb5a2d mips-prepatch-sources-2.4.23_rc2.ebuild 1731
+MD5 86aa0e3b80db6f8d8509c6b74c57f2a6 mips-prepatch-sources-2.4.22_rc2-r1.ebuild 1718
+MD5 4f143165664f9fca9bf0c72bff206ce9 mips-prepatch-sources-2.4.23_rc2.ebuild 1725
 MD5 7383fb7245357cea3b46d07e372fc89a files/digest-mips-prepatch-sources-2.4.22_rc2-r1 215
 MD5 b73a606d05e184a8af27c8f9b7a9c9ca files/mips-gcc-makefile-fix-20030813.patch 906
 MD5 ea8102d23f2649fcc92e2b871c7eb290 files/mips-gcc-makefile-fix-20031120.patch 1906
diff --git a/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.23_rc2 b/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.23_rc2
new file mode 100644
index 000000000000..a2e450542c36
--- /dev/null
+++ b/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.23_rc2
@@ -0,0 +1,3 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 78dbeb9c0290f74949c85c5efdfde952 patch-2.4.23-rc2.bz2 2194985
+MD5 6772dadf14a2330cfc4c3de896218e6e mipscvs-2.4.23-rc2-20031120.diff.bz2 274338
diff --git a/sys-kernel/mips-prepatch-sources/files/mips-gcc-makefile-fix-20031120.patch b/sys-kernel/mips-prepatch-sources/files/mips-gcc-makefile-fix-20031120.patch
new file mode 100644
index 000000000000..b8bb93b79a5e
--- /dev/null
+++ b/sys-kernel/mips-prepatch-sources/files/mips-gcc-makefile-fix-20031120.patch
@@ -0,0 +1,57 @@
+--- arch/mips/Makefile.orig	2003-11-20 18:41:46.149836640 -0500
++++ arch/mips/Makefile	2003-11-20 18:42:17.023143184 -0500
+@@ -73,7 +73,7 @@ ifdef CONFIG_CPU_VR41XX
+ GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
+ endif
+ ifdef CONFIG_CPU_R4X00
+-GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
++GCCFLAGS	+= -mips3 -Wa,--trap
+ endif
+ ifdef CONFIG_CPU_TX49XX
+ GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
+@@ -85,14 +85,14 @@ ifdef CONFIG_CPU_MIPS64
+ GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
+ endif
+ ifdef CONFIG_CPU_R5000
+-GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
++GCCFLAGS	+= -mips4 -Wa,--trap
+ endif
+ ifdef CONFIG_CPU_R5432
+ GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
+ endif
+ ifdef CONFIG_CPU_NEVADA
+ # Cannot use -mmad with currently recommended tools
+-GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
++GCCFLAGS	+= -mips4 -Wa,--trap
+ endif
+ ifdef CONFIG_CPU_RM7000
+ GCCFLAGS	+= $(call check_gcc, -march=rm7000, -mcpu=r5000) \
+--- arch/mips64/Makefile.orig	2003-11-20 18:42:35.295365384 -0500
++++ arch/mips64/Makefile	2003-11-20 18:46:33.326179200 -0500
+@@ -56,14 +56,14 @@ ifdef CONFIG_CPU_R4300
+ GCCFLAGS	+= -mcpu=r4300 -mips3
+ endif
+ ifdef CONFIG_CPU_R4X00
+-GCCFLAGS	+= -mcpu=r4600 -mips3
++GCCFLAGS	+= -mips3
+ endif
+ ifdef CONFIG_CPU_R5000
+-GCCFLAGS	+= -mcpu=r8000 -mips4
++GCCFLAGS	+= -mips4
+ endif
+ ifdef CONFIG_CPU_NEVADA
+ # Cannot use -mmad with currently recommended tools
+-GCCFLAGS	+= -mcpu=r8000 -mips3
++GCCFLAGS	+= -mips4
+ endif
+ ifdef CONFIG_CPU_RM7000
+ GCCFLAGS	+= $(call check_gcc, -march=rm7000, -mcpu=r5000) \
+@@ -299,7 +299,7 @@ endif
+ # convert to ECOFF using elf2ecoff.
+ #
+ ifdef CONFIG_BOOT_ELF32
+-GCCFLAGS += -Wa,-32 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
++GCCFLAGS += -Wa,-mabi=o64 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
+ LINKFLAGS += -T arch/mips64/ld.script.elf32
+ endif
+ #
diff --git a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild
index 08ac846495e5..428085cc5c28 100644
--- a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild
+++ b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild
@@ -1,22 +1,21 @@
 # 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-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild,v 1.4 2003/11/21 00:40:46 kumba Exp $
 
 
-# Eclass Stuff
-ETYPE="sources"
-inherit kernel
-
 # Version Data
 OKV=${PV/_/-}
-CVSDATE=20030813
-EXTRAVERSION=-$(echo ${OKV} | cut -d- -f2)-mipscvs-${CVSDATE}
-STABLEVERSION=2.4.21
-KV="${OKV}${EXTRAVERSION}"
+CVSDATE="20030813"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}-${CVSDATE}"
+STABLEVERSION="2.4.21"
 
 # Miscellaneous
-S=${WORKDIR}/linux-${OKV}
-PROVIDE="virtual/linux-sources"
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+
+# Eclass Stuff
+ETYPE="sources"
+inherit kernel
 
 
 # INCLUDED:
@@ -30,8 +29,10 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${STABLEVERSION}.tar.bz2
 		mirror://kernel/linux/kernel/v2.4/testing/patch-${OKV}.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
 HOMEPAGE="http://www.kernel.org   http://www.linux-mips.org/"
-KEYWORDS="-* ~mips"
 SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-* ~mips"
+
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.23_rc2.ebuild b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.23_rc2.ebuild
new file mode 100644
index 000000000000..8c9ec1100d54
--- /dev/null
+++ b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.23_rc2.ebuild
@@ -0,0 +1,58 @@
+# 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-prepatch-sources/mips-prepatch-sources-2.4.23_rc2.ebuild,v 1.1 2003/11/21 00:40:47 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20031120"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}-${CVSDATE}"
+STABLEVERSION="2.4.22"
+
+# Miscellaneous
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+
+# Eclass Stuff
+ETYPE="sources"
+inherit kernel
+
+
+# INCLUDED:
+# 1) linux stable sources from kernel.org
+# 2) patch to latest linux prepatch sources
+# 3) linux-mips.org CVS snapshot diff from 20 Nov 2003
+# 4) patch to fix Makefile(s) to pass appropriate CFLAGS
+
+DESCRIPTION="Linux-Mips CVS pre-patch sources for MIPS-based machines"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${STABLEVERSION}.tar.bz2
+		mirror://kernel/linux/kernel/v2.4/testing/patch-${OKV}.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
+HOMEPAGE="http://www.kernel.org   http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-* ~mips"
+
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/linux-${STABLEVERSION} ${S}
+	cd ${S}
+
+	# Update the vanilla sources with prepatch diff
+	einfo ">>> Patching linux-${STABLEVERSION} to linux-${OKV} ..."
+	epatch ${WORKDIR}/patch-${OKV}
+	echo -e ""
+
+	# Update the vanilla prepatch sources with linux-mips CVS changes
+	einfo ">>> Patching linux-${OKV} to linux-${OKV}${EXTRAVERSION} ..."
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
+	echo -e ""
+
+	# Patch arch/mips/Makefile & arch/mips64/Makefile
+	einfo ">>> Patching Makefile(s) ..."
+	epatch ${FILESDIR}/mips-gcc-makefile-fix-${CVSDATE}.patch
+	echo -e ""
+
+	kernel_universal_unpack
+}