Adding ebuilds for 2.4.26 from linux-mips CVS. Also some typo fixes in the other ebuilds.

9 files changed, 116 insertions, 10 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index bff53b705943..b3c1c3c6eaff 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.34 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.35 2004/04/16 06:03:36 kumba Exp $
 
+*mips-sources-2.4.26 (16 Apr 2004)
+
+  16 Apr 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r8.ebuild,
+  mips-sources-2.4.22-r11.ebuild, mips-sources-2.4.23-r7.ebuild,
+  mips-sources-2.4.25-r1.ebuild, mips-sources-2.4.26.ebuild,
+  files/mipscvs-2.4.26-makefile-fix.patch:
+  Adding ebuilds for 2.4.26 from linux-mips CVS. Also some typo fixes in the
+  other ebuilds.
+
+*mips-sources-2.6.5 (15 Apr 2004)
 *mips-sources-2.6.4-r1 (15 Apr 2004)
 
   15 Apr 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r7.ebuild,
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 1f7b75b9fb3a..82d03ef5be1e 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,12 +1,13 @@
-MD5 4228012f21345a42eff9e11cef6fd7f2 ChangeLog 11593
+MD5 7706124cf38028935068c0dfe62d5629 ChangeLog 12006
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 f8d53f985391c15598188d0fd5fdb0f3 mips-sources-2.4.21-r8.ebuild 2566
-MD5 2e7a7fd0f09bec56a3e13ca9175e0d47 mips-sources-2.4.22-r11.ebuild 2401
-MD5 0e3e519678394ce42f93a27118fa326e mips-sources-2.4.23-r7.ebuild 3187
-MD5 72730ea7694acf1706dc459f869f9f43 mips-sources-2.4.25-r1.ebuild 2232
+MD5 ee21e0f06516f58407478dfb23f15b1b mips-sources-2.4.21-r8.ebuild 2682
+MD5 825049b187af0f0dd6f603852976c718 mips-sources-2.4.22-r11.ebuild 2517
+MD5 5a82bfc756ad2e109392a5615cac108e mips-sources-2.4.23-r7.ebuild 3303
+MD5 81f1b5e629cf13683acdd54465e8503c mips-sources-2.4.25-r1.ebuild 2348
 MD5 d4300e458ff1e08a6f2248c31d6ee537 mips-sources-2.6.3-r3.ebuild 3513
 MD5 a4626d2d46c2d3a4424fb10448518ea6 mips-sources-2.6.4-r1.ebuild 3510
 MD5 11ae356674a257cc39ef08621118d13b mips-sources-2.6.5.ebuild 3445
+MD5 34ee8aeb74a1a61272b38739cc991ab5 mips-sources-2.4.26.ebuild 1944
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/CAN-2003-0961-do_brk.patch 242
 MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/CAN-2003-0985-mremap.patch 414
 MD5 147fec50180ad91b6260fc7201dcb90f files/CAN-2004-0010-ncpfs.patch 6050
@@ -34,3 +35,5 @@ MD5 de2c00e2df9c2bf74e5c090ade2c23b0 files/digest-mips-sources-2.4.25-r1 217
 MD5 214c73bd9aa640a54b52196c8f2c5433 files/digest-mips-sources-2.6.3-r3 299
 MD5 05353361dc9d89699a648d1db065d7f9 files/digest-mips-sources-2.6.4-r1 299
 MD5 87d2e9f2c22fddaac6143dd399d51880 files/digest-mips-sources-2.6.5 299
+MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.26-makefile-fix.patch 428
+MD5 cd121be6819ea6262be10f37000b85c1 files/digest-mips-sources-2.4.26 218
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26
new file mode 100644
index 000000000000..56fe0e2954a4
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26
@@ -0,0 +1,3 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 020f2e4ce6cf97c40365440b7a9de0bf mipscvs-2.4.26-20040415.diff.bz2 194397
+MD5 3164a83e10562b34fa250fd9b892b5b2 cobalt-patches-24xx-1.1.tar.bz2 3831
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.26-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.26-makefile-fix.patch
new file mode 100644
index 000000000000..462c575b57ac
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.4.26-makefile-fix.patch
@@ -0,0 +1,12 @@
+--- arch/mips64/Makefile.orig	2004-02-22 16:38:07.553362088 -0500
++++ arch/mips64/Makefile	2004-02-22 16:41:35.328775424 -0500
+@@ -342,7 +342,7 @@ endif
+ # ELF files from 32-bit files by conversion.
+ #
+ ifdef CONFIG_BOOT_ELF64
+-GCCFLAGS += -Wa,-32 $(call check_gas,-Wa$(comma)-mgp64,)
++GCCFLAGS += -Wa,-mabi=o64 $(call check_gas,-Wa$(comma)-mgp64,)
+ LINKFLAGS += -T arch/mips64/ld.script.elf32
+ #AS += -64
+ #LD += -m elf64bmip
+
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild
index 78dc0de67fc6..4938430a0c2f 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
 
 
 # Version Data
@@ -80,6 +80,9 @@ src_unpack() {
 			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.4.22-r11.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild
index ec0266f8a0ac..9bfc0ef6937a 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
 
 
 # Version Data
@@ -76,6 +76,9 @@ src_unpack() {
 			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.4.23-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild
index 8927bfc11d4c..0f8552ef4e46 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
 
 
 # Version Data
@@ -92,6 +92,9 @@ src_unpack() {
 			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.4.25-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild
index 53e9b10a02b2..54b8a7ad3a75 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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-r1.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
 
 
 # Version Data
@@ -67,6 +67,9 @@ src_unpack() {
 			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.4.26.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26.ebuild
new file mode 100644
index 000000000000..9324db5355a8
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.1 2004/04/16 06:03:36 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040415"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+COBALTPATCHVER="1.1"
+
+# 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 28 Nov 2003
+# 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
+
+	# 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
+}