Version bump, included a patch to fix APIC include breakage. Cleanups.

11 files changed, 25 insertions, 293 deletions

diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index d970b018ca78..120411313d0d 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,19 +1,12 @@
-MD5 d28a4b930b353947a4c1d65b3c9e3a15 ChangeLog 16789
+MD5 74097cbd7f684f9beb1f6eca46424fe0 ChangeLog 17020
 MD5 62587df4b49506468241ec3c9415b010 metadata.xml 435
-MD5 a4fa5e46323f3235eb7866a9568bc52a mm-sources-2.6.0_beta8-r1.ebuild 3010
-MD5 f4c883a89f1c1440869339a008a745cf mm-sources-2.6.0_beta9-r1.ebuild 3010
-MD5 6f14f01d4ac15ea7ff95f94b66c93ae7 mm-sources-2.6.0_beta9-r2.ebuild 3010
-MD5 0ee621803e934c132718f0680a8ae907 mm-sources-2.6.0_beta9-r4.ebuild 3114
 MD5 4c74c994b40877995887f661839d511c mm-sources-2.6.0_beta10-r1.ebuild 3011
 MD5 795da7cc15e11462555565b3f23c4d1b mm-sources-2.6.0_beta9-r5.ebuild 3010
-MD5 4c74c994b40877995887f661839d511c mm-sources-2.6.0_beta11-r1.ebuild 3011
+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 4178d67824f7d4cf5e79343b1abaf9b1 files/digest-mm-sources-2.6.0_beta8-r1 136
-MD5 94fc121371d523e8325787991b2fdc6e files/digest-mm-sources-2.6.0_beta9-r1 136
-MD5 0d5c87030c2a839be9a8d8dbd2799e2d files/digest-mm-sources-2.6.0_beta9-r2 136
-MD5 ed137d558869c8cfabc0244e0be42a6d files/digest-mm-sources-2.6.0_beta9-r4 136
 MD5 2456d3e9950c102b25cd15d03b1d5f90 files/digest-mm-sources-2.6.0_beta9-r5 136
 MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
diff --git a/sys-kernel/mm-sources/files/apic.patch b/sys-kernel/mm-sources/files/apic.patch
new file mode 100644
index 000000000000..c0aeec1fab49
--- /dev/null
+++ b/sys-kernel/mm-sources/files/apic.patch
@@ -0,0 +1,16 @@
+diff -uNr linux-2.6.0-test11/arch/i386/kernel/cpu/intel.c linux-2.6.0-test11-mm1/arch/i386/kernel/cpu/intel.c
+--- linux-2.6.0-test11/arch/i386/kernel/cpu/intel.c	2003-12-17 14:21:29.060115753 +0100
++++ linux-2.6.0-test11-mm1/arch/i386/kernel/cpu/intel.c	2003-12-17 14:10:39.886919748 +0100
+@@ -9,9 +9,11 @@
+ #include <asm/msr.h>
+ #include <asm/uaccess.h>
+ #include <asm/desc.h>
++#include <asm/mpspec.h>
++#include <asm/apic.h>
+ 
+ #include "cpu.h"
+-#include "mach_apic.h"
++#include <mach_apic.h>
+ 
+ #ifdef CONFIG_X86_INTEL_USERCOPY
+ /*
\ No newline at end of file
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta11-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta11-r1
new file mode 100644
index 000000000000..53d27936e461
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta11-r1
@@ -0,0 +1,2 @@
+MD5 06ba5a7eeb924036633a7b33689b2c4f linux-2.6.0-test11.tar.bz2 33243689
+MD5 4625409f598f77c923e096ff3ac83bd4 2.6.0-test11-mm1.bz2 370458
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta8-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta8-r1
deleted file mode 100644
index e32022a40caa..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta8-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8a7a0162f1f90a5ade226fd6b20a2abe linux-2.6.0-test8.tar.bz2 33139167
-MD5 035ce82845e53875cdf6e6e2ad93b29a 2.6.0-test8-mm1.bz2 644102
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r1
deleted file mode 100644
index 8e79ddb65e02..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52eef08a43aa28689213b8ab5674f73b linux-2.6.0-test9.tar.bz2 33226512
-MD5 809abac2589e8bc16fee9bb535c55dbf 2.6.0-test9-mm1.bz2 290411
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r2
deleted file mode 100644
index 27640a9cf722..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52eef08a43aa28689213b8ab5674f73b linux-2.6.0-test9.tar.bz2 33226512
-MD5 c808a1b4529bbd4caf86b3597d1e7318 2.6.0-test9-mm2.bz2 338570
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r4 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r4
deleted file mode 100644
index 91b5063bb6d6..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta9-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52eef08a43aa28689213b8ab5674f73b linux-2.6.0-test9.tar.bz2 33226512
-MD5 8a3551c67fa4f9d95e63e13e5484d924 2.6.0-test9-mm4.bz2 379920
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta11-r1.ebuild
index 8849a09898cd..33e4ca164971 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta11-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_beta8-r1.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta11-r1.ebuild,v 1.1 2003/12/17 15:30:19 tseng Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -40,6 +40,9 @@ src_unpack() {
 	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
 	find . -iname "*~" | xargs rm 2> /dev/null
 
+	#Fix broken APIC includes in test11-mm1 (tseng)
+	epatch ${FILESDIR}/apic.patch || die "APIC fix failed"
+
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
 	# also fix the EXTRAVERSION
 	cd ${S}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild
deleted file mode 100644
index b927c0ff82d1..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_beta9-r1.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=${PV/_beta/-test}
-
-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
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild
deleted file mode 100644
index e872fc09b10b..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_beta9-r2.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=${PV/_beta/-test}
-
-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
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild
deleted file mode 100644
index 0090027e8553..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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_beta9-r4.ebuild,v 1.2 2003/11/21 19:00:41 lostlogic Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=${PV/_beta/-test}
-
-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"
-	patch -p1 < ${FILESDIR}/${PV/_beta/-test}-${PR/r/mm}-alsa-crash.patch || die "alsa-crash 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
-}