[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/1.0.1_rc1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit a6fae3d56ed2a954e51772d4d03df16115fffac6
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Dec 13 17:22:23 2012 +0100

    Define SANLK_INQ_WAIT if missing in headers

diff --git a/debian/patches/Define-SANLK_INQ_WAIT-if-missing-in-headers.patch b/debian/patches/Define-SANLK_INQ_WAIT-if-missing-in-headers.patch
new file mode 100644
index 0000000..5ac4871
--- /dev/null
+++ b/debian/patches/Define-SANLK_INQ_WAIT-if-missing-in-headers.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 13 Dec 2012 17:21:54 +0100
+Subject: Define SANLK_INQ_WAIT if missing in headers
+
+so we can build with older sanlock (like 2.2)
+---
+ src/locking/lock_driver_sanlock.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
+index 430e11e..84f81ec 100644
+--- a/src/locking/lock_driver_sanlock.c
++++ b/src/locking/lock_driver_sanlock.c
+@@ -338,6 +338,9 @@ retry:
+     if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) {
+         if (-rv == EINPROGRESS) {
+ #ifdef HAVE_SANLOCK_INQ_LOCKSPACE
++#  ifndef SANLK_INQ_WAIT
++#    define SANLK_INQ_WAIT 0x00000001
++#  endif
+             /* we have this function which blocks until lockspace change the
+              * state. It returns 0 if lockspace has been added, -ENOENT if it
+              * hasn't. XXX should we goto retry? */
diff --git a/debian/patches/series b/debian/patches/series
index 6148614..2e489b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
+Define-SANLK_INQ_WAIT-if-missing-in-headers.patch

-- 
Libvirt Debian packaging