Version bump and files/ cleanup.

6 files changed, 95 insertions, 53 deletions

diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 4fcc3c7526ab..901644e6b93e 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,15 +1,12 @@
-MD5 74097cbd7f684f9beb1f6eca46424fe0 ChangeLog 17020
+MD5 dc36d170dc3a3ce036b2945ada103e96 ChangeLog 17264
 MD5 62587df4b49506468241ec3c9415b010 metadata.xml 435
-MD5 746f835805b5854f6f224ea97117428e mm-sources-2.6.0-r1.ebuild 2995
+MD5 0edac4f2505055557c8a335081ab5a53 mm-sources-2.6.0-r1.ebuild 2988
 MD5 4c74c994b40877995887f661839d511c mm-sources-2.6.0_beta10-r1.ebuild 3011
 MD5 795da7cc15e11462555565b3f23c4d1b mm-sources-2.6.0_beta9-r5.ebuild 3010
 MD5 aef70229deac69484ad99f7dcbc27114 mm-sources-2.6.0_beta11-r1.ebuild 3113
 MD5 c57fb303f389d1b448d8c5ffa004b58f files/apic.patch 533
-MD5 ed6f583c9a528322461a432cf8f0409c files/2.6.0-test5-mm4-devfsd-fix 594
-MD5 b3e6c57a381a41e3bdc287b0be80b603 files/2.6.0-test9-mm4-alsa-crash.patch 375
 MD5 2a430547eedc1e5e31db3903fe1f5e8a files/digest-mm-sources-2.6.0_beta10-r1 138
 MD5 01a838b34918f69ee08e3674c2b3c6e7 files/digest-mm-sources-2.6.0-r1 124
 MD5 2456d3e9950c102b25cd15d03b1d5f90 files/digest-mm-sources-2.6.0_beta9-r5 136
-MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
 MD5 e9846e2e40bb7cd35237bf3033be6d6b files/digest-mm-sources-2.6.0_beta11-r1 138
diff --git a/sys-kernel/mm-sources/files/2.6.0-test5-mm4-devfsd-fix b/sys-kernel/mm-sources/files/2.6.0-test5-mm4-devfsd-fix
deleted file mode 100644
index f6a831a389f4..000000000000
--- a/sys-kernel/mm-sources/files/2.6.0-test5-mm4-devfsd-fix
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u B5-real32/init/do_mounts.h B5-current/init/do_mounts.h
---- B5-real32/init/do_mounts.h	Sun Sep 21 21:22:33 2003
-+++ B5-current/init/do_mounts.h	Mon Sep 22 09:41:21 2003
-@@ -53,7 +53,7 @@
- static inline u32 bstat(char *name)
- {
- 	struct stat64 stat;
--	if (!sys_stat64(name, &stat) != 0)
-+	if (sys_stat64(name, &stat) != 0)
- 		return 0;
- 	if (!S_ISBLK(stat.st_mode))
- 		return 0;
-@@ -65,7 +65,7 @@
- static inline u32 bstat(char *name)
- {
- 	struct stat stat;
--	if (!sys_newstat(name, &stat) != 0)
-+	if (sys_newstat(name, &stat) != 0)
- 		return 0;
- 	if (!S_ISBLK(stat.st_mode))
- 		return 0;
diff --git a/sys-kernel/mm-sources/files/2.6.0-test9-mm4-alsa-crash.patch b/sys-kernel/mm-sources/files/2.6.0-test9-mm4-alsa-crash.patch
deleted file mode 100644
index 93a16676f186..000000000000
--- a/sys-kernel/mm-sources/files/2.6.0-test9-mm4-alsa-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.6.0-test9-mm4/mm/memory.c.orig	2003-11-21 19:21:44.197223144 +0100
-+++ linux-2.6.0-test9-mm4/mm/memory.c	2003-11-21 19:21:18.596115104 +0100
-@@ -1424,7 +1424,7 @@
- 	pte_t entry;
- 	struct pte_chain *pte_chain;
- 	int sequence = 0;
--	int ret;
-+	int ret = VM_FAULT_MINOR;
- 
- 	if (!vma->vm_ops || !vma->vm_ops->nopage)
- 		return do_anonymous_page(mm, vma, page_table,
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r1
new file mode 100644
index 000000000000..79c0b2a5ab9d
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r1
@@ -0,0 +1,2 @@
+MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
+MD5 c4cdd53c455178478be2adc4b62c800b 2.6.0-mm1.bz2 700665
diff --git a/sys-kernel/mm-sources/files/test5.patch b/sys-kernel/mm-sources/files/test5.patch
deleted file mode 100644
index 38bb627764c2..000000000000
--- a/sys-kernel/mm-sources/files/test5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN linux-2.6.0-test5-orig/mm/slab.c linux-2.6.0-test5/mm/slab.c
---- linux-2.6.0-test5-orig/mm/slab.c	2003-09-10 07:31:56.000000000 -0700
-+++ linux-2.6.0-test5/mm/slab.c	2003-09-10 07:37:26.000000000 -0700
-@@ -2794,11 +2794,13 @@
- 		} else {
- 			kernel_map_pages(virt_to_page(objp), c->objsize/PAGE_SIZE, 1);
- 
-+#if DEBUG
- 			if (c->flags & SLAB_RED_ZONE)
- 				printk("redzone: 0x%lx/0x%lx.\n", *dbg_redzone1(c, objp), *dbg_redzone2(c, objp));
- 
- 			if (c->flags & SLAB_STORE_USER)
- 				printk("Last user: %p.\n", *dbg_userword(c, objp));
-+#endif
- 		}
- 		spin_unlock_irqrestore(&c->spinlock, flags);
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..562180ab967d
--- /dev/null
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild,v 1.1 2003/12/23 21:42:24 tseng Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+
+OKV=${PV}
+
+EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
+	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
+
+KV=${OKV}-${PR/r/mm}
+
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
+
+# What's in this kernel?
+
+# INCLUDED:
+# The development branch of the linux kernel with Andrew Morton's patch
+
+DESCRIPTION="Full sources for the development linux kernel with Andrew Morton's patchset"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV/_beta/-test}.tar.bz2
+mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PV/_beta/-test}/${KV}/${KV}.bz2"
+KEYWORDS="x86 ~ppc"
+RDEPEND="sys-apps/module-init-tools"
+SLOT=${KV}
+PROVIDE="virtual/linux-sources
+		virtual/alsa"
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack linux-${OKV}.tar.bz2
+
+	mv linux-${OKV} linux-${KV}
+	cd ${S}
+	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
+	find . -iname "*~" | xargs rm 2> /dev/null
+
+	# Gentoo Linux uses /boot, so fix 'make install' to work properly
+	# also fix the EXTRAVERSION
+	cd ${S}
+	mv Makefile Makefile.orig
+	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
+		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
+			Makefile.orig >Makefile || die # test, remove me if Makefile ok
+	rm Makefile.orig
+
+	cd  ${S}/Documentation/DocBook
+	sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
+		&& mv Makefile.new Makefile
+	cd ${S}
+
+	#This is needed on > 2.5
+	MY_ARCH=${ARCH}
+	unset ARCH
+	#sometimes we have icky kernel symbols; this seems to get rid of them
+	make mrproper || die "make mrproper died"
+	ARCH=${MY_ARCH}
+
+	# kernel_universal_unpack used to do this... changes in kconfig make
+	# this die now
+	#make include/linux/version.h || die "make include/linux/version.h failed"
+
+}
+pkg_postinst() {
+	if [ ! -e ${ROOT}usr/src/linux-beta ]
+	then
+		ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
+	fi
+
+	ewarn "Please note that ptyfs support has been removed from devfs"
+	ewarn "in the later 2.5.x kernels, and you have to compile it in now,"
+	ewarn "or else you will get errors when trying to open a pty."
+	ewarn "The option is File systems->Pseudo filesystems->/dev/pts"
+	ewarn "filesystem."
+	echo
+	ewarn "Also, note that you must compile in support for"
+	ewarn "input devices (Input device support->Input devices),"
+	ewarn "the virtual terminal (Character Devices->Virtual terminal),"
+	ewarn "vga_console (Graphics Support->Console...->VGA text console)"
+	ewarn "and the vt_console (Character Devices->Support for console...)."
+	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""        ewarn "error."
+	echo
+	einfo "Consult http://www.codemonkey.org.uk/post-halloween-2.5.txt"
+	einfo "for more info about the development series."
+	echo
+}