Added patches to allow kernels to work properly on cobalt systems

8 files changed, 222 insertions, 2 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 8688234125e4..3c08b9c0422f 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.22 2004/01/19 08:29:43 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.23 2004/02/01 10:32:30 kumba Exp $
+
+*mips-sources-2.4.22-r8 (01 Feb 2004)
+
+  01 Feb 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r5.ebuild,
+  mips-sources-2.4.22-r8.ebuild, mips-sources-2.4.23-r4.ebuild:
+  Added patches to allow kernels to work properly on cobalt systems
 
 *mips-sources-2.4.23-r3 (19 Jan 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index bff17c10162d..ad42ffb73501 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,9 +1,15 @@
-MD5 5f91f391d3e6c7a69477ad5ddbade2b9 ChangeLog 6400
+MD5 5d2fea810280a1150984ac0eef6f00b5 ChangeLog 6651
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
 MD5 5a31123b52f6c5449127eaed8033786e mips-sources-2.4.22-r7.ebuild 1793
 MD5 f6dbc2ee8201ee63b6fbeb8eb3394374 mips-sources-2.4.23-r3.ebuild 2210
+MD5 4eb2abc65e47b9c626f9d57a01b9bd0c mips-sources-2.4.22-r8.ebuild 1980
 MD5 23b912302aea43054894e182cec02a87 mips-sources-2.4.21-r4.ebuild 1557
+MD5 e427d6b2283d17187086d025eebdb43f mips-sources-2.4.21-r5.ebuild 1744
+MD5 43b749537cdda009fd3d599d6863076e mips-sources-2.4.23-r4.ebuild 2396
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 4f20f6878d4223d3f443ee92b01e1061 files/digest-mips-sources-2.4.22-r8 213
+MD5 96b7bafa413779c26bcde0d06e93e9c6 files/digest-mips-sources-2.4.23-r4 421
+MD5 0ebda2bfc3ea952048f2c1e0ca2d8a45 files/digest-mips-sources-2.4.21-r5 214
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
 MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-makefile-fix.patch 1344
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r5
new file mode 100644
index 000000000000..78cf8a619821
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r5
@@ -0,0 +1,3 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 aea17fa0a6fc0bef9847b8713d4c3923 mipscvs-2.4.21-20030803.diff.bz2 1011871
+MD5 e8590fd851dc563e2e5d57478198c99b cobalt-patches-2.4.tar.bz2 5899
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r8
new file mode 100644
index 000000000000..659ceba724aa
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r8
@@ -0,0 +1,3 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 d82efc4684e5b4f1b64092d9adaac7e8 mipscvs-2.4.22-20031015.diff.bz2 239716
+MD5 e8590fd851dc563e2e5d57478198c99b cobalt-patches-2.4.tar.bz2 5899
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r4
new file mode 100644
index 000000000000..c65a4cee19a1
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r4
@@ -0,0 +1,6 @@
+MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
+MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
+MD5 e8590fd851dc563e2e5d57478198c99b cobalt-patches-2.4.tar.bz2 5899
+MD5 2230e5482efd34a9bae1cc05cd9d3b2c xfs-2.4.23-split-only.bz2 652627
+MD5 0723db65569d1eaa5de4584e5b10fe87 xfs-2.4.23-split-kernel.bz2 11561
+MD5 879b21c543189704146d9a3ff99af3c2 xfs-2.4.23-split-acl.bz2 2290
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r5.ebuild
new file mode 100644
index 000000000000..28cace043f48
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r5.ebuild
@@ -0,0 +1,60 @@
+# 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-r5.ebuild,v 1.1 2004/02/01 10:32:30 kumba Exp $
+
+ETYPE="sources"
+inherit kernel
+
+OKV=${PV/_/-}
+CVSDATE=20030803
+S=${WORKDIR}/linux-${OKV}
+EXTRAVERSION=-mipscvs-${CVSDATE}
+KV="${OKV}${EXTRAVERSION}"
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 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"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/cobalt-patches-2.4.tar.bz2"
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-* ~mips"
+
+src_unpack() {
+	unpack ${A}
+	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
+
+	# Big Endian Fix (Fix in headers for big-endian machines)
+	epatch ${FILESDIR}/bigendian-byteorder-fix.patch
+
+	# do_brk fix (Fixes exploit that hit several debian servers)
+	epatch ${FILESDIR}/do_brk_fix.patch
+
+	# mremap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/mremap-fix-try2.patch
+
+	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
+	epatch ${FILESDIR}/rtc-fixes.patch
+
+	# Cobalt Patches
+	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+		for x in ${WORKDIR}/cobalt-patches-2.4/*.patch; do
+			epatch ${x}
+		done
+	fi
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r8.ebuild
new file mode 100644
index 000000000000..2a810c074f1f
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r8.ebuild
@@ -0,0 +1,65 @@
+# 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-r8.ebuild,v 1.1 2004/02/01 10:32:30 kumba Exp $
+
+ETYPE="sources"
+inherit kernel
+
+OKV=${PV/_/-}
+CVSDATE=20031015
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+EXTRAVERSION=-mipscvs-${CVSDATE}
+KV="${OKV}${EXTRAVERSION}"
+
+inherit eutils
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 15 Oct 2003
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
+# 4) patch to tweak arch/mips64/Makefile to pass -Wa,-mabi=o64 instead of -Wa,-32
+
+
+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-2.4.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
+
+	# Patch arch/mips64/Makefile to pass -Wa,mabi=o64 (Allows building of mips64 kernels)
+	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-mips64-tweak.patch
+
+	# do_brk fix (Fixes exploit that hit several debian servers)
+	epatch ${FILESDIR}/do_brk_fix.patch
+
+	# mremap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/mremap-fix-try2.patch
+
+	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
+	epatch ${FILESDIR}/rtc-fixes.patch
+
+	# Cobalt Patches
+	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+		for x in ${WORKDIR}/cobalt-patches-2.4/*.patch; do
+			epatch ${x}
+		done
+	fi
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r4.ebuild
new file mode 100644
index 000000000000..5d1256b53f95
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-r4.ebuild
@@ -0,0 +1,71 @@
+# 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-r4.ebuild,v 1.1 2004/02/01 10:32:30 kumba Exp $
+
+ETYPE="sources"
+inherit kernel
+
+OKV=${PV/_/-}
+CVSDATE=20031128
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+EXTRAVERSION=-mipscvs-${CVSDATE}
+KV="${OKV}${EXTRAVERSION}"
+
+inherit eutils
+
+# What's in this kernel?
+
+# 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 and 
+#	tweaks arch/mips64/Makefile to pass -Wa,-mabi=o64 instead of -Wa,-32
+# 4) XFS Patches for basic XFS support (with ACL, but no DMAPI)
+
+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-2.4.tar.bz2
+		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-only.bz2
+		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-kernel.bz2
+		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-acl.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
+
+	# mremap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/mremap-fix-try2.patch
+
+	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
+	epatch ${FILESDIR}/rtc-fixes.patch
+
+	# XFS Patches
+	# We don't use epatch here because something funny is messed up in the XFS patches,
+	# thus while they apply, they don't apply properly
+	ebegin "Applying XFS Patchset"
+	cat ${WORKDIR}/xfs-${PV}-split-only | patch -p1 2>&1 >/dev/null
+	cat ${WORKDIR}/xfs-${PV}-split-kernel | patch -p1 2>&1 >/dev/null
+	cat ${WORKDIR}/xfs-${PV}-split-acl | patch -p1 2>&1 >/dev/null
+	eend
+
+	# Cobalt Patches
+	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+		for x in ${WORKDIR}/cobalt-patches-2.4/*.patch; do
+			epatch ${x}
+		done
+	fi
+
+	kernel_universal_unpack
+}