[Pkg-libvirt-commits] [libvirt] 03/04: Enable zfs pool support

[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 ee7cd36509d10535628ca402990675644578671b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Aug 9 06:58:44 2016 +0200

    Enable zfs pool support
    
    Closes: #827245
---
 debian/control | 3 ++-
 debian/rules   | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 0727acb..99c366f 100644
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,7 @@ Build-Depends:
  systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
  python,
  xsltproc,
+ zfsutils [kfreebsd-amd64 kfreebsd-i386],
 # for --with-storage-sheepdog
  sheepdog [linux-any],
 # for --with-storage-rados
@@ -137,7 +138,7 @@ Recommends:
  pm-utils,
 Section: admin
 Suggests: radvd, auditd, systemtap, systemd, apparmor,
- nfs-common,
+ nfs-common, zfsutils
 Breaks: avahi-daemon (<< 0.6.31-3~),
  systemd-sysv (<< 224-1~)
 Replaces: libvirt-bin (<< 1.2.7-4~)
diff --git a/debian/rules b/debian/rules
index e07f32b..ec054e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +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_UDEV           = --with-udev
   WITH_CAPNG          = --with-capng
   WITH_MACVTAP        = --with-macvtap
@@ -53,6 +54,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
       WITH_LXC        = --with-lxc
   endif
 else
+  ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
+    WITH_STORAGE_ZFS  = --with-storage-zfs
+  endif
   WITH_STORAGE_LVM    = --without-storage-lvm
   WITH_STORAGE_ISCSI  = --without-storage-iscsi
   WITH_STORAGE_DISK   =	--without-storage-disk
@@ -99,6 +103,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	$(WITH_STORAGE_DISK)	 \
 	$(WITH_STORAGE_SHEEPDOG) \
 	$(WITH_STORAGE_RBD)      \
+	$(WITH_STORAGE_ZFS)      \
 	$(WITH_INIT_SCRIPT)      \
 	$(WITH_NUMA)             \
 	$(WITH_SELINUX)          \

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