* [PATCH] meson: Only install icons and qemu.desktop if have_system
@ 2020-10-15 20:18 Bruce Rogers
2020-10-16 7:35 ` Paolo Bonzini
2020-10-16 8:26 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: Bruce Rogers @ 2020-10-15 20:18 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, berrange, kraxel, Bruce Rogers
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] meson: Only install icons and qemu.desktop if have_system
2020-10-15 20:18 [PATCH] meson: Only install icons and qemu.desktop if have_system Bruce Rogers
@ 2020-10-16 7:35 ` Paolo Bonzini
2020-10-16 8:26 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2020-10-16 7:35 UTC (permalink / raw)
To: Bruce Rogers, qemu-devel; +Cc: berrange, kraxel
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] meson: Only install icons and qemu.desktop if have_system
2020-10-15 20:18 [PATCH] meson: Only install icons and qemu.desktop if have_system Bruce Rogers
2020-10-16 7:35 ` Paolo Bonzini
@ 2020-10-16 8:26 ` Philippe Mathieu-Daudé
2020-10-19 8:11 ` Daniel P. Berrangé
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-16 8:26 UTC (permalink / raw)
To: Bruce Rogers
Cc: Paolo Bonzini, berrange, qemu-devel@nongnu.org Developers, kraxel
[-- Attachment #1: Type: text/plain, Size: 929 bytes --]
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
>
>
>
[-- Attachment #2: Type: text/html, Size: 1918 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] meson: Only install icons and qemu.desktop if have_system
2020-10-16 8:26 ` Philippe Mathieu-Daudé
@ 2020-10-19 8:11 ` Daniel P. Berrangé
0 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrangé @ 2020-10-19 8:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, kraxel, qemu-devel@nongnu.org Developers,
Bruce Rogers
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 :|
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-19 8:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-15 20:18 [PATCH] meson: Only install icons and qemu.desktop if have_system Bruce Rogers
2020-10-16 7:35 ` Paolo Bonzini
2020-10-16 8:26 ` Philippe Mathieu-Daudé
2020-10-19 8:11 ` Daniel P. Berrangé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).