meson: Only install icons and qemu.desktop if have_system

[PATCH] meson: Only install icons and qemu.desktop if have_system

Posted by Bruce Rogers 5 years, 3 months ago

These files are not needed for a linux-user only install.

Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 ui/meson.build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/meson.build b/ui/meson.build
index 78ad792ffb..fb36d305ca 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -113,8 +113,11 @@ if have_system or xkbcommon.found()
 endif
 
 subdir('shader')
-subdir('icons')
 
-install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
+if have_system
+  subdir('icons')
+
+  install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
+endif
 
 modules += {'ui': ui_modules}
-- 
2.28.0

Re: [PATCH] meson: Only install icons and qemu.desktop if have_system

Posted by Paolo Bonzini 5 years, 3 months ago

On 15/10/20 22:18, Bruce Rogers wrote:
> These files are not needed for a linux-user only install.
> 
> Signed-off-by: Bruce Rogers <brogers@suse.com>
> ---
>  ui/meson.build | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/ui/meson.build b/ui/meson.build
> index 78ad792ffb..fb36d305ca 100644
> --- a/ui/meson.build
> +++ b/ui/meson.build
> @@ -113,8 +113,11 @@ if have_system or xkbcommon.found()
>  endif
>  
>  subdir('shader')
> -subdir('icons')
>  
> -install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
> +if have_system
> +  subdir('icons')
> +
> +  install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
> +endif
>  
>  modules += {'ui': ui_modules}
> 

Queued, thanks.

Paolo

Re: [PATCH] meson: Only install icons and qemu.desktop if have_system

Posted by Philippe Mathieu-Daudé 5 years, 3 months ago

Le jeu. 15 oct. 2020 22:22, Bruce Rogers <brogers@suse.com> a écrit :

> These files are not needed for a linux-user only install.


> Signed-off-by: Bruce Rogers <brogers@suse.com>
> ---
>  ui/meson.build | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/ui/meson.build b/ui/meson.build
> index 78ad792ffb..fb36d305ca 100644
> --- a/ui/meson.build
> +++ b/ui/meson.build
> @@ -113,8 +113,11 @@ if have_system or xkbcommon.found()
>  endif
>
>  subdir('shader')
> -subdir('icons')
>
> -install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
> +if have_system
>

Some tools could have an icon, QSD later?

For now:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

+  subdir('icons')
> +
> +  install_data('qemu.desktop', install_dir:
> config_host['qemu_desktopdir'])
> +endif
>
>  modules += {'ui': ui_modules}
> --
> 2.28.0
>
>
>

Re: [PATCH] meson: Only install icons and qemu.desktop if have_system

Posted by Daniel P. Berrangé 5 years, 3 months ago

On Fri, Oct 16, 2020 at 10:26:16AM +0200, Philippe Mathieu-Daudé wrote:
> Le jeu. 15 oct. 2020 22:22, Bruce Rogers <brogers@suse.com> a écrit :
> 
> > These files are not needed for a linux-user only install.
> 
> 
> > Signed-off-by: Bruce Rogers <brogers@suse.com>
> > ---
> >  ui/meson.build | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/ui/meson.build b/ui/meson.build
> > index 78ad792ffb..fb36d305ca 100644
> > --- a/ui/meson.build
> > +++ b/ui/meson.build
> > @@ -113,8 +113,11 @@ if have_system or xkbcommon.found()
> >  endif
> >
> >  subdir('shader')
> > -subdir('icons')
> >
> > -install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
> > +if have_system
> >
> 
> Some tools could have an icon, QSD later?

The icons are only needed for the tools with graphical display (ie SDL)
right now.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|