[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/20] meson: vhost-user-gpu/virtiofsd: use absolute path
From: |
Paolo Bonzini |
Subject: |
[PULL 08/20] meson: vhost-user-gpu/virtiofsd: use absolute path |
Date: |
Wed, 4 Nov 2020 10:01:41 -0500 |
From: Marc Hartmayer <mhartmay@linux.ibm.com>
The option `libexecdir` is relative to `prefix` (see
https://mesonbuild.com/Builtin-options.html), so we have to be aware
of this when creating 50-qemu-gpu.json and
50-qemu-virtiofsd.json. Otherwise, tools like libvirt will not be able
to find the executable.
Fixes: 16bf7a3326d8 ("configure: move directory options from config-host.mak to
meson")
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20201103112333.24734-1-mhartmay@linux.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/vhost-user-gpu/meson.build | 2 +-
tools/virtiofsd/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/vhost-user-gpu/meson.build
b/contrib/vhost-user-gpu/meson.build
index 37ecca13ca..c487ca72c1 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -9,6 +9,6 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in
config_host \
configure_file(input: '50-qemu-gpu.json.in',
output: '50-qemu-gpu.json',
- configuration: { 'libexecdir' : get_option('libexecdir') },
+ configuration: { 'libexecdir' : get_option('prefix') /
get_option('libexecdir') },
install_dir: qemu_datadir / 'vhost-user')
endif
diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build
index e1a4dc98d9..17edecf55c 100644
--- a/tools/virtiofsd/meson.build
+++ b/tools/virtiofsd/meson.build
@@ -15,5 +15,5 @@ executable('virtiofsd', files(
configure_file(input: '50-qemu-virtiofsd.json.in',
output: '50-qemu-virtiofsd.json',
- configuration: { 'libexecdir' : get_option('libexecdir') },
+ configuration: { 'libexecdir' : get_option('prefix') /
get_option('libexecdir') },
install_dir: qemu_datadir / 'vhost-user')
--
2.26.2
- [PULL 03/20] exec: Remove dead code (CID 1432876), (continued)
- [PULL 03/20] exec: Remove dead code (CID 1432876), Paolo Bonzini, 2020/11/04
- [PULL 01/20] cutils: replace strdup with g_strdup, Paolo Bonzini, 2020/11/04
- [PULL 09/20] tests/qtest/libqtest.c: Check for setsockopt() failure, Paolo Bonzini, 2020/11/04
- [PULL 02/20] docs: expand sourceset documentation, Paolo Bonzini, 2020/11/04
- [PULL 07/20] meson: use b_staticpic=false for meson >=0.56.0, Paolo Bonzini, 2020/11/04
- [PULL 10/20] tests/qtest/libqos/ahci.c: Avoid NULL dereference in ahci_exec(), Paolo Bonzini, 2020/11/04
- [PULL 06/20] qtest: add a reproducer for LP#1878642, Paolo Bonzini, 2020/11/04
- [PULL 12/20] configure: fix gio_libs reference, Paolo Bonzini, 2020/11/04
- [PULL 04/20] scripts/oss-fuzz: rename bin/qemu-fuzz-i386, Paolo Bonzini, 2020/11/04
- [PULL 16/20] fuzz: fuzz offsets within pio/mmio regions, Paolo Bonzini, 2020/11/04
- [PULL 08/20] meson: vhost-user-gpu/virtiofsd: use absolute path,
Paolo Bonzini <=
- [PULL 05/20] hw/isa/lpc_ich9: Ignore reserved/invalid SCI IRQ, Paolo Bonzini, 2020/11/04
- [PULL 15/20] fuzz: check the MR in the DMA callback, Paolo Bonzini, 2020/11/04
- [PULL 11/20] meson: fix warning for bad sphinx-build, Paolo Bonzini, 2020/11/04
- [PULL 14/20] fuzz: fix writing DMA patterns, Paolo Bonzini, 2020/11/04
- [PULL 17/20] semihosting: fix order of initialization functions, Paolo Bonzini, 2020/11/04
- [PULL 13/20] tests/qtest: Fix potential NULL pointer dereference in qos_build_main_args(), Paolo Bonzini, 2020/11/04
- [PULL 18/20] qapi, qemu-options: make all parsing visitors parse boolean options the same, Paolo Bonzini, 2020/11/04
- [PULL 20/20] qtest: escape device name in device-introspect-test, Paolo Bonzini, 2020/11/04
- [PULL 19/20] ivshmem-test: do not use short-form boolean option, Paolo Bonzini, 2020/11/04