* [PATCH] docs: don't install corresponding man page if guest agent is disabled
@ 2021-01-28 14:58 Stefan Reiter
2021-01-28 15:15 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Reiter @ 2021-01-28 14:58 UTC (permalink / raw)
To: qemu-trivial; +Cc: Paolo Bonzini, qemu-devel, Markus Armbruster, Peter Maydell
No sense outputting the qemu-ga and qemu-ga-ref man pages when the guest
agent binary itself is disabled. This mirrors behaviour from before the
meson switch.
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
docs/meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/docs/meson.build b/docs/meson.build
index bb14eaebd3..f84306ba7e 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -46,9 +46,11 @@ if build_docs
meson.source_root() / 'docs/sphinx/qmp_lexer.py',
qapi_gen_depends ]
+ have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT')
+
man_pages = {
- 'qemu-ga.8': (have_tools ? 'man8' : ''),
- 'qemu-ga-ref.7': 'man7',
+ 'qemu-ga.8': (have_ga ? 'man8' : ''),
+ 'qemu-ga-ref.7': (have_ga ? 'man7' : ''),
'qemu-qmp-ref.7': 'man7',
'qemu-storage-daemon-qmp-ref.7': (have_tools ? 'man7' : ''),
'qemu-img.1': (have_tools ? 'man1' : ''),
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] docs: don't install corresponding man page if guest agent is disabled
2021-01-28 14:58 [PATCH] docs: don't install corresponding man page if guest agent is disabled Stefan Reiter
@ 2021-01-28 15:15 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2021-01-28 15:15 UTC (permalink / raw)
To: Stefan Reiter, qemu-trivial; +Cc: Peter Maydell, qemu-devel, Markus Armbruster
On 28/01/21 15:58, Stefan Reiter wrote:
> No sense outputting the qemu-ga and qemu-ga-ref man pages when the guest
> agent binary itself is disabled. This mirrors behaviour from before the
> meson switch.
>
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
> docs/meson.build | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/docs/meson.build b/docs/meson.build
> index bb14eaebd3..f84306ba7e 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -46,9 +46,11 @@ if build_docs
> meson.source_root() / 'docs/sphinx/qmp_lexer.py',
> qapi_gen_depends ]
>
> + have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT')
> +
> man_pages = {
> - 'qemu-ga.8': (have_tools ? 'man8' : ''),
> - 'qemu-ga-ref.7': 'man7',
> + 'qemu-ga.8': (have_ga ? 'man8' : ''),
> + 'qemu-ga-ref.7': (have_ga ? 'man7' : ''),
> 'qemu-qmp-ref.7': 'man7',
> 'qemu-storage-daemon-qmp-ref.7': (have_tools ? 'man7' : ''),
> 'qemu-img.1': (have_tools ? 'man1' : ''),
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-28 15:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-28 14:58 [PATCH] docs: don't install corresponding man page if guest agent is disabled Stefan Reiter
2021-01-28 15:15 ` Paolo Bonzini
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).