Version bump.

5 files changed, 105 insertions, 6 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 3f88430aaf2e..d016623d58ae 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.103 2004/01/02 23:34:06 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.104 2004/01/05 21:31:55 plasmaroo Exp $
+
+  05 Jan 2004; <plasmaroo@gentoo.org> mm-sources-2.6.1_rc1-r2.ebuild:
+  Version bump.
 
 *mm-sources-2.6.1_rc1-r1 (02 Jan 2004)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index da950d4bc66e..291ef7efc5ab 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 9ac891adbb25fc369501aa680af203a8 ChangeLog 17825
-MD5 76582177d3480c6d00675c117123869c mm-sources-2.6.1_rc1-r2.ebuild 3014
+MD5 f0f8d6115b7bfd9e35ac4e19d6d35207 ChangeLog 17825
+MD5 cc71764b6f551f7875b416e07ef4b9a5 mm-sources-2.6.1_rc1-r2.ebuild 3014
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
-MD5 76582177d3480c6d00675c117123869c mm-sources-2.6.1_rc1-r1.ebuild 3014
+MD5 4581f789eb724ea67cc5521f64efe282 mm-sources-2.6.1_rc1-r1.ebuild 3014
 MD5 c99ef4fc00b590da7296d8e5a22c21a2 mm-sources-2.6.0-r1.ebuild 2992
 MD5 29b1283c035365d2a544935f2afbcfd5 mm-sources-2.6.0-r2.ebuild 2988
 MD5 1ad49f2d7d99c775522b3e7b06f4e9de files/digest-mm-sources-2.6.0-r2 125
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r2
new file mode 100644
index 000000000000..82ac7321ab3d
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r2
@@ -0,0 +1,3 @@
+MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
+MD5 c3d3c57560c53b86709477f38621d9d5 patch-2.6.1-rc1.bz2 726490
+MD5 ef2ef381b81046cf0ece148959ab1ba2 2.6.1-rc1-mm2.bz2 871432
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild
index 9f8cceb30c0f..050b33168cfc 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-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/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild,v 1.2 2004/01/05 08:44:55 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild,v 1.3 2004/01/05 21:31:55 plasmaroo Exp $
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -25,7 +25,7 @@ inherit eutils
 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/v2.6/testing/patch-${PKV}.bz2
-	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
+	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PKV}/${KV}/${KV}.bz2"
 KEYWORDS="~x86"
 RDEPEND="sys-apps/module-init-tools"
 SLOT=${KV}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild
new file mode 100644
index 000000000000..339bca838fcb
--- /dev/null
+++ b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild
@@ -0,0 +1,93 @@
+# 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_rc1-r2.ebuild,v 1.1 2004/01/05 21:31:55 plasmaroo Exp $
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+
+OKV=2.6.0
+PKV=${PV/_/-}
+
+EXTRAVERSION="`echo ${OKV}-${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/v2.6/testing/patch-${PKV}.bz2
+	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PKV}/${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}/patch-${PKV}.bz2 | patch -p1 || die "2.6.1-rc1 patch failed!"
+	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
+}