Bump, includes a fix to get to build properly.

6 files changed, 49 insertions, 48 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 440071e61845..9fc6103dee86 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.134 2004/03/11 20:13:37 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.135 2004/03/15 17:12:00 latexer Exp $
+
+*mm-sources-2.6.4-r2 (15 Mar 2004)
+
+  15 Mar 2004; Peter Johanson <latexer@gentoo.org> mm-sources-2.6.4-r2.ebuild,
+  files/2.6.4-r2-kbuild-fix.diff,
+  files/mm-sources-2.6.3-r3-misc-modules-fixes.diff:
+  Bump, including fix for building. Removed old stale file
 
 *mm-sources-2.6.4-r1 (11 Mar 2004)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 6aebbbc2ecea..bc3cc9a691df 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -2,14 +2,16 @@ MD5 ee7bea18592b7f7218863b2dc83ceed3 mm-sources-2.6.4-r1.ebuild 1103
 MD5 b777a4e61360ab2b552597cfa4a98eab mm-sources-2.6.3-r4.ebuild 1064
 MD5 6a0ecc0a0adab8c227111f00de4158e6 mm-sources-2.6.4_rc1-r2.ebuild 1032
 MD5 778d31ba9f08bc060df066524414c885 mm-sources-2.6.4_rc2-r1.ebuild 1032
+MD5 5c08787d7292c888d7d7da8ce5bf2cf0 mm-sources-2.6.4-r2.ebuild 1063
 MD5 adf5e2db0fbacec783616f3f2caf0fdf mm-sources-2.6.4_rc1-r1.ebuild 1032
-MD5 9abf35538fcaf65f637267ac13aa43e3 ChangeLog 23189
+MD5 742ef3fce8cb36ca498c72bb141710c9 ChangeLog 23451
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
+MD5 469ebb3583d8bf6430cdbf0872a09097 files/2.6.4-r2-kbuild-fix.diff 599
 MD5 bd9f94e618531f7b76322e9ce9f0ba08 files/mm-sources-2.6.3-r4-symbol-fixes.diff 900
 MD5 1c6c36ce96912f9916665f209e4f5ed6 files/digest-mm-sources-2.6.3-r4 125
 MD5 8b128c333d4166be610d05c3699d5e76 files/digest-mm-sources-2.6.4-r1 124
+MD5 f59c5066adf14025791e49d04944e1ed files/digest-mm-sources-2.6.4-r2 125
 MD5 a613978c67d87fc251c04d2a52dddcc2 files/2.6.4-r1-tty-fix.diff 575
-MD5 4e3139ff294ab9f18b052675ccf658ea files/mm-sources-2.6.3-r3-misc-modules-fixes.diff 1596
 MD5 8f578df14b624397068e82c4f6c51232 files/2.6.4-r1-debug-spinlock-fix.diff 325
 MD5 c50d8c537acf8fa8202902729e01a4c8 files/digest-mm-sources-2.6.4_rc1-r1 193
 MD5 47a1d7c5f3d4481e6cf79f788df89330 files/digest-mm-sources-2.6.4_rc1-r2 193
diff --git a/sys-kernel/mm-sources/files/2.6.4-r2-kbuild-fix.diff b/sys-kernel/mm-sources/files/2.6.4-r2-kbuild-fix.diff
new file mode 100644
index 000000000000..ee68baa1e6a5
--- /dev/null
+++ b/sys-kernel/mm-sources/files/2.6.4-r2-kbuild-fix.diff
@@ -0,0 +1,12 @@
+diff -aur linux-2.6.4-mm2-orig/Makefile linux-2.6.4-mm2/Makefile
+--- linux-2.6.4-mm2-orig/Makefile	2004-03-15 10:14:44.000000000 -0500
++++ linux-2.6.4-mm2/Makefile	2004-03-15 11:05:36.335178328 -0500
+@@ -990,7 +990,7 @@
+ 	@set -e; \
+ 	$(if $($(quiet)cmd_$(1)),echo '  $(subst ','\'',$($(quiet)cmd_$(1)))';) \
+ 	$(cmd_$(1)); \
+-	scripts/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \
++	scripts/basic/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \
+ 	rm -f $(depfile); \
+ 	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
+ 
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.4-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.4-r2
new file mode 100644
index 000000000000..073345794fe5
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.4-r2
@@ -0,0 +1,2 @@
+MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
+MD5 b4ee732a41eecc41370be7fa05a23ecd 2.6.4-mm2.bz2 1290778
diff --git a/sys-kernel/mm-sources/files/mm-sources-2.6.3-r3-misc-modules-fixes.diff b/sys-kernel/mm-sources/files/mm-sources-2.6.3-r3-misc-modules-fixes.diff
deleted file mode 100644
index 06a6e7ea6701..000000000000
--- a/sys-kernel/mm-sources/files/mm-sources-2.6.3-r3-misc-modules-fixes.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-On Sun, Feb 22, 2004 at 05:22:00PM -0800, Andrew Morton wrote:
-> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.3/2.6.3-mm2/
-
-Rusty's patch 'add-MODULE_VERSION-macro.patch' is missing a change that
-results in modules_install installing all of the modules AND their
-constituent source files into /lib/modules. The change, which did appear
-in Makefile.modpost correctly, follows here.
-
---- scripts/Makefile.modinst~	2004-02-22 19:31:28.000000000 -0800
-+++ scripts/Makefile.modinst	2004-02-22 19:31:49.000000000 -0800
-@@ -9,7 +9,7 @@
- 
- #
- 
--__modules := $(shell cat /dev/null $(wildcard $(MODVERDIR)/*.mod))
-+__modules := $(shell head -q -n1 $(wildcard $(MODVERDIR)/*.mod))
- modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
- 
- ifneq ($(filter-out $(modules),$(__modules)),)
- 
--- 
-Joshua Kwan
-On Sun, Feb 22, 2004 at 05:22:00PM -0800, Andrew Morton wrote:
-> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.3/2.6.3-mm3/
-
-The change made to scripts/Makefile to rake in sumversion.o requires
-this change to not break parallel builds:
-
---- scripts/Makefile~	2004-02-22 18:50:39.000000000 -0800
-+++ scripts/Makefile	2004-02-22 18:51:06.000000000 -0800
-@@ -24,7 +24,7 @@
- 
- # dependencies on generated files need to be listed explicitly
- 
--$(obj)/modpost.o $(obj)/file2alias.o: $(obj)/elfconfig.h
-+$(addprefix $(obj)/,$(modpost-objs)): $(obj)/elfconfig.h
- 
- quiet_cmd_elfconfig = MKELF   $@
-       cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
-
-Seems they all depend on elfconfig.h being there, so made it a general
-dependency.
-
--- 
-Joshua Kwan
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.4-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.4-r2.ebuild
new file mode 100644
index 000000000000..a57073646c8a
--- /dev/null
+++ b/sys-kernel/mm-sources/mm-sources-2.6.4-r2.ebuild
@@ -0,0 +1,23 @@
+# 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.4-r2.ebuild,v 1.1 2004/03/15 17:12:00 latexer Exp $
+
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/${PVR}-kbuild-fix.diff"
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+RESTRICT="nomirror"
+DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
+SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
+
+KEYWORDS="x86 ~amd64 ~ia64 -*"
+
+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."