On Fri, Jan 20, 2023 at 16:02:57 -0600, Jonathon Jongsma wrote:
In order to add caching of the nbdkit capabilities, we will need to
compare against file modification times, etc. So look up this
information when creating the nbdkit caps.
Add a nbdkit_moddir build option to allow the builder to specify the
location to look for nbdkit plugins and filters.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
meson.build | 6 ++++++
meson_options.txt | 1 +
src/qemu/qemu_nbdkit.c | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/meson.build b/meson.build
index e498b49be4..ca02fde91b 100644
--- a/meson.build
+++ b/meson.build
@@ -1664,6 +1664,12 @@ if not get_option('driver_qemu').disabled()
qemu_dbus_daemon_path = '/usr/bin/dbus-daemon'
endif
conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path)
+
+ nbdkit_moddir = get_option('nbdkit_moddir')
+ if nbdkit_moddir == ''
+ nbdkit_moddir = libdir / 'nbdkit'
+ endif
+ conf.set_quoted('NBDKIT_MODDIR', nbdkit_moddir)
This bit gets promptly deleted in upcoming patch. I suggest you don't
add it in the first place.