[PATCH v1] use libexecdir as location for qemu-bridge-helper

Olaf Hering posted 1 patch 9 months, 3 weeks ago
Failed in applying to current master (apply log)
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH v1] use libexecdir as location for qemu-bridge-helper
Posted by Olaf Hering 9 months, 3 weeks ago
The current logic in meson.build assumes a fixed runtime path for
qemu-bridge-helper in case this binary is not available during build.
Since qemu-bridge-helper is not used during build it is not required to
have it installed at build time.

It is likely that both qemu and libvirt are built with the same
--libexecdir option. So use this as the expected location for
qemu-bridge-helper.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index c2a2f306c1..6ca05e2f69 100644
--- a/meson.build
+++ b/meson.build
@@ -1653,7 +1653,7 @@ if not get_option('driver_qemu').disabled()
     if qemu_bridge_prog.found()
       qemu_bridge_path = qemu_bridge_prog.full_path()
     else
-      qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
+      qemu_bridge_path = libexecdir / 'qemu-bridge-helper'
     endif
     conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path)
Re: [PATCH v1] use libexecdir as location for qemu-bridge-helper
Posted by Andrea Bolognani 9 months, 3 weeks ago
On Tue, May 02, 2023 at 02:37:03PM +0200, Olaf Hering wrote:
> The current logic in meson.build assumes a fixed runtime path for
> qemu-bridge-helper in case this binary is not available during build.
> Since qemu-bridge-helper is not used during build it is not required to
> have it installed at build time.
>
> It is likely that both qemu and libvirt are built with the same
> --libexecdir option. So use this as the expected location for
> qemu-bridge-helper.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I have patches for turning these build time lookups into runtime
lookups almost ready. Please give me a few more days :)

-- 
Andrea Bolognani / Red Hat / Virtualization
Re: [PATCH v1] use libexecdir as location for qemu-bridge-helper
Posted by Olaf Hering 9 months, 3 weeks ago
Tue, 2 May 2023 14:47:20 +0100 Andrea Bolognani <abologna@redhat.com>:

> I have patches for turning these build time lookups into runtime lookups almost ready. 

I'm curious, and will wait for these changes to appear in #master.


Olaf