Add fixage for misc. modules related breakage from lkml

3 files changed, 52 insertions, 3 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 3a18073c2fb1..98dd1b6a1a32 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2004/02/23 16:07:53 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.127 2004/02/23 16:26:59 lostlogic Exp $
+
+  23 Feb 2004; Brandon Low <lostlogic@gentoo.org> mm-sources-2.6.3-r3.ebuild,
+  files/mm-sources-2.6.3-r3-misc-modules-fixes.diff:
+  Add fixage for misc. modules related breakage from lkml
 
   23 Feb 2004; Brandon Low <lostlogic@gentoo.org> mm-sources-2.6.2-r1.ebuild,
   mm-sources-2.6.3_rc1-r1.ebuild, mm-sources-2.6.3_rc2-r1.ebuild,
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
new file mode 100644
index 000000000000..06a6e7ea6701
--- /dev/null
+++ b/sys-kernel/mm-sources/files/mm-sources-2.6.3-r3-misc-modules-fixes.diff
@@ -0,0 +1,45 @@
+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.3-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.3-r3.ebuild
index 9db70da1ff55..6f638b8eaef4 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.3-r3.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.3-r3.ebuild
@@ -1,8 +1,8 @@
 # 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.3-r3.ebuild,v 1.1 2004/02/23 16:06:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.3-r3.ebuild,v 1.2 2004/02/23 16:26:59 lostlogic Exp $
 
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/$PF-misc-modules-fixes.diff"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"