2.6.27 kernel patches as per bug #256527. removed -r2 version as it did not include latest patches. marked 3.0 as x86 stable as I should not have rev bumped it years ago for the patches I added

(Portage version: 2.2_rc23/cvs/Linux x86_64)

5 files changed, 43 insertions, 57 deletions

diff --git a/sys-fs/cowloop/ChangeLog b/sys-fs/cowloop/ChangeLog
index 520cf8d45a7c..953905c7b478 100644
--- a/sys-fs/cowloop/ChangeLog
+++ b/sys-fs/cowloop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/cowloop
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.22 2008/04/06 10:02:16 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.23 2009/01/30 21:04:05 dragonheart Exp $
+
+  30 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  +files/cowloop-3.0-request_queue_t.patch,
+  +files/cowloop-3.0-semaphore_h.patch, -cowloop-3.0-r2.ebuild,
+  cowloop-3.0-r3.ebuild:
+  2.6.27 kernel patches as per bug #256527. removed -r2 version as it did not
+  include latest patches. marked 3.0 as x86 stable as I should not have rev
+  bumped it years ago for the patches I added
 
 *cowloop-3.0-r3 (01 Apr 2008)
 
diff --git a/sys-fs/cowloop/cowloop-3.0-r2.ebuild b/sys-fs/cowloop/cowloop-3.0-r2.ebuild
deleted file mode 100644
index 6a15e360fbb3..000000000000
--- a/sys-fs/cowloop/cowloop-3.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0-r2.ebuild,v 1.3 2008/04/01 14:39:22 dragonheart Exp $
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="A copy-on-write loop driver (block device) to be used on top of any other block driver"
-HOMEPAGE="http://www.atconsultancy.nl/cowloop/"
-SRC_URI="http://www.atconsultancy.nl/cowloop/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~ppc x86 ~amd64"
-IUSE=""
-DEPEND="virtual/libc
-	virtual/linux-sources"
-
-S=${WORKDIR}/${P}/src
-MODULE_NAMES="cowloop(fs:)"
-BUILD_TARGETS="modules"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} -I."
-	einfo "Linux kernel ${KV_FULL}"
-	if kernel_is lt 2 6
-	then
-		eerror "This version only works with 2.6 kernels"
-		die "No compatible kernel detected!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-config_h.patch
-	epatch "${FILESDIR}"/${P}-vfs_statfs.patch
-}
-
-src_compile() {
-	touch .gpl_license_accepted
-	linux-mod_src_compile
-	CC="$(tc-getCC)" emake utils || die "make failed"
-}
-
-src_install() {
-	linux-mod_src_install
-	emake DESTDIR="${D}" install-utils install-man || die 'make failed'
-	dodoc "${S}"/../RELEASENOTES "${S}"/../HOWTO ../doc/*
-	dodir /etc/udev/rules.d
-	echo 'KERNEL=="cowctl"        NAME="cow/ctl"' > "${D}"/etc/udev/rules.d/70-cow.rules
-	echo 'KERNEL=="cow[0-9]*"  NAME="cow/%n"' >> "${D}"/etc/udev/rules.d/70-cow.rules
-}
diff --git a/sys-fs/cowloop/cowloop-3.0-r3.ebuild b/sys-fs/cowloop/cowloop-3.0-r3.ebuild
index 64d1dd9a249a..e8d47544043d 100644
--- a/sys-fs/cowloop/cowloop-3.0-r3.ebuild
+++ b/sys-fs/cowloop/cowloop-3.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0-r3.ebuild,v 1.1 2008/04/01 14:39:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0-r3.ebuild,v 1.2 2009/01/30 21:04:05 dragonheart Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.atconsultancy.nl/cowloop/"
 SRC_URI="http://www.atconsultancy.nl/cowloop/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 DEPEND="virtual/libc
 	virtual/linux-sources"
@@ -36,6 +36,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-config_h.patch
 	epatch "${FILESDIR}"/${P}-vfs_statfs.patch
 	epatch "${FILESDIR}"/${P}-kern-2.6.23.patch
+	epatch "${FILESDIR}"/${P}-semaphore_h.patch
+	epatch "${FILESDIR}"/${P}-request_queue_t.patch
 }
 
 src_compile() {
diff --git a/sys-fs/cowloop/files/cowloop-3.0-request_queue_t.patch b/sys-fs/cowloop/files/cowloop-3.0-request_queue_t.patch
new file mode 100644
index 000000000000..cf4a42a0ef3f
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-request_queue_t.patch
@@ -0,0 +1,14 @@
+--- ./cowloop-3.0/src/cowloop.c.orig	2009-01-31 07:39:38.000000000 +1100
++++ ./cowloop-3.0/src/cowloop.c	2009-01-31 07:42:10.000000000 +1100
+@@ -923,7 +923,11 @@
+ ** in the queue
+ */
+ static void
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
+ cowlo_request(request_queue_t *q)
++#else
++cowlo_request(struct request_queue *q)
++#endif
+ {
+ 	struct request		*req;
+ 	struct cowloop_device	*cowdev;
diff --git a/sys-fs/cowloop/files/cowloop-3.0-semaphore_h.patch b/sys-fs/cowloop/files/cowloop-3.0-semaphore_h.patch
new file mode 100644
index 000000000000..cad4e1f832db
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-semaphore_h.patch
@@ -0,0 +1,14 @@
+--- cowloop-3.0/src/cowloop.c.orig	2009-01-31 07:31:18.000000000 +1100
++++ cowloop-3.0/src/cowloop.c	2009-01-31 07:32:46.000000000 +1100
+@@ -250,7 +250,11 @@
+ #include <linux/stat.h>
+ #include <linux/vmalloc.h>
+ #include <linux/slab.h>
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ #include <asm/semaphore.h>
++#else
++#include <linux/semaphore.h>
++#endif
+ #include <asm/uaccess.h>
+ #include <linux/proc_fs.h>
+ #include <linux/blkdev.h>