[Pkg-libvirt-commits] [libvirt] 01/01: Support zfs on Linux too

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch debian/sid
in repository libvirt.

commit 3ce2f8690933b72f65c42ebaa2ccbe8821e1eecd
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Aug 14 15:28:28 2016 +0200

    Support zfs on Linux too
---
 debian/patches/Set-defaults-for-zfs-tools.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 debian/rules                                    |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/patches/Set-defaults-for-zfs-tools.patch b/debian/patches/Set-defaults-for-zfs-tools.patch
new file mode 100644
index 0000000..46332fa
--- /dev/null
+++ b/debian/patches/Set-defaults-for-zfs-tools.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 14 Aug 2016 15:27:48 +0200
+Subject: Set defaults for zfs tools
+
+so we don't have to build-depend on a program in contrib
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2c81c95..6eaf41b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1927,8 +1927,8 @@ AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"])
+ 
+ if test "$with_storage_zfs" = "yes" ||
+    test "$with_storage_zfs" = "check"; then
+-  AC_PATH_PROG([ZFS], [zfs], [], [$PATH:/sbin:/usr/sbin])
+-  AC_PATH_PROG([ZPOOL], [zpool], [], [$PATH:/sbin:/usr/sbin])
++  AC_PATH_PROG([ZFS], [zfs], [/sbin/zfs], [$PATH:/sbin:/usr/sbin])
++  AC_PATH_PROG([ZPOOL], [zpool], [/sbin/zpool], [$PATH:/sbin:/usr/sbin])
+ 
+   if test "$with_storage_zfs" = "yes"; then
+     if test -z "$ZFS" || test -z "$ZPOOL"; then
diff --git a/debian/patches/series b/debian/patches/series
index 769458a..b3e70ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ debian/Use-upstreams-polkit-rule.patch
 Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
 virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
+Set-defaults-for-zfs-tools.patch
diff --git a/debian/rules b/debian/rules
index ec054e8..cf50336 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_STORAGE_DISK   =	--with-storage-disk
   WITH_STORAGE_SHEEPDOG = --with-storage-sheepdog
   WITH_STORAGE_RBD    = --with-storage-rbd
-  WITH_STORAGE_ZFS    = --without-storage-zfs
+  WITH_STORAGE_ZFS    = --with-storage-zfs
   WITH_UDEV           = --with-udev
   WITH_CAPNG          = --with-capng
   WITH_MACVTAP        = --with-macvtap

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git