Fixed compilation with newer kernels, version bump.

(Portage version: 2.1.1-r2)

7 files changed, 210 insertions, 2 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index de043f0eea23..5a08194428d5 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/drbd
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.58 2006/12/31 16:58:02 xmerlin Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.59 2007/02/05 00:12:11 xmerlin Exp $
+
+*drbd-0.7.23 (05 Feb 2007)
+*drbd-0.7.22-r1 (05 Feb 2007)
+
+  05 Feb 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/drbd-0.7.22-nodevfs.patch,
+  +files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch,
+  +drbd-0.7.22-r1.ebuild, +drbd-0.7.23.ebuild:
+  Fixed compilation with newer kernels, version bump.
 
   31 Dec 2006; Christian Zoffoli <xmerlin@gentoo.org> drbd-0.7.22.ebuild:
   Stable x86.
diff --git a/sys-cluster/drbd/drbd-0.7.22-r1.ebuild b/sys-cluster/drbd/drbd-0.7.22-r1.ebuild
new file mode 100644
index 000000000000..0c944061b7a0
--- /dev/null
+++ b/sys-cluster/drbd/drbd-0.7.22-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.22-r1.ebuild,v 1.1 2007/02/05 00:12:11 xmerlin Exp $
+
+inherit eutils versionator linux-mod linux-info
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc x86"
+
+MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${P}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+SLOT="0"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.7.22-nodevfs.patch || die
+	epatch ${FILESDIR}/${PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	einfo ""
+	einfo "Your kernel-sources in /usr/src/linux-${KV} must be properly configured"
+	#einfo "and match the currently running kernel version ${KV}"
+	einfo "If otherwise -> build will fail."
+	einfo ""
+
+	if kernel_is 2 6; then
+		emake KDIR=${KERNEL_DIR} || die "compile problem"
+	else
+		cp -R /usr/src/linux-${KV} ${WORKDIR}
+		emake KDIR=/${WORKDIR}/linux-${KV} || die "compile problem"
+	fi
+}
+
+src_install() {
+	emake PREFIX=${D} install || die "install problem"
+
+	# gentoo-ish init-script
+	newinitd ${FILESDIR}/${PN}-0.7.rc ${PN} || die
+
+	# needed by drbd startup script
+	#keepdir /var/lib/drbd
+
+	# docs
+	dodoc README ChangeLog COPYING
+	dodoc documentation/NFS-Server-README.txt
+
+	# we put drbd.conf into docs
+	# it doesnt make sense to install a default conf in /etc
+	# put it to the docs
+	rm -f ${D}/etc/drbd.conf
+	dodoc scripts/drbd.conf || die
+	dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
+	einfo ""
+	einfo "Please copy and gunzip the configuration file"
+	einfo "from /usr/share/doc/${PF}/drbd.conf.gz to /etc"
+	einfo "and edit it to your needs. Helpful commands:"
+	einfo "man 5 drbd.conf"
+	einfo "man 8 drbdsetup"
+	einfo "man 8 drbdadm"
+	einfo ""
+}
diff --git a/sys-cluster/drbd/drbd-0.7.23.ebuild b/sys-cluster/drbd/drbd-0.7.23.ebuild
new file mode 100644
index 000000000000..72b1c63a65d2
--- /dev/null
+++ b/sys-cluster/drbd/drbd-0.7.23.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.23.ebuild,v 1.1 2007/02/05 00:12:11 xmerlin Exp $
+
+inherit eutils versionator linux-mod linux-info
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc x86"
+
+MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${P}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+SLOT="0"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.7.22-nodevfs.patch || die
+	epatch ${FILESDIR}/${PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	einfo ""
+	einfo "Your kernel-sources in /usr/src/linux-${KV} must be properly configured"
+	#einfo "and match the currently running kernel version ${KV}"
+	einfo "If otherwise -> build will fail."
+	einfo ""
+
+	if kernel_is 2 6; then
+		emake KDIR=${KERNEL_DIR} || die "compile problem"
+	else
+		cp -R /usr/src/linux-${KV} ${WORKDIR}
+		emake KDIR=/${WORKDIR}/linux-${KV} || die "compile problem"
+	fi
+}
+
+src_install() {
+	emake PREFIX=${D} install || die "install problem"
+
+	# gentoo-ish init-script
+	newinitd ${FILESDIR}/${PN}-0.7.rc ${PN} || die
+
+	# needed by drbd startup script
+	#keepdir /var/lib/drbd
+
+	# docs
+	dodoc README ChangeLog COPYING
+	dodoc documentation/NFS-Server-README.txt
+
+	# we put drbd.conf into docs
+	# it doesnt make sense to install a default conf in /etc
+	# put it to the docs
+	rm -f ${D}/etc/drbd.conf
+	dodoc scripts/drbd.conf || die
+	dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
+	einfo ""
+	einfo "Please copy and gunzip the configuration file"
+	einfo "from /usr/share/doc/${PF}/drbd.conf.gz to /etc"
+	einfo "and edit it to your needs. Helpful commands:"
+	einfo "man 5 drbd.conf"
+	einfo "man 8 drbdsetup"
+	einfo "man 8 drbdadm"
+	einfo ""
+}
diff --git a/sys-cluster/drbd/files/digest-drbd-0.7.22-r1 b/sys-cluster/drbd/files/digest-drbd-0.7.22-r1
new file mode 100644
index 000000000000..ce9279e5479a
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-0.7.22-r1
@@ -0,0 +1,3 @@
+MD5 589626e0c62d314d3bbe78275b9e7d2d drbd-0.7.22.tar.gz 296960
+RMD160 d187a23197b52cdced97cf24bda252c8da4f752f drbd-0.7.22.tar.gz 296960
+SHA256 1c29e22250e4aa874ac146edae6c6c4254cc96d508fc0f38b3a3ec885a05f2c8 drbd-0.7.22.tar.gz 296960
diff --git a/sys-cluster/drbd/files/digest-drbd-0.7.23 b/sys-cluster/drbd/files/digest-drbd-0.7.23
new file mode 100644
index 000000000000..9a5801523c19
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-0.7.23
@@ -0,0 +1,3 @@
+MD5 3600d689e4e9bb45108c0c185a1e85c5 drbd-0.7.23.tar.gz 296960
+RMD160 140b0ea1cdcce54a42084dc376b21872f6f5679d drbd-0.7.23.tar.gz 296960
+SHA256 6aab0b7beb859071bd85571b1a018ffb9e7261084c6fafa78b694dbc0b1303f5 drbd-0.7.23.tar.gz 296960
diff --git a/sys-cluster/drbd/files/drbd-0.7.22-nodevfs.patch b/sys-cluster/drbd/files/drbd-0.7.22-nodevfs.patch
new file mode 100644
index 000000000000..69454ac18c7b
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-0.7.22-nodevfs.patch
@@ -0,0 +1,10 @@
+--- drbd-0.7.23/drbd_config.h.orig	2007-02-05 00:51:13.000000000 +0100
++++ drbd-0.7.23/drbd_config.h	2007-02-05 00:51:18.000000000 +0100
+@@ -69,6 +69,6 @@
+ // but more recent kernels define it in arch/um/include/mem.h
+ #define HAVE_UML_TO_VIRT
+ 
+-//#define NO_MORE_DEV_FS
++#define NO_MORE_DEV_FS
+ 
+ #endif
diff --git a/sys-cluster/drbd/files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch b/sys-cluster/drbd/files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch
new file mode 100644
index 000000000000..7f0da93f24b6
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch
@@ -0,0 +1,15 @@
+--- drbd-0.7.22/scripts/adjust_drbd_config_h.sh.orig	2006-10-23 10:38:57.000000000 +0200
++++ drbd-0.7.22/scripts/adjust_drbd_config_h.sh	2007-02-05 00:58:15.000000000 +0100
+@@ -22,11 +22,7 @@
+ 
+ test -n "$KDIR"
+ KDIR=${KDIR%/}
+-if test -z "$O"; then
+-	O=$KDIR;
+-else
+-	O=${O%/}
+-fi
++O=$KDIR;
+ 
+ # some paranoia: check that all files are where we expect them
+ ls > /dev/null \