meson: vhost-user-gpu/virtiofsd: use absolute path
PATCH 1/1 meson: vhost-user-gpu/virtiofsd: use absolute path
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.
--- contrib/vhost-user-gpu/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
contrib/vhost-user-gpu/meson.build +1 -1
@@ -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
tools/virtiofsd/meson.build +1 -1
@@ -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')
Signature · 1 line
2.25.4
Quoted 40 lines · Marc Hartmayer
The option
libexecdiris relative toprefix(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 <[email protected]>--- contrib/vhost-user-gpu/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)contrib/vhost-user-gpu/meson.build +1
-1@@ -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') endiftools/virtiofsd/meson.build +1
-1@@ -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')Signature · 1 line
2.25.4
It’s probably not the best way to fix it, but at least a good hint what’s wrong :)
Signature · 8 lines
Kind regards / Beste Grüße Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
Quoted 32 lines · Marc Hartmayer
Quoted 31 lines · Marc Hartmayer
The option
libexecdiris relative toprefix(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 <[email protected]>--- contrib/vhost-user-gpu/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)contrib/vhost-user-gpu/meson.build +1
-1@@ -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') endiftools/virtiofsd/meson.build +0
-0@@ -15,5 +15,5 @@ executable('virtiofsd', files(
Quoted 12 lines
Quoted 9 lines
tools/virtiofsd/meson.build +1
-1configure_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')Signature · 1 line
2.25.4It’s probably not the best way to fix it, but at least a good hint what’s wrong :)
No, it's okay. I queued it.
Paolo
Quoted 46 lines · Paolo Bonzini
Quoted 32 lines · Marc Hartmayer
Quoted 31 lines · Marc Hartmayer
The option
libexecdiris relative toprefix(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 <[email protected]>--- contrib/vhost-user-gpu/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)contrib/vhost-user-gpu/meson.build +1
-1@@ -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') endiftools/virtiofsd/meson.build +0
-0@@ -15,5 +15,5 @@ executable('virtiofsd', files(Quoted 12 lines
Quoted 9 lines
tools/virtiofsd/meson.build +1
-1configure_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')Signature · 1 line
2.25.4It’s probably not the best way to fix it, but at least a good hint what’s wrong :)
Quoted 1 line
No, it's okay. I queued it.
Thanks :)
Quoted 3 lines
Paolo
Signature · 8 lines
Kind regards / Beste Grüße Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294