New CVS snapshot from 20030825 for MIPS

7 files changed, 98 insertions, 9 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index 17e7dcfd34bf..632e47970938 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for sys-kernel/mips-headers
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.5 2003/08/05 02:28:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.6 2003/08/26 07:35:10 kumba Exp $
 
 
+*mips-headers-2.4.22-r1 (26 Aug 2003)
+
+  26 Aug 2003; Joshua Kinard <kumba@gentoo.org> mips-headers-2.4.22-r1.ebuild:
+  New Snapshot of linux-mips CVS, dated 20030825 for Linux-headers purposes.
+
 *mips-headers-2.4.21-r2 (04 Aug 2003)
 
   04 Aug 2003; Joshua Kinard <kumba@gentoo.org> mips-headers-2.4.21-r2.ebuild,
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index 748c448e0127..ff4e40b6bb74 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,7 +1,7 @@
-MD5 5baeebc2518b8f66a9f0732736fd83ce ChangeLog 1594
-MD5 eabf30cf39cfda42872f94cca55d64cc mips-headers-2.4.21-r1.ebuild 1304
-MD5 a0738651b6670e5e0a5be2274fdb9782 mips-headers-2.4.21-r2.ebuild 1128
-MD5 6f1852f403b581f2105536ca6eda18d9 mips-headers-2.4.22-r1.ebuild 1141
+MD5 474e80b236ee222e90e7aa217fce98da ChangeLog 1594
+MD5 3afa92ebb06f56691649baa49cf9cee8 mips-headers-2.4.21-r1.ebuild 1304
+MD5 70ab0cb0e813300d202894f4aafc9546 mips-headers-2.4.21-r2.ebuild 1128
+MD5 928a7d45f033a1b21f7afad7ea1f2c61 mips-headers-2.4.22-r1.ebuild 1141
 MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r2 145
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.22-r1 b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.22-r1
new file mode 100644
index 000000000000..d6bc27d26c18
--- /dev/null
+++ b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.22-r1
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 0db06b0c2fcc7cdcb9993cd0095e153e mipscvs-2.4.22-20030825.diff.bz2 132364
diff --git a/sys-kernel/mips-headers/files/mipscvs-2.4.22-20030825-makefile-fix.patch b/sys-kernel/mips-headers/files/mipscvs-2.4.22-20030825-makefile-fix.patch
new file mode 100644
index 000000000000..a3f009e0dc86
--- /dev/null
+++ b/sys-kernel/mips-headers/files/mipscvs-2.4.22-20030825-makefile-fix.patch
@@ -0,0 +1,43 @@
+--- arch/mips/Makefile.orig	2003-08-25 22:50:20.000000000 -0400
++++ arch/mips/Makefile	2003-08-25 22:50:57.000000000 -0400
+@@ -72,7 +72,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
+@@ -84,14 +84,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-08-25 22:52:01.000000000 -0400
++++ arch/mips64/Makefile	2003-08-25 22:52:42.000000000 -0400
+@@ -55,10 +55,10 @@ 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
+ GCCFLAGS	+= -mcpu=r8000 -mips3 -mmad
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
index 4467bcc881d3..4b57a2fd90f3 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2003/08/05 02:28:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild,v 1.3 2003/08/26 07:35:10 kumba Exp $
 
 
 ETYPE="headers"
@@ -19,7 +19,7 @@ EXTRAVERSION=-mipscvs-${CVSDATE}
 # 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"
+DESCRIPTION="Linux-Mips CVS headers 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/" 
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
index 66a4abae0f5b..1f75a90d13f9 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2003/08/04 05:56:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild,v 1.2 2003/08/26 07:35:10 kumba Exp $
 
 
 ETYPE="headers"
@@ -18,7 +18,7 @@ EXTRAVERSION=-mipscvs-${CVSDATE}
 # 2) linux-mips.org CVS snapshot diff from 03 Aug 2003
 # 3) patch to fix arch/mips/Makefile to pass appropriate CFLAGS
 
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines"
+DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
 HOMEPAGE="http://www.linux-mips.org/" 
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
new file mode 100644
index 000000000000..0b9345fb6e52
--- /dev/null
+++ b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
@@ -0,0 +1,39 @@
+# 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.22-r1.ebuild,v 1.1 2003/08/26 07:35:10 kumba Exp $
+
+
+ETYPE="headers"
+inherit kernel
+OKV=${PV/_/-}
+CVSDATE=20030825
+S=${WORKDIR}/linux-${OKV}
+PROVIDE="virtual/os-headers"
+EXTRAVERSION=-mipscvs-${CVSDATE}
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 25 Aug 2003
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
+
+DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
+HOMEPAGE="http://www.linux-mips.org/" 
+KEYWORDS="-* ~mips"
+SLOT="${OKV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Update the vanilla sources with linux-mips CVS changes
+	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
+
+	# Patch arch/mips/Makefile for gcc	
+	cat ${FILESDIR}/mipscvs-${OKV}-${CVSDATE}-makefile-fix.patch | patch -p0
+
+	kernel_universal_unpack
+}