1. Patchew
  2. QEMU
  3. View series

[PATCH] meson: Use find_program() to resolve the entitlement.sh script

Philippe Mathieu-Daudé via posted 1 patch 2 years, 3 months ago
Test checkpatch failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220122002052.83745-1-f4bug@amsat.org
meson.build | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
[PATCH] meson: Use find_program() to resolve the entitlement.sh script
Posted by Philippe Mathieu-Daudé via 2 years, 3 months ago 
Using ../configure without any particular option generates 31 targets
on Darwin, and meson search for the entitlement.sh script 31 times:

  Program nm found: YES
  Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
  Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Configuring 50-edk2-i386-secure.json using configuration
  Configuring 50-edk2-x86_64-secure.json using configuration

Use find_program() which seems to cache the script path once found.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 meson.build | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 833fd6bc4c..355f4c1acf 100644
--- a/meson.build
+++ b/meson.build
@@ -3052,17 +3052,14 @@ foreach target : target_dirs
         install_input += meson.current_source_dir() / entitlements
       endif
 
+      entitlement = find_program('scripts/entitlement.sh')
       emulators += {exe['name'] : custom_target(exe['name'],
                    input: build_input,
                    output: exe['name'],
-                   command: [
-                     files('scripts/entitlement.sh'),
-                     '@OUTPUT@',
-                     '@INPUT@'
-                   ])
+                   command: [entitlement, '@OUTPUT@', '@INPUT@'])
       }
 
-      meson.add_install_script('scripts/entitlement.sh', '--install',
+      meson.add_install_script(entitlement, '--install',
                                get_option('bindir') / exe['name'],
                                install_input)
     else
-- 
2.34.1
Re: [PATCH] meson: Use find_program() to resolve the entitlement.sh script
Posted by Richard Henderson 2 years, 3 months ago 
On 1/22/22 11:20 AM, Philippe Mathieu-Daudé via wrote:
> Using ../configure without any particular option generates 31 targets
> on Darwin, and meson search for the entitlement.sh script 31 times:
> 
>    Program nm found: YES
>    Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
>    Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>    Configuring 50-edk2-i386-secure.json using configuration
>    Configuring 50-edk2-x86_64-secure.json using configuration
> 
> Use find_program() which seems to cache the script path once found.
> 
> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
> ---
>   meson.build | 9 +++------
>   1 file changed, 3 insertions(+), 6 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
Re: [PATCH] meson: Use find_program() to resolve the entitlement.sh script
Posted by Akihiko Odaki 2 years, 3 months ago 
On Mon, Jan 24, 2022 at 5:16 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 1/22/22 11:20 AM, Philippe Mathieu-Daudé via wrote:
> > Using ../configure without any particular option generates 31 targets
> > on Darwin, and meson search for the entitlement.sh script 31 times:
> >
> >    Program nm found: YES
> >    Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
> >    Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> >    Configuring 50-edk2-i386-secure.json using configuration
> >    Configuring 50-edk2-x86_64-secure.json using configuration
> >
> > Use find_program() which seems to cache the script path once found.
> >
> > Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
> > ---
> >   meson.build | 9 +++------
> >   1 file changed, 3 insertions(+), 6 deletions(-)
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>
> r~

Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Re: [PATCH] meson: Use find_program() to resolve the entitlement.sh script
Posted by Paolo Bonzini 2 years, 3 months ago 
On 1/24/22 10:04, Akihiko Odaki wrote:
> On Mon, Jan 24, 2022 at 5:16 PM Richard Henderson
> <richard.henderson@linaro.org> wrote:
>>
>> On 1/22/22 11:20 AM, Philippe Mathieu-Daudé via wrote:
>>> Using ../configure without any particular option generates 31 targets
>>> on Darwin, and meson search for the entitlement.sh script 31 times:
>>>
>>>     Program nm found: YES
>>>     Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
>>>     Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>>     Configuring 50-edk2-i386-secure.json using configuration
>>>     Configuring 50-edk2-x86_64-secure.json using configuration
>>>
>>> Use find_program() which seems to cache the script path once found.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
>>> ---
>>>    meson.build | 9 +++------
>>>    1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>>
>> r~
> 
> Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> 

Queued, thanks.

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.