Comment 2 for bug 1872952

as pastebins time out - change #2

diff -Nru libvirt-6.0.0/debian/changelog libvirt-6.0.0/debian/changelog
--- libvirt-6.0.0/debian/changelog 2020-03-12 04:12:39.000000000 +0000
+++ libvirt-6.0.0/debian/changelog 2020-03-12 04:25:04.000000000 +0000
@@ -1,3 +1,9 @@
+libvirt (6.0.0-0ubuntu4+riscv64.2) focal; urgency=medium
+
+ * Disable zfs storage backend on riscv64, where ZFS doesn't exist yet.
+
+ -- William Grant <email address hidden> Thu, 12 Mar 2020 15:25:04 +1100
+
 libvirt (6.0.0-0ubuntu4+riscv64.1) focal; urgency=medium

   * Disable rados storage backend on riscv64, where Ceph doesn't exist yet.
diff -Nru libvirt-6.0.0/debian/control libvirt-6.0.0/debian/control
--- libvirt-6.0.0/debian/control 2020-03-12 04:12:30.000000000 +0000
+++ libvirt-6.0.0/debian/control 2020-03-12 04:24:34.000000000 +0000
@@ -47,7 +47,7 @@
  python3-docutils,
  xsltproc,
  zfsutils [kfreebsd-amd64 kfreebsd-i386],
- libzfslinux-dev [linux-any],
+ libzfslinux-dev [amd64 arm64 armhf i386 ppc64el s390x],
  po-debconf,
 # for --with-storage-rados
  librbd-dev [amd64 arm64 armhf i386 ppc64el s390x],
@@ -230,7 +230,7 @@
  This package contains the libvirtd storage driver for RBD/Rados/Ceph.

 Package: libvirt-daemon-driver-storage-zfs
-Architecture: linux-any
+Architecture: amd64 arm64 armhf i386 ppc64el s390x
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
diff -Nru libvirt-6.0.0/debian/rules libvirt-6.0.0/debian/rules
--- libvirt-6.0.0/debian/rules 2020-03-12 04:12:07.000000000 +0000
+++ libvirt-6.0.0/debian/rules 2020-03-12 04:24:48.000000000 +0000
@@ -29,10 +29,11 @@
   WITH_STORAGE_DISK = --with-storage-disk
   ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386 ppc64el s390x))
     WITH_STORAGE_RBD = --with-storage-rbd
+ WITH_STORAGE_ZFS = --with-storage-zfs
   else
     WITH_STORAGE_RBD = --without-storage-rbd
+ WITH_STORAGE_ZFS = --without-storage-zfs
   endif
- WITH_STORAGE_ZFS = --with-storage-zfs
   WITH_STORAGE_GLUSTER = --with-storage-gluster
   WITH_UDEV = --with-udev
   WITH_CAPNG = --with-capng