introduced 2.6.23+ compatibility as per bug #208059. Patches by Jouni Kosonen and bug written by Jérôme Poulin

(Portage version: 2.1.4.4)

6 files changed, 51 insertions, 103 deletions

diff --git a/sys-fs/cowloop/ChangeLog b/sys-fs/cowloop/ChangeLog
index 9fbbaedbe368..b1e97e544464 100644
--- a/sys-fs/cowloop/ChangeLog
+++ b/sys-fs/cowloop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/cowloop
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.19 2007/05/02 10:50:30 robbat2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.20 2008/04/01 14:39:22 dragonheart Exp $
+
+*cowloop-3.0-r3 (01 Apr 2008)
+
+  01 Apr 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/cowloop-3.0-kern-2.6.23.patch, +cowloop-3.0-r3.ebuild:
+  introduced 2.6.23+ compatibility as per bug #208059. Patches by Jouni
+  Kosonen and bug written by Jerôme Poulin
 
   02 May 2007; Robin H. Johnson <robbat2@gentoo.org> cowloop-3.0-r2.ebuild:
   Add ~amd64 after some quick testing.
@@ -53,7 +60,7 @@
 
   04 Aug 2005; Daniel Black <dragonheart@gentoo.org> -cowloop-2.11.ebuild,
   -cowloop-2.15.ebuild, +cowloop-2.15-r1.ebuild:
-  added cowmerge thanks to bug #101159 by Jérôme Poulin
+  added cowmerge thanks to bug #101159 by Jérôme Poulin
 
   26 Jun 2005; David Holm <dholm@gentoo.org> cowloop-2.15.ebuild:
   Added to ~ppc.
diff --git a/sys-fs/cowloop/cowloop-1.4.ebuild b/sys-fs/cowloop/cowloop-1.4.ebuild
deleted file mode 100644
index e76cc465a789..000000000000
--- a/sys-fs/cowloop/cowloop-1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-1.4.ebuild,v 1.4 2007/07/13 05:15:33 mr_bones_ 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"
-# get-version
-# SLOT="${KV_MAJOR}.${MINOR}"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="virtual/libc
-	virtual/linux-sources"
-
-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 2 4
-	then
-		eerror "This version only works with 2.4 kernels"
-		eerror "For 2.6 kernel support, use version 2.11 or later"
-		die "No compatible kernel detected!"
-	fi
-}
-
-src_compile() {
-	$(tc-getCC) -s -I. -D__KERNEL__ -DLINUX -DMODULE -DCOWMAJOR=241 \
-		-I${KV_DIR}/include ${CFLAGS} -c cowloop.c \
-		|| die "module compile failure"
-}
-
-src_install() {
-	linux-mod_src_install
-	doman man/*
-}
diff --git a/sys-fs/cowloop/cowloop-2.14.ebuild b/sys-fs/cowloop/cowloop-2.14.ebuild
deleted file mode 100644
index 0f624f13f677..000000000000
--- a/sys-fs/cowloop/cowloop-2.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-2.14.ebuild,v 1.5 2007/07/13 05:15:33 mr_bones_ 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="x86"
-IUSE=""
-DEPEND="virtual/libc
-	virtual/linux-sources"
-
-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"
-		eerror "For 2.4 kernel support, use version 1.4"
-		die "No compatible kernel detected!"
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-	CC="$(tc-getCC) ${CFLAGS}" emake cowdev cowrepair cowsync cowlist || die "make failed"
-}
-
-src_install() {
-	linux-mod_src_install
-	dosbin cowdev cowrepair cowsync cowlist
-	doman man/*
-}
diff --git a/sys-fs/cowloop/cowloop-3.0-r2.ebuild b/sys-fs/cowloop/cowloop-3.0-r2.ebuild
index f1c977d680cb..6a15e360fbb3 100644
--- a/sys-fs/cowloop/cowloop-3.0-r2.ebuild
+++ b/sys-fs/cowloop/cowloop-3.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2 2007/05/02 10:50:30 robbat2 Exp $
+# $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
 
@@ -25,16 +25,15 @@ pkg_setup() {
 	if kernel_is lt 2 6
 	then
 		eerror "This version only works with 2.6 kernels"
-		eerror "For 2.4 kernel support, use version 1.4"
 		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
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-config_h.patch
+	epatch "${FILESDIR}"/${P}-vfs_statfs.patch
 }
 
 src_compile() {
@@ -48,6 +47,6 @@ 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
+	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-2.15-r1.ebuild b/sys-fs/cowloop/cowloop-3.0-r3.ebuild
index df69922ff741..64d1dd9a249a 100644
--- a/sys-fs/cowloop/cowloop-2.15-r1.ebuild
+++ b/sys-fs/cowloop/cowloop-3.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-2.15-r1.ebuild,v 1.5 2007/07/13 05:15:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-3.0-r3.ebuild,v 1.1 2008/04/01 14:39:22 dragonheart Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -9,11 +9,12 @@ HOMEPAGE="http://www.atconsultancy.nl/cowloop/"
 SRC_URI="http://www.atconsultancy.nl/cowloop/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="virtual/libc
 	virtual/linux-sources"
 
+S=${WORKDIR}/${P}/src
 MODULE_NAMES="cowloop(fs:)"
 BUILD_TARGETS="modules"
 
@@ -29,16 +30,25 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-config_h.patch
+	epatch "${FILESDIR}"/${P}-vfs_statfs.patch
+	epatch "${FILESDIR}"/${P}-kern-2.6.23.patch
+}
+
 src_compile() {
+	touch .gpl_license_accepted
 	linux-mod_src_compile
-	CC="$(tc-getCC) ${CFLAGS}" emake cowdev cowrepair cowsync cowlist cowmerge || die "make failed"
+	CC="$(tc-getCC)" emake utils || die "make failed"
 }
 
 src_install() {
 	linux-mod_src_install
-	dosbin cowdev cowrepair cowsync cowlist cowmerge
-	doman man/*
+	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=="cowloop[0-9]*"  NAME="cow/%n"' >> ${D}/etc/udev/rules.d/70-cow.rules
+	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/files/cowloop-3.0-kern-2.6.23.patch b/sys-fs/cowloop/files/cowloop-3.0-kern-2.6.23.patch
new file mode 100644
index 000000000000..5d4b7c99e010
--- /dev/null
+++ b/sys-fs/cowloop/files/cowloop-3.0-kern-2.6.23.patch
@@ -0,0 +1,16 @@
+--- cowloop-3.0/src/cowloop.c.orig	2006-12-22 18:31:13.000000000 +1100
++++ cowloop-3.0/src/cowloop.c	2008-01-30 00:03:55.000000000 +0200
+@@ -2816,9 +2816,13 @@
+ 	for (minor=0; minor < maxcows;  minor++)
+ 		(void) cowlo_closepair(cowdevall[minor]);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23))
+ 	if (unregister_blkdev(COWMAJOR, DEVICE_NAME) != 0)
+ 		printk(KERN_WARNING "cowloop - cannot unregister blkdev\n");
++#else
++	unregister_blkdev(COWMAJOR, DEVICE_NAME);
++#endif
+ 
+ 	/*
+ 	** get rid of /proc/cow and unregister the driver
+ 	*/