version bump

10 files changed, 67 insertions, 192 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 219a287507e5..9a350817b524 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.112 2004/01/16 22:33:35 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.113 2004/01/20 18:55:44 iggy Exp $
+
+*mm-sources-2.6.1-r5 (20 Jan 2004)
+
+  20 Jan 2004; Brian Jackson <iggy@gentoo.org> mm-sources-2.6.1-r1.ebuild,
+  mm-sources-2.6.1-r2.ebuild, mm-sources-2.6.1-r4.ebuild,
+  mm-sources-2.6.1-r5.ebuild, files/mm4-export-dnotify_parent.diff,
+  files/mm4-fix-bw-qcam-typo.diff:
+  version bump
 
   16 Jan 2004; Brian Jackson <iggy@gentoo.org> mm-sources-2.6.1-r4.ebuild:
   added an ewarn about the new cpu config options
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index bf9463f72f9e..662ceb3f9f01 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,13 +1,13 @@
 MD5 a339643c4ffce6d70a39224f9717d63b mm-sources-2.6.1-r3.ebuild 2858
-MD5 53d2619b8850f77053ed2afc776b98b9 mm-sources-2.6.1-r2.ebuild 2858
-MD5 0e068e42679f95dbc3b780be299315f2 mm-sources-2.6.1-r4.ebuild 1199
-MD5 bbb3ebd2f964f7dc9967b9a3ebb65125 mm-sources-2.6.1-r1.ebuild 2854
-MD5 5a46a91fddc5ff5f40e0d6476f5d5750 ChangeLog 19163
+MD5 acb47b99aff661aa14cd95a47229c2ba mm-sources-2.6.1-r5.ebuild 1199
+MD5 02dbf66829bbfa6eae1628c5921ba671 mm-sources-2.6.1-r4.ebuild 1280
+MD5 41fbf1ebf045c19bb1666324827182ed ChangeLog 19451
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
-MD5 c6ddb08fee22dd0196da6bf8af5cd401 files/digest-mm-sources-2.6.1-r1 125
-MD5 7c518bc2b7220fb3073feb31238e6462 files/digest-mm-sources-2.6.1-r2 125
 MD5 5b48e7ddf2616741bf48132962be42c5 files/digest-mm-sources-2.6.1-r3 125
 MD5 fcced8f5bfbfb4e3414812da6365823f files/digest-mm-sources-2.6.1-r4 125
+MD5 a73876ed21d57639ce792fed04cc7f48 files/digest-mm-sources-2.6.1-r5 125
 MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/mm-sources.CAN-2003-0985.patch 414
+MD5 c234ba27a872115d41c20ca31610bfc5 files/mm4-export-dnotify_parent.diff 295
 MD5 c57fb303f389d1b448d8c5ffa004b58f files/apic.patch 533
 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
+MD5 a430a342bc052e9c8db70be3ce7e35a6 files/mm4-fix-bw-qcam-typo.diff 437
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r2
deleted file mode 100644
index 19afcccc8dbc..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
-MD5 f8339fffd606ad187e62e7f0c59a70dc 2.6.1-mm2.bz2 1480954
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r5
index 3f7be2bd0d7a..46a0e35ec225 100644
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r1
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r5
@@ -1,2 +1,2 @@
 MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
-MD5 4fd52fe17bec8ce5b6609a7d615b7cce 2.6.1-mm1.bz2 1259796
+MD5 182711358fe120bb3a68712f1cc4b092 2.6.1-mm5.bz2 2670600
diff --git a/sys-kernel/mm-sources/files/mm4-export-dnotify_parent.diff b/sys-kernel/mm-sources/files/mm4-export-dnotify_parent.diff
new file mode 100644
index 000000000000..7e964e066f0c
--- /dev/null
+++ b/sys-kernel/mm-sources/files/mm4-export-dnotify_parent.diff
@@ -0,0 +1,11 @@
+--- linux-2.6.1-mm4/fs/dnotify.c.orig	2004-01-16 17:46:40.844370408 +0100
++++ linux-2.6.1-mm4/fs/dnotify.c	2004-01-16 17:48:46.045336968 +0100
+@@ -166,6 +166,8 @@
+ 	}
+ }
+ 
++EXPORT_SYMBOL(dnotify_parent);
++
+ static int __init dnotify_init(void)
+ {
+ 	dn_cache = kmem_cache_create("dnotify_cache",
diff --git a/sys-kernel/mm-sources/files/mm4-fix-bw-qcam-typo.diff b/sys-kernel/mm-sources/files/mm4-fix-bw-qcam-typo.diff
new file mode 100644
index 000000000000..463f847fbbe1
--- /dev/null
+++ b/sys-kernel/mm-sources/files/mm4-fix-bw-qcam-typo.diff
@@ -0,0 +1,11 @@
+--- linux-2.6.1-mm4/drivers/media/video/bw-qcam.c.orig	2004-01-16 16:42:27.178216712 +0100
++++ linux-2.6.1-mm4/drivers/media/video/bw-qcam.c	2004-01-16 16:42:51.534513992 +0100
+@@ -963,7 +963,7 @@
+ #ifdef MODULE
+ 	int n;
+ 
+-	if (parport[0] && strcnmp(parport[0], "auto", 4) != 0) {
++	if (parport[0] && strncmp(parport[0], "auto", 4) != 0) {
+ 		/* user gave parport parameters */
+ 		for(n=0; parport[n] && n<MAX_CAMS; n++){
+ 			char *ep;
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild
deleted file mode 100644
index 2ba715ecd5d6..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 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.1-r1.ebuild,v 1.2 2004/01/10 17:28:39 lostlogic Exp $
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=2.6.1
-
-EXTRAVERSION="`echo ${PKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${PV/_/-}-${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-${OKV}.tar.bz2
-	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
-KEYWORDS="x86"
-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}
-
-}
-
-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 "and you have to compile it in now, or else you will get"
-	ewarn "errors when trying to open a pty. The options are:"
-	ewarn "Device Drivers -> Character devices -> Unix98 PTY support and"
-	ewarn "File systems -> Pseudo filesystems -> /dev/pts 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
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r2.ebuild
deleted file mode 100644
index 8fb7de17074c..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.1-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 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.1-r2.ebuild,v 1.2 2004/01/12 15:38:12 tseng Exp $
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=2.6.1
-
-EXTRAVERSION="`echo ${PKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${PV/_/-}-${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-${OKV}.tar.bz2
-	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
-KEYWORDS="~x86"
-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}
-
-}
-
-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 "and you have to compile it in now, or else you will get"
-	ewarn "errors when trying to open a pty. The options are:"
-	ewarn "Device Drivers -> Character devices -> Unix98 PTY support and"
-	ewarn "File systems -> Pseudo filesystems -> /dev/pts 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.linux.org.uk/~davej/docs/post-halloween-2.6.txt"
-	einfo "for more info about the development series."
-	echo
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild
index ef214a8f9018..6b1f205e7940 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 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.1-r4.ebuild,v 1.2 2004/01/16 22:33:35 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild,v 1.3 2004/01/20 18:55:44 iggy Exp $
 
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/mm4-export-dnotify_parent.diff ${FILESDIR}/mm4-fix-bw-qcam-typo.diff"
 ETYPE="sources"
 inherit kernel-2
 detect_version
 KV=${KV/-r/}
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
 K_NOSETEXTRAVERSION="don't_set_it"
 RESTRICT="nomirror"
 S=${WORKDIR}/linux-${KV}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r5.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r5.ebuild
new file mode 100644
index 000000000000..aa10f32578b3
--- /dev/null
+++ b/sys-kernel/mm-sources/mm-sources-2.6.1-r5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2004 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.1-r5.ebuild,v 1.1 2004/01/20 18:55:44 iggy Exp $
+
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+KV=${KV/-r/}
+K_NOSETEXTRAVERSION="don't_set_it"
+RESTRICT="nomirror"
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+	mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
+KEYWORDS="x86 ~amd64 ~ia64 -*"
+SLOT="${KV}"
+
+K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
+existing bug. Only create a new bug if you have not found one that matches
+your issue. It is best to do an advanced search as the initial search has a
+very low yield. Please assign your bugs to x86-kernel@gentoo.org.
+Please read the ChangeLog and associated docs for more information."
+
+K_EXTRAEWARN="NOTE: processor selection has changed. You'll need to make sure you
+select the proper cpu type during make oldconfig"