| Message ID | 20201103112333.24734-1-mhartmay@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | meson: vhost-user-gpu/virtiofsd: use absolute path | expand |
On Tue, Nov 03, 2020 at 12:23 PM +0100, Marc Hartmayer <mhartmay@linux.ibm.com> wrote: > 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> > --- > 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 37ecca13cafb..c487ca72c1ff 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 e1a4dc98d9ec..17edecf55c0a 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.25.4 > > It’s probably not the best way to fix it, but at least a good hint what’s wrong :)
On 03/11/20 12:28, Marc Hartmayer wrote: > On Tue, Nov 03, 2020 at 12:23 PM +0100, Marc Hartmayer <mhartmay@linux.ibm.com> wrote: >> 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> >> --- >> 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 37ecca13cafb..c487ca72c1ff 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 e1a4dc98d9ec..17edecf55c0a 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.25.4 >> >> > > It’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
On Tue, Nov 03, 2020 at 12:55 PM +0100, Paolo Bonzini <pbonzini@redhat.com> wrote: > On 03/11/20 12:28, Marc Hartmayer wrote: >> On Tue, Nov 03, 2020 at 12:23 PM +0100, Marc Hartmayer <mhartmay@linux.ibm.com> wrote: >>> 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> >>> --- >>> 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 37ecca13cafb..c487ca72c1ff 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 e1a4dc98d9ec..17edecf55c0a 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.25.4 >>> >>> >> >> It’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. Thanks :) > > Paolo >
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build index 37ecca13cafb..c487ca72c1ff 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 e1a4dc98d9ec..17edecf55c0a 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')
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> --- contrib/vhost-user-gpu/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)