Fixed compilation with newer kernels, version bump.

Package-Manager: portage-2.1.1-r2

8 files changed, 240 insertions, 9 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/Manifest b/sys-cluster/drbd/Manifest
index 4a566b65ebd3..7962d4d5d504 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -25,22 +25,39 @@ AUX drbd-0.7-module-Makefile.patch 948 RMD160 94b566a6c68a70c2fa60f9b6a117952e9a
 MD5 cc42f194896b14c87944e9a5c5aaebf9 files/drbd-0.7-module-Makefile.patch 948
 RMD160 94b566a6c68a70c2fa60f9b6a117952e9af44fb2 files/drbd-0.7-module-Makefile.patch 948
 SHA256 ffc3b903d68fea1a1f41df0a2d0a4ead163577c328925cd3cc7214fd0f103e57 files/drbd-0.7-module-Makefile.patch 948
+AUX drbd-0.7.22-nodevfs.patch 306 RMD160 64fbbdc6347f3e0dca5e97dcffce6416a816ccd1 SHA1 39a6279e5ce1708eeaf27663196664c89303a2ef SHA256 54126b9910f2075d40c41e82418ee124618b2d5a1487805ceeb5646d9942bb54
+MD5 13f445e1b7d4aff12ad7c746b9515323 files/drbd-0.7.22-nodevfs.patch 306
+RMD160 64fbbdc6347f3e0dca5e97dcffce6416a816ccd1 files/drbd-0.7.22-nodevfs.patch 306
+SHA256 54126b9910f2075d40c41e82418ee124618b2d5a1487805ceeb5646d9942bb54 files/drbd-0.7.22-nodevfs.patch 306
+AUX drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch 376 RMD160 40a2e6fd54b8fedbe68f648341da590bd48f131e SHA1 b955b17aef3a2a218cedff1b33d81ed8180524e0 SHA256 d5d853484d3f9dcfb770391a97e74e5c2690a3410f7d3ed750ba5a9ed616d7bc
+MD5 cbf755250132aadbbb726bb1f91b2eda files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch 376
+RMD160 40a2e6fd54b8fedbe68f648341da590bd48f131e files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch 376
+SHA256 d5d853484d3f9dcfb770391a97e74e5c2690a3410f7d3ed750ba5a9ed616d7bc files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch 376
 AUX drbd-0.7.rc 1625 RMD160 a743b9c770770b0c2b817b8b3c2193a1650c5789 SHA1 56773c27c0faf4e0d3ed811e8f385dcbe590025e SHA256 cccc1d473ce10e5b55b228b2036ee901c5b40b98f675efea9c9387b028a9f863
 MD5 a14de7575636de014d1338331c965fc3 files/drbd-0.7.rc 1625
 RMD160 a743b9c770770b0c2b817b8b3c2193a1650c5789 files/drbd-0.7.rc 1625
 SHA256 cccc1d473ce10e5b55b228b2036ee901c5b40b98f675efea9c9387b028a9f863 files/drbd-0.7.rc 1625
 DIST drbd-0.7.21.tar.gz 296960 RMD160 331c887d61f2da3bd63dcd25dfe8fede3659efda SHA1 16cb634fa4c6ba8927ec02f2b1145fb4b45d7522 SHA256 f0b01c6504754619ad388c3e82d2ca4842d1071f62e2d879abb027025efe43ca
 DIST drbd-0.7.22.tar.gz 296960 RMD160 d187a23197b52cdced97cf24bda252c8da4f752f SHA1 976de6775dc47b61647e9db0176092f2c4166ee7 SHA256 1c29e22250e4aa874ac146edae6c6c4254cc96d508fc0f38b3a3ec885a05f2c8
+DIST drbd-0.7.23.tar.gz 296960 RMD160 140b0ea1cdcce54a42084dc376b21872f6f5679d SHA1 f52f086381ce6fd7ac73954d9879ecb9c0992b63 SHA256 6aab0b7beb859071bd85571b1a018ffb9e7261084c6fafa78b694dbc0b1303f5
 DIST drbd-8.0pre5.tar.gz 460800 RMD160 31a49fbfa55511891746c5c790653ce2ca30d0be SHA1 3dc55b89260e3ab45ffad7398b7dadb9d1b7eb35 SHA256 4dfecf5ef33761f1ae2b23f4f1b582357c8e8c60f7579fe30570e291035ba489
 DIST drbd-8.0pre6.tar.gz 460800 RMD160 1aaf06cf95d2ca76ac228a5c9d9e96365f935c0c SHA1 87b25c1914755b5160662bebf95efcebeacf9070 SHA256 2323d8e9d99f9d7ab630c8b3cc358768404b2a7bf77d036ab1073c8478b047d9
 EBUILD drbd-0.7.21.ebuild 1976 RMD160 30332226437d9c19f29b3fada66846af47894f1c SHA1 8424f84f5f7a229b313dfe35ce7d1e991e3f2072 SHA256 7848c222d296f13a47364a69575ccc2a0482f11f639539ba1bbccf5a53bb5fd8
 MD5 e6caadddfc9695c007302d28a29d7f35 drbd-0.7.21.ebuild 1976
 RMD160 30332226437d9c19f29b3fada66846af47894f1c drbd-0.7.21.ebuild 1976
 SHA256 7848c222d296f13a47364a69575ccc2a0482f11f639539ba1bbccf5a53bb5fd8 drbd-0.7.21.ebuild 1976
+EBUILD drbd-0.7.22-r1.ebuild 2152 RMD160 e1ff62bc829fe49298ea058cf5f3b7335e03090c SHA1 edca45160108d988aeba910f26c314d20c8ce69e SHA256 75c720aa4846eba1237b62e4d467d6e16ff3b561afd0db40dc6d15de1c1e2e5b
+MD5 6cea80caaa95301555fa9ad6ae3abb83 drbd-0.7.22-r1.ebuild 2152
+RMD160 e1ff62bc829fe49298ea058cf5f3b7335e03090c drbd-0.7.22-r1.ebuild 2152
+SHA256 75c720aa4846eba1237b62e4d467d6e16ff3b561afd0db40dc6d15de1c1e2e5b drbd-0.7.22-r1.ebuild 2152
 EBUILD drbd-0.7.22.ebuild 1976 RMD160 8fa4d141bf7030e7743940304eb4e981f3a9111b SHA1 f81c3e0e2b637b319e1e84a8a8e1ce7ce83a0ab0 SHA256 cd2c666d275f32d7c534ca6b638a16e3a6a0d448c73eeae2aa1e3130d2b8e301
 MD5 db8e4ace3e2062f0d34f27c0360a72f8 drbd-0.7.22.ebuild 1976
 RMD160 8fa4d141bf7030e7743940304eb4e981f3a9111b drbd-0.7.22.ebuild 1976
 SHA256 cd2c666d275f32d7c534ca6b638a16e3a6a0d448c73eeae2aa1e3130d2b8e301 drbd-0.7.22.ebuild 1976
+EBUILD drbd-0.7.23.ebuild 2149 RMD160 a33ab5ff3529775cfec13413144c1cae6ef6e4e2 SHA1 efed8ecbd7e066da16f98b5d3b04321aa3532419 SHA256 e2a90d54bed35de705f8b05e47cd3d545572c258de6e70d2d00bc2b5a468f31b
+MD5 9a26d2a1635268cbba0292de443366f1 drbd-0.7.23.ebuild 2149
+RMD160 a33ab5ff3529775cfec13413144c1cae6ef6e4e2 drbd-0.7.23.ebuild 2149
+SHA256 e2a90d54bed35de705f8b05e47cd3d545572c258de6e70d2d00bc2b5a468f31b drbd-0.7.23.ebuild 2149
 EBUILD drbd-8.0_pre5.ebuild 1994 RMD160 9caf162fe94342fc4ebea1031d131d851527bcc9 SHA1 627cacc9083db15536e695e22a8c2f4488ddb309 SHA256 9522067b975cf9fbee4bf38fd197dc3b556f89459901215276b1175bcc6451f2
 MD5 7ab9855714b90fcd478994f5c82aa7cd drbd-8.0_pre5.ebuild 1994
 RMD160 9caf162fe94342fc4ebea1031d131d851527bcc9 drbd-8.0_pre5.ebuild 1994
@@ -49,10 +66,10 @@ EBUILD drbd-8.0_pre6.ebuild 1994 RMD160 bba7ae41e545f5b259f14aec858ebe56f1f08318
 MD5 bb70041b6d0ec530eb569d224b7d1806 drbd-8.0_pre6.ebuild 1994
 RMD160 bba7ae41e545f5b259f14aec858ebe56f1f08318 drbd-8.0_pre6.ebuild 1994
 SHA256 45473ea22ec0820413e15038ebd3e81028884066a74613958884c7fe4bea1a52 drbd-8.0_pre6.ebuild 1994
-MISC ChangeLog 9586 RMD160 552a4503e5d1b2b2328921d1b66bdadc3cc0edc4 SHA1 d49ea23ba1c7c4a80526d1fa771e08b6068722a3 SHA256 b9d5d1cf6d8f04dadfcc0019a46ff05b242fc8a84f6bb6994b61f6c5b7771eac
-MD5 d83750ed79fa2fc69a71bd5cab5ece65 ChangeLog 9586
-RMD160 552a4503e5d1b2b2328921d1b66bdadc3cc0edc4 ChangeLog 9586
-SHA256 b9d5d1cf6d8f04dadfcc0019a46ff05b242fc8a84f6bb6994b61f6c5b7771eac ChangeLog 9586
+MISC ChangeLog 9896 RMD160 b738bacfb6e6bac704f7b5bf36dac4b80a068d34 SHA1 1bdb9e815c2f77f64fd2c0e65708c0248ac2df92 SHA256 e467368b1799c1622138a7de71edee897ccc7e633a2944596291245ceaec0ed2
+MD5 26b6c17d251e67b63f9ca12b8235cf01 ChangeLog 9896
+RMD160 b738bacfb6e6bac704f7b5bf36dac4b80a068d34 ChangeLog 9896
+SHA256 e467368b1799c1622138a7de71edee897ccc7e633a2944596291245ceaec0ed2 ChangeLog 9896
 MISC metadata.xml 223 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d SHA1 033d2c47eb2bfe68e657ac2d68a7bfd28aab5b22 SHA256 b75b89c431f244420a0c81f9157c9fc656a919a8aac011778e1b410f70851bd3
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d metadata.xml 223
@@ -63,6 +80,12 @@ SHA256 e9c51010416313eadcf3a59755471b36965b48e23c4fc9933ff7b12f45dd64b3 files/di
 MD5 ae00f5b72842b4377060e0b729893e09 files/digest-drbd-0.7.22 235
 RMD160 5447ca2a4f7ab7568eb8d4960bb9cc08843ac7f1 files/digest-drbd-0.7.22 235
 SHA256 a0d7f27f8e164474ca906b1bab9d127d0da5a8ebeb5dd71f6c41b1e87b5f8703 files/digest-drbd-0.7.22 235
+MD5 ae00f5b72842b4377060e0b729893e09 files/digest-drbd-0.7.22-r1 235
+RMD160 5447ca2a4f7ab7568eb8d4960bb9cc08843ac7f1 files/digest-drbd-0.7.22-r1 235
+SHA256 a0d7f27f8e164474ca906b1bab9d127d0da5a8ebeb5dd71f6c41b1e87b5f8703 files/digest-drbd-0.7.22-r1 235
+MD5 31f98d1b2c690014a7f2a2ec87f52c86 files/digest-drbd-0.7.23 235
+RMD160 d5f5caa79a7f14a50501273ecc99a7b1759122d6 files/digest-drbd-0.7.23 235
+SHA256 0339e7534391d2d45f52de0bb6e4d2ae666dd55225033f0f839d558267736931 files/digest-drbd-0.7.23 235
 MD5 d2583ba4d07ad7cb96825ea424f8e4f8 files/digest-drbd-8.0_pre5 238
 RMD160 788dae1c05df0211705704880ff02ff68cb9f0c9 files/digest-drbd-8.0_pre5 238
 SHA256 16190103370128abb0fc52c3a68ed31b2dff5da0a24b48f779e75ba6920f8f28 files/digest-drbd-8.0_pre5 238
@@ -72,7 +95,7 @@ SHA256 ffc0b7fdaf3d85ede9360452c1883482978eb0d8eb64e5588eb55bfb58fef381 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFFl+wjgMUyd/cdjWsRAt9QAJwM5DY6k1mX/ede24oBTMMX+qUlFQCfT2Yj
-3yYEam5S8D7UW/kwBYpsWek=
-=Sqwa
+iD8DBQFFxnZlgMUyd/cdjWsRAiEcAJ4iJgFpp7JAQVIkXCKlfMwNA2vY/wCfWFV7
+YtAZuf4XjjS22i9ipKj45zM=
+=VZb8
 -----END PGP SIGNATURE-----
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 \