Version bump, fixed compilation with older and newer kernels.

(Portage version: 2.1.2-r9)

7 files changed, 165 insertions, 7 deletions

diff --git a/sys-cluster/gnbd-kernel/ChangeLog b/sys-cluster/gnbd-kernel/ChangeLog
index 8dfa4366d063..0b8471d0c609 100644
--- a/sys-cluster/gnbd-kernel/ChangeLog
+++ b/sys-cluster/gnbd-kernel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/gnbd-kernel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/ChangeLog,v 1.20 2007/03/02 23:57:43 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/ChangeLog,v 1.21 2007/03/09 14:35:01 xmerlin Exp $
+
+*gnbd-kernel-1.04.00 (09 Mar 2007)
+
+  09 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/gnbd-kernel-1.03.00-compile-fix-kernel-post-2.6.18.patch,
+  +files/gnbd-kernel-1.04.00-compile-fix-kernel-pre-2.6.19.patch,
+  gnbd-kernel-1.02.00-r1.ebuild, gnbd-kernel-1.03.00.ebuild,
+  +gnbd-kernel-1.04.00.ebuild:
+  Version bump, fixed compilation with older and newer kernels.
 
   02 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
   gnbd-kernel-1.02.00-r1.ebuild, gnbd-kernel-1.03.00.ebuild:
diff --git a/sys-cluster/gnbd-kernel/files/digest-gnbd-kernel-1.04.00 b/sys-cluster/gnbd-kernel/files/digest-gnbd-kernel-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/gnbd-kernel/files/digest-gnbd-kernel-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/gnbd-kernel/files/gnbd-kernel-1.03.00-compile-fix-kernel-post-2.6.18.patch b/sys-cluster/gnbd-kernel/files/gnbd-kernel-1.03.00-compile-fix-kernel-post-2.6.18.patch
new file mode 100644
index 000000000000..8b0f20beaf7e
--- /dev/null
+++ b/sys-cluster/gnbd-kernel/files/gnbd-kernel-1.03.00-compile-fix-kernel-post-2.6.18.patch
@@ -0,0 +1,32 @@
+diff -uNr cluster-1.03.00/gnbd-kernel/src/gnbd.c cluster-1.04.00/gnbd-kernel/src/gnbd.c
+--- cluster-1.03.00/gnbd-kernel/src/gnbd.c	2006-07-12 19:34:29.000000000 +0200
++++ cluster-1.04.00/gnbd-kernel/src/gnbd.c	2007-02-07 16:25:05.000000000 +0100
+@@ -578,10 +577,10 @@
+ 		struct gnbd_device *dev;
+ 
+ 		blkdev_dequeue_request(req);
+-		dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%lx)\n",
+-				req->rq_disk->disk_name, req, req->flags);
++		dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%x)\n",
++				req->rq_disk->disk_name, req, req->cmd_type);
+ 
+-		if (!(req->flags & REQ_CMD))
++		if (!blk_fs_request(req))
+ 			goto error_out;
+ 		
+ 		dev = req->rq_disk->private_data;
+@@ -890,12 +888,12 @@
+ 		printk(KERN_CRIT "gnbd: sizeof gnbd_request needs to be 28 in order to work!\n" );
+ 		return -EIO;
+ 	}
+-	shutdown_req.flags = REQ_SPECIAL;
++	shutdown_req.cmd_type = REQ_TYPE_SPECIAL;
+ 	gnbd_cmd(&shutdown_req) = GNBD_CMD_DISC;
+ 	shutdown_req.sector = 0;
+ 	shutdown_req.nr_sectors = 0;
+ 
+-	ping_req.flags = REQ_SPECIAL;
++	ping_req.cmd_type = REQ_TYPE_SPECIAL;
+ 	gnbd_cmd(&ping_req) = GNBD_CMD_PING;
+ 	ping_req.sector = 0;
+ 	ping_req.nr_sectors = 0;
diff --git a/sys-cluster/gnbd-kernel/files/gnbd-kernel-1.04.00-compile-fix-kernel-pre-2.6.19.patch b/sys-cluster/gnbd-kernel/files/gnbd-kernel-1.04.00-compile-fix-kernel-pre-2.6.19.patch
new file mode 100644
index 000000000000..9ed4302776ee
--- /dev/null
+++ b/sys-cluster/gnbd-kernel/files/gnbd-kernel-1.04.00-compile-fix-kernel-pre-2.6.19.patch
@@ -0,0 +1,32 @@
+diff -uNr cluster-1.04.00.orig/gnbd-kernel/src/gnbd.c cluster-1.04.00/gnbd-kernel/src/gnbd.c
+--- cluster-1.04.00.orig/gnbd-kernel/src/gnbd.c	2007-02-07 16:25:05.000000000 +0100
++++ cluster-1.04.00/gnbd-kernel/src/gnbd.c	2006-07-12 19:34:29.000000000 +0200
+@@ -577,10 +578,10 @@
+ 		struct gnbd_device *dev;
+ 
+ 		blkdev_dequeue_request(req);
+-		dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%x)\n",
+-				req->rq_disk->disk_name, req, req->cmd_type);
++		dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%lx)\n",
++				req->rq_disk->disk_name, req, req->flags);
+ 
+-		if (!blk_fs_request(req))
++		if (!(req->flags & REQ_CMD))
+ 			goto error_out;
+ 		
+ 		dev = req->rq_disk->private_data;
+@@ -888,12 +890,12 @@
+ 		printk(KERN_CRIT "gnbd: sizeof gnbd_request needs to be 28 in order to work!\n" );
+ 		return -EIO;
+ 	}
+-	shutdown_req.cmd_type = REQ_TYPE_SPECIAL;
++	shutdown_req.flags = REQ_SPECIAL;
+ 	gnbd_cmd(&shutdown_req) = GNBD_CMD_DISC;
+ 	shutdown_req.sector = 0;
+ 	shutdown_req.nr_sectors = 0;
+ 
+-	ping_req.cmd_type = REQ_TYPE_SPECIAL;
++	ping_req.flags = REQ_SPECIAL;
+ 	gnbd_cmd(&ping_req) = GNBD_CMD_PING;
+ 	ping_req.sector = 0;
+ 	ping_req.nr_sectors = 0;
diff --git a/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild b/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild
index c02be8865295..30a350b18c9a 100644
--- a/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild
+++ b/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild,v 1.9 2007/03/03 00:27:34 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild,v 1.10 2007/03/09 14:35:01 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 CVS_RELEASE="20060713"
-MY_P="cluster-${PV}"
 
 DESCRIPTION="GFS Network Block Devices module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -39,6 +40,10 @@ src_unpack() {
 		if [ "$KV_PATCH" -ge "18" ] ; then
 			epatch ${FILESDIR}/${PN}-remove-devfs-support.patch || die
 		fi
+
+		if [ "$KV_PATCH" -ge "19" ] ; then
+			epatch ${FILESDIR}/${PN}-1.03.00-compile-fix-kernel-post-2.6.18.patch || die
+		fi
 	fi
 }
 
diff --git a/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild b/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild
index 6908d2baba1d..c91e7876cf0e 100644
--- a/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild
+++ b/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild,v 1.8 2007/03/03 00:27:34 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild,v 1.9 2007/03/09 14:35:01 xmerlin Exp $
 
 inherit linux-mod linux-info
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="GFS Network Block Devices module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -28,13 +29,17 @@ pkg_setup() {
 }
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
+	unpack ${A}
+	cd ${S}
 
 	if kernel_is 2 6; then
 		if [ "$KV_PATCH" -ge "18" ] ; then
 			epatch ${FILESDIR}/${PN}-remove-devfs-support.patch || die
 		fi
+
+		if [ "$KV_PATCH" -ge "19" ] ; then
+			epatch ${FILESDIR}/${P}-compile-fix-kernel-post-2.6.18.patch || die
+		fi
 	fi
 }
 
diff --git a/sys-cluster/gnbd-kernel/gnbd-kernel-1.04.00.ebuild b/sys-cluster/gnbd-kernel/gnbd-kernel-1.04.00.ebuild
new file mode 100644
index 000000000000..3fb0a956d010
--- /dev/null
+++ b/sys-cluster/gnbd-kernel/gnbd-kernel-1.04.00.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.04.00.ebuild,v 1.1 2007/03/09 14:35:01 xmerlin Exp $
+
+inherit linux-mod linux-info
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+DESCRIPTION="GFS Network Block Devices module"
+HOMEPAGE="http://sources.redhat.com/cluster/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/linux-sources-2.6.16"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	case ${KV_FULL} in
+		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
+	esac
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if kernel_is 2 6; then
+		if [ "$KV_PATCH" -ge "18" ] ; then
+			epatch ${FILESDIR}/${PN}-remove-devfs-support.patch || die
+		fi
+
+		if [ "$KV_PATCH" -lt "18" ] ; then
+			sed -i \
+				-e 's|utsrelease.h|version.h|g' \
+				configure \
+				|| die "sed failed"
+		fi
+
+		if [ "$KV_PATCH" -lt "19" ] ; then
+			epatch ${FILESDIR}/${P}-compile-fix-kernel-pre-2.6.19.patch || die
+		fi
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+	rm -f ${D}/usr/include/linux/gnbd.h || die
+}
+
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
+	einfo ""
+}