2.6.19 kernel compatibility patch - bug #158463

(Portage version: 2.1.2_rc3-r5)

4 files changed, 67 insertions, 4 deletions

diff --git a/sys-fs/cowloop/ChangeLog b/sys-fs/cowloop/ChangeLog
index 1f1c186ead03..c931badfca99 100644
--- a/sys-fs/cowloop/ChangeLog
+++ b/sys-fs/cowloop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cowloop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.12 2006/12/16 21:43:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.13 2006/12/19 06:48:15 dragonheart Exp $
+
+  19 Dec 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/cowloop-3.0-cflags.patch, +files/cowloop-3.0-config_h.patch,
+  cowloop-3.0.ebuild:
+  2.6.19 kernel compatibility patch thanks to Willard Dawson in bug #158463
 
 *cowloop-3.0 (16 Dec 2006)
 
diff --git a/sys-fs/cowloop/cowloop-3.0.ebuild b/sys-fs/cowloop/cowloop-3.0.ebuild
index 471c99674bcd..f6baff666ac7 100644
--- a/sys-fs/cowloop/cowloop-3.0.ebuild
+++ b/sys-fs/cowloop/cowloop-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0.ebuild,v 1.1 2006/12/16 21:43:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0.ebuild,v 1.2 2006/12/19 06:48:15 dragonheart Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -30,10 +30,16 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-cflags.patch
+	epatch ${FILESDIR}/${P}-config_h.patch
+}
+
 src_compile() {
-	linux-mod_src_compile
 	touch .gpl_license_accepted
-	CC="$(tc-getCC) ${CFLAGS}" emake utils || die "make failed"
+	linux-mod_src_compile
+	CC="$(tc-getCC)" emake utils || die "make failed"
 }
 
 src_install() {
diff --git a/sys-fs/cowloop/files/cowloop-3.0-cflags.patch b/sys-fs/cowloop/files/cowloop-3.0-cflags.patch
new file mode 100644
index 000000000000..1b29d26ffb57
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-cflags.patch
@@ -0,0 +1,39 @@
+--- cowloop-3.0/src/Makefile.orig	2006-12-19 17:12:10.000000000 +1100
++++ cowloop-3.0/src/Makefile	2006-12-19 17:13:33.000000000 +1100
+@@ -23,28 +23,28 @@
+ # make -C $(KERNDIR) SUBDIRS=$(THISDIR) -I. -Wall modules
+ 
+ cowdev:		cowdev.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowdev cowdev.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowdev cowdev.c
+ 
+ cowwatch:	cowwatch.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowwatch cowwatch.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowwatch cowwatch.c
+ 
+ cowctl:		cowctl.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowctl cowctl.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowctl cowctl.c
+ 
+ cowsync:	cowsync.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowsync cowsync.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowsync cowsync.c
+ 
+ cowlist:	cowlist.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowlist cowlist.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowlist cowlist.c
+ 
+ cowrepair:	cowrepair.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowrepair cowrepair.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowrepair cowrepair.c
+ 
+ cowmerge:	cowmerge.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowmerge cowmerge.c
++		$(CC) $(CFLAGS) -I. -Wall -o cowmerge cowmerge.c
+ 
+ cowpack:	cowpack.c version.h cowloop.h
+-		$(CC) -I. -Wall -o cowpack cowpack.c -lz
++		$(CC) $(CFLAGS) -I. -Wall -o cowpack cowpack.c -lz
+ 
+ #--------------------------------------------------------------------
+ 
diff --git a/sys-fs/cowloop/files/cowloop-3.0-config_h.patch b/sys-fs/cowloop/files/cowloop-3.0-config_h.patch
new file mode 100644
index 000000000000..eb08ec352735
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-config_h.patch
@@ -0,0 +1,13 @@
+--- cowloop-3.0/src/cowloop.c.orig	2006-12-19 17:16:32.000000000 +1100
++++ cowloop-3.0/src/cowloop.c	2006-12-19 17:26:25.000000000 +1100
+@@ -233,7 +233,10 @@
+ #endif
+ 
+ #include <linux/types.h>
++#include <linux/autoconf.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+ #include <linux/init.h>