1. Patchew
  2. QEMU
  3. [PATCH v2 0/8] meson: Clarify summary
  4. View patch

[PATCH v2 7/8] meson: Display cryto-related information altogether

Philippe Mathieu-Daudé posted 8 patches 4 years, 10 months ago
[PATCH v2 7/8] meson: Display cryto-related information altogether
Posted by Philippe Mathieu-Daudé 4 years, 10 months ago 
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Daniel P. Berrange <berrange@redhat.com>
---
 meson.build | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index e372b69f163..9274775a81a 100644
--- a/meson.build
+++ b/meson.build
@@ -2453,19 +2453,8 @@
 endif
 summary(summary_info, bool_yn: true, section: 'Block layer support')
 
+# Crypto
 summary_info = {}
-summary_info += {'sparse enabled':    sparse.found()}
-if targetos == 'darwin'
-  summary_info += {'Cocoa support':   cocoa.found()}
-endif
-# TODO: add back version
-summary_info += {'SDL support':       sdl.found()}
-summary_info += {'SDL image support': sdl_image.found()}
-# TODO: add back version
-summary_info += {'GTK support':       gtk.found()}
-summary_info += {'pixman':            pixman.found()}
-# TODO: add back version
-summary_info += {'VTE support':       config_host.has_key('CONFIG_VTE')}
 summary_info += {'TLS priority':      config_host['CONFIG_TLS_PRIORITY']}
 summary_info += {'GNUTLS support':    config_host.has_key('CONFIG_GNUTLS')}
 # TODO: add back version
@@ -2479,6 +2468,24 @@
 if config_host.has_key('CONFIG_NETTLE')
    summary_info += {'  XTS':             not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
 endif
+summary_info += {'crypto afalg':      config_host.has_key('CONFIG_AF_ALG')}
+summary_info += {'rng-none':          config_host.has_key('CONFIG_RNG_NONE')}
+summary_info += {'Linux keyring':     config_host.has_key('CONFIG_SECRET_KEYRING')}
+summary(summary_info, bool_yn: true, section: 'Crypto')
+
+summary_info = {}
+summary_info += {'sparse enabled':    sparse.found()}
+if targetos == 'darwin'
+  summary_info += {'Cocoa support':   cocoa.found()}
+endif
+# TODO: add back version
+summary_info += {'SDL support':       sdl.found()}
+summary_info += {'SDL image support': sdl_image.found()}
+# TODO: add back version
+summary_info += {'GTK support':       gtk.found()}
+summary_info += {'pixman':            pixman.found()}
+# TODO: add back version
+summary_info += {'VTE support':       config_host.has_key('CONFIG_VTE')}
 summary_info += {'libtasn1':          config_host.has_key('CONFIG_TASN1')}
 summary_info += {'PAM':               config_host.has_key('CONFIG_AUTH_PAM')}
 summary_info += {'iconv support':     iconv.found()}
@@ -2531,7 +2538,6 @@
   summary_info += {'QGA MSI support':   config_host.has_key('CONFIG_QGA_MSI')}
 endif
 summary_info += {'seccomp support':   seccomp.found()}
-summary_info += {'crypto afalg':      config_host.has_key('CONFIG_AF_ALG')}
 summary_info += {'GlusterFS support': glusterfs.found()}
 summary_info += {'TPM support':       config_host.has_key('CONFIG_TPM')}
 summary_info += {'libssh support':    config_host.has_key('CONFIG_LIBSSH')}
@@ -2547,8 +2553,6 @@
 summary_info += {'libpmem support':   config_host.has_key('CONFIG_LIBPMEM')}
 summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
 summary_info += {'libudev':           libudev.found()}
-summary_info += {'rng-none':          config_host.has_key('CONFIG_RNG_NONE')}
-summary_info += {'Linux keyring':     config_host.has_key('CONFIG_SECRET_KEYRING')}
 summary(summary_info, bool_yn: true, section: 'Misc')
 
 if not supported_cpus.contains(cpu)
-- 
2.26.2
Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
Posted by Philippe Mathieu-Daudé 4 years, 10 months ago 
Typo "crypto" in subject =)

On 1/21/21 10:56 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Daniel P. Berrange <berrange@redhat.com>
> ---
>  meson.build | 34 +++++++++++++++++++---------------
>  1 file changed, 19 insertions(+), 15 deletions(-)
Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
Posted by Daniel P. Berrangé 4 years, 10 months ago 
On Thu, Jan 21, 2021 at 10:56:15AM +0100, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Daniel P. Berrange <berrange@redhat.com>
> ---
>  meson.build | 34 +++++++++++++++++++---------------
>  1 file changed, 19 insertions(+), 15 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index e372b69f163..9274775a81a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2453,19 +2453,8 @@
>  endif
>  summary(summary_info, bool_yn: true, section: 'Block layer support')
>  
> +# Crypto

Rather than a comment why not introduce grouping in the output
so it is visible when reading the summary.

This can be done in meson by calling summary() multiple times
giving "section: 'Crypto'"  arg.

>  summary_info = {}
> -summary_info += {'sparse enabled':    sparse.found()}
> -if targetos == 'darwin'
> -  summary_info += {'Cocoa support':   cocoa.found()}
> -endif
> -# TODO: add back version
> -summary_info += {'SDL support':       sdl.found()}
> -summary_info += {'SDL image support': sdl_image.found()}
> -# TODO: add back version
> -summary_info += {'GTK support':       gtk.found()}
> -summary_info += {'pixman':            pixman.found()}
> -# TODO: add back version
> -summary_info += {'VTE support':       config_host.has_key('CONFIG_VTE')}
>  summary_info += {'TLS priority':      config_host['CONFIG_TLS_PRIORITY']}
>  summary_info += {'GNUTLS support':    config_host.has_key('CONFIG_GNUTLS')}
>  # TODO: add back version
> @@ -2479,6 +2468,24 @@
>  if config_host.has_key('CONFIG_NETTLE')
>     summary_info += {'  XTS':             not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
>  endif
> +summary_info += {'crypto afalg':      config_host.has_key('CONFIG_AF_ALG')}
> +summary_info += {'rng-none':          config_host.has_key('CONFIG_RNG_NONE')}
> +summary_info += {'Linux keyring':     config_host.has_key('CONFIG_SECRET_KEYRING')}
> +summary(summary_info, bool_yn: true, section: 'Crypto')
> +
> +summary_info = {}
> +summary_info += {'sparse enabled':    sparse.found()}
> +if targetos == 'darwin'
> +  summary_info += {'Cocoa support':   cocoa.found()}
> +endif
> +# TODO: add back version
> +summary_info += {'SDL support':       sdl.found()}
> +summary_info += {'SDL image support': sdl_image.found()}
> +# TODO: add back version
> +summary_info += {'GTK support':       gtk.found()}
> +summary_info += {'pixman':            pixman.found()}
> +# TODO: add back version
> +summary_info += {'VTE support':       config_host.has_key('CONFIG_VTE')}
>  summary_info += {'libtasn1':          config_host.has_key('CONFIG_TASN1')}
>  summary_info += {'PAM':               config_host.has_key('CONFIG_AUTH_PAM')}
>  summary_info += {'iconv support':     iconv.found()}
> @@ -2531,7 +2538,6 @@
>    summary_info += {'QGA MSI support':   config_host.has_key('CONFIG_QGA_MSI')}
>  endif
>  summary_info += {'seccomp support':   seccomp.found()}
> -summary_info += {'crypto afalg':      config_host.has_key('CONFIG_AF_ALG')}
>  summary_info += {'GlusterFS support': glusterfs.found()}
>  summary_info += {'TPM support':       config_host.has_key('CONFIG_TPM')}
>  summary_info += {'libssh support':    config_host.has_key('CONFIG_LIBSSH')}
> @@ -2547,8 +2553,6 @@
>  summary_info += {'libpmem support':   config_host.has_key('CONFIG_LIBPMEM')}
>  summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
>  summary_info += {'libudev':           libudev.found()}
> -summary_info += {'rng-none':          config_host.has_key('CONFIG_RNG_NONE')}
> -summary_info += {'Linux keyring':     config_host.has_key('CONFIG_SECRET_KEYRING')}
>  summary(summary_info, bool_yn: true, section: 'Misc')
>  
>  if not supported_cpus.contains(cpu)
> -- 
> 2.26.2
> 

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 :|
Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
Posted by Daniel P. Berrangé 4 years, 10 months ago 
On Thu, Jan 21, 2021 at 10:11:32AM +0000, Daniel P. Berrangé wrote:
> On Thu, Jan 21, 2021 at 10:56:15AM +0100, Philippe Mathieu-Daudé wrote:
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> > Cc: Daniel P. Berrange <berrange@redhat.com>
> > ---
> >  meson.build | 34 +++++++++++++++++++---------------
> >  1 file changed, 19 insertions(+), 15 deletions(-)
> > 
> > diff --git a/meson.build b/meson.build
> > index e372b69f163..9274775a81a 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -2453,19 +2453,8 @@
> >  endif
> >  summary(summary_info, bool_yn: true, section: 'Block layer support')
> >  
> > +# Crypto
> 
> Rather than a comment why not introduce grouping in the output
> so it is visible when reading the summary.
> 
> This can be done in meson by calling summary() multiple times
> giving "section: 'Crypto'"  arg.

Sigh, I'm not very good at reading this morning. I see this
is in fact done in this patch, I just couldn't see it in the
diff :-(


...
> > +summary(summary_info, bool_yn: true, section: 'Crypto')


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 :|
Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
Posted by Philippe Mathieu-Daudé 4 years, 10 months ago 
On 1/21/21 11:13 AM, Daniel P. Berrangé wrote:
> On Thu, Jan 21, 2021 at 10:11:32AM +0000, Daniel P. Berrangé wrote:
>> On Thu, Jan 21, 2021 at 10:56:15AM +0100, Philippe Mathieu-Daudé wrote:
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> ---
>>> Cc: Daniel P. Berrange <berrange@redhat.com>
>>> ---
>>>  meson.build | 34 +++++++++++++++++++---------------
>>>  1 file changed, 19 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/meson.build b/meson.build
>>> index e372b69f163..9274775a81a 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -2453,19 +2453,8 @@
>>>  endif
>>>  summary(summary_info, bool_yn: true, section: 'Block layer support')
>>>  
>>> +# Crypto
>>
>> Rather than a comment why not introduce grouping in the output
>> so it is visible when reading the summary.
>>
>> This can be done in meson by calling summary() multiple times
>> giving "section: 'Crypto'"  arg.
> 
> Sigh, I'm not very good at reading this morning. I see this
> is in fact done in this patch, I just couldn't see it in the
> diff :-(

No worry, I should have describe this better in the commit
description.

> ...
>>> +summary(summary_info, bool_yn: true, section: 'Crypto')
> 
> 
> Regards,
> Daniel
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.