docs: don't install corresponding man page if guest agent is disabled

[PATCH] docs: don't install corresponding man page if guest agent is disabled

Stefan Reiter posted 1 patch 3 years, 3 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210128145801.14384-1-s.reiter@proxmox.com

docs/meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] docs: don't install corresponding man page if guest agent is disabled

Posted by Stefan Reiter 3 years, 3 months ago

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

Re: [PATCH] docs: don't install corresponding man page if guest agent is disabled

Posted by Paolo Bonzini 3 years, 3 months ago

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