[arch-commits] Commit in libvirt/trunk (PKGBUILD find_programs.ini)

[Eli Schwartz]

    Date: Tuesday, January 19, 2021 @ 19:26:09
  Author: eschwartz
Revision: 823883

libvirt: enable zfs backend

in order to override meson checks, you need to put overrides into a configuration file...

Added:
  libvirt/trunk/find_programs.ini
Modified:
  libvirt/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 ++++++---
 find_programs.ini |    5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-19 19:15:55 UTC (rev 823882)
+++ PKGBUILD	2021-01-19 19:26:09 UTC (rev 823883)
@@ -86,9 +86,11 @@
   'etc/logrotate.d/libvirtd.qemu'
   'etc/sasl2/libvirt.conf'
 )
-source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc})
+source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc}
+        "find_programs.ini")
 sha256sums=('ca3833844d08c22867f1d1a46edc36bda7d6fe1a4f267e7d77100b79fc9ddd89'
-            'SKIP')
+            'SKIP'
+            '735ac805fbf06021418f82297845babf481d5681bd939a6994fbdf36fe1661e4')
 validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar at redhat.com>
 
 prepare() {
@@ -111,6 +113,7 @@
   cd "$pkgname-$pkgver"
 
   arch-meson build \
+    --native-file "$srcdir"/find_programs.ini \
     -Dsystem=true \
     -Drunstatedir=/run \
     -Dqemu_group=kvm \
@@ -128,7 +131,7 @@
     -Dstorage_vstorage=disabled \
     -Ddtrace=disabled \
     -Dnumad=disabled \
-    -Dstorage_zfs=disabled \
+    -Dstorage_zfs=enabled \
     -Dstorage_rbd=disabled
 
   # Find out why zfs fails to build

Added: find_programs.ini
===================================================================
--- find_programs.ini	                        (rev 0)
+++ find_programs.ini	2021-01-19 19:26:09 UTC (rev 823883)
@@ -0,0 +1,5 @@
+[binaries]
+# these don't exist in the official repos, but if users get them some other
+# way then this is the expected path for them
+zfs = '/usr/bin/zfs'
+zpool = '/usr/bin/zpool'