snapshot dated 20031226 from linux-mips CVS of a 2.4.24-pre2 kernel

5 files changed, 81 insertions, 3 deletions

diff --git a/sys-kernel/mips-prepatch-sources/ChangeLog b/sys-kernel/mips-prepatch-sources/ChangeLog
index 514c9996d971..6c8f5568c19f 100644
--- a/sys-kernel/mips-prepatch-sources/ChangeLog
+++ b/sys-kernel/mips-prepatch-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/mips-prepatch-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/ChangeLog,v 1.4 2003/11/21 00:40:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/ChangeLog,v 1.5 2003/12/29 08:52:08 kumba Exp $
+
+*mips-prepatch-sources-2.4.24_pre2 (29 Dec 2003)
+
+  29 Dec 2003; Joshua Kinard <kumba@gentoo.org>
+  mips-prepatch-sources-2.4.24_pre2.ebuild:
+  snapshot dated 20031226 from linux-mips CVS of a 2.4.24-pre2 kernel
 
 *mips-prepatch-sources-2.4.23_rc2 (20 Nov 2003)
 
diff --git a/sys-kernel/mips-prepatch-sources/Manifest b/sys-kernel/mips-prepatch-sources/Manifest
index 967719c7fc94..9b8fd455f23a 100644
--- a/sys-kernel/mips-prepatch-sources/Manifest
+++ b/sys-kernel/mips-prepatch-sources/Manifest
@@ -1,8 +1,8 @@
-MD5 5b394a14a88c5189ca74bfe79ed527d0 ChangeLog 1305
+MD5 aba84dbafb0717724ae63a31928acbbf ChangeLog 1305
 MD5 0bfb6b59036d1fe3e8075bc8879e772b metadata.xml 412
 MD5 86aa0e3b80db6f8d8509c6b74c57f2a6 mips-prepatch-sources-2.4.22_rc2-r1.ebuild 1718
 MD5 4f143165664f9fca9bf0c72bff206ce9 mips-prepatch-sources-2.4.23_rc2.ebuild 1725
-MD5 bb5f1fdf26f2af54d24f8c8288c1b076 mips-prepatch-sources-2.4.24_pre2.ebuild 1755
+MD5 c8518aa07d3c0527566b5165889b738a mips-prepatch-sources-2.4.24_pre2.ebuild 1756
 MD5 7383fb7245357cea3b46d07e372fc89a files/digest-mips-prepatch-sources-2.4.22_rc2-r1 215
 MD5 555b06cda3095a1ad41f353fee4f75a7 files/digest-mips-prepatch-sources-2.4.23_rc2 214
 MD5 b73a606d05e184a8af27c8f9b7a9c9ca files/mips-gcc-makefile-fix-20030813.patch 906
diff --git a/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.24_pre2 b/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.24_pre2
new file mode 100644
index 000000000000..cbc68fe8291e
--- /dev/null
+++ b/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.24_pre2
@@ -0,0 +1,3 @@
+MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
+MD5 84ffd748f0c8be6c6d9a39e1e4233f38 patch-2.4.24-pre2.bz2 1262362
+MD5 4892762f4dfd836c99b61aab19b8b120 mipscvs-2.4.24-pre2-20031226.diff.bz2 66298
diff --git a/sys-kernel/mips-prepatch-sources/files/mips-gcc-makefile-fix-20031226.patch b/sys-kernel/mips-prepatch-sources/files/mips-gcc-makefile-fix-20031226.patch
new file mode 100644
index 000000000000..b5e44a31ee2e
--- /dev/null
+++ b/sys-kernel/mips-prepatch-sources/files/mips-gcc-makefile-fix-20031226.patch
@@ -0,0 +1,11 @@
+--- arch/mips64/Makefile.orig	2003-12-26 05:43:13.152689760 -0500
++++ arch/mips64/Makefile	2003-12-26 05:47:06.650192744 -0500
+@@ -334,7 +334,7 @@ endif
+ # convert to ECOFF using elf2ecoff.
+ #
+ ifdef CONFIG_BOOT_ELF32
+-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
+ endif
+ #
diff --git a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.24_pre2.ebuild b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.24_pre2.ebuild
new file mode 100644
index 000000000000..fcbccdbed998
--- /dev/null
+++ b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.24_pre2.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.24_pre2.ebuild,v 1.1 2003/12/29 08:52:08 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20031226"
+EXTRAVERSION="$(echo "${OKV}" | cut -d- -f2)-mipscvs-${CVSDATE}"
+KV="${OKV}-${CVSDATE}"
+STABLEVERSION="2.4.23"
+
+# 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
+}