From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Laszlo Ersek <lersek@redhat.com>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>
Subject: Re: [PATCH 1/2] meson.build: Declare global edk2_targets / install_edk2_blobs variables
Date: Thu, 14 Jan 2021 20:57:26 +0100 [thread overview]
Message-ID: <dec726cf-5247-dcbe-914a-a54b0d4b2b03@redhat.com> (raw)
In-Reply-To: <a0990c43-c2f9-503d-782e-e4002709e53b@redhat.com>
On 1/14/21 8:49 PM, Laszlo Ersek wrote:
> On 01/14/21 18:45, Philippe Mathieu-Daudé wrote:
>> Globally declare in the main meson.build:
>> - the list of EDK2 targets,
>> - whether the EDK2 blobs have to be installed.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> Patch trivial to review using 'git-diff --ignore-all-space'
>> ---
>> meson.build | 8 ++++++++
>> pc-bios/descriptors/meson.build | 30 ++++++++++++++++--------------
>> pc-bios/meson.build | 5 +----
>> 3 files changed, 25 insertions(+), 18 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 3d889857a09..ecc45d04d6a 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -88,6 +88,14 @@
>> }
>> endif
>>
>> +edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ]
>> +install_edk2_blobs = false
>> +if get_option('install_blobs')
>> + foreach target : target_dirs
>> + install_edk2_blobs = install_edk2_blobs or target in edk2_targets
>> + endforeach
>> +endif
>> +
>> ##################
>> # Compiler flags #
>> ##################
>> diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build
>> index 7040834573d..ac6ec66b007 100644
>> --- a/pc-bios/descriptors/meson.build
>> +++ b/pc-bios/descriptors/meson.build
>> @@ -1,14 +1,16 @@
>> -foreach f: [
>> - '50-edk2-i386-secure.json',
>> - '50-edk2-x86_64-secure.json',
>> - '60-edk2-aarch64.json',
>> - '60-edk2-arm.json',
>> - '60-edk2-i386.json',
>> - '60-edk2-x86_64.json'
>> -]
>> - configure_file(input: files(f),
>> - output: f,
>> - configuration: {'DATADIR': qemu_datadir},
>> - install: get_option('install_blobs'),
>> - install_dir: qemu_datadir / 'firmware')
>> -endforeach
>> +if install_edk2_blobs
>> + foreach f: [
>> + '50-edk2-i386-secure.json',
>> + '50-edk2-x86_64-secure.json',
>> + '60-edk2-aarch64.json',
>> + '60-edk2-arm.json',
>> + '60-edk2-i386.json',
>> + '60-edk2-x86_64.json'
>> + ]
>> + configure_file(input: files(f),
>> + output: f,
>> + configuration: {'DATADIR': qemu_datadir},
>> + install: get_option('install_blobs'),
>> + install_dir: qemu_datadir / 'firmware')
>> + endforeach
>> +endif
>> diff --git a/pc-bios/meson.build b/pc-bios/meson.build
>> index fab323af84e..6a341b6cea0 100644
>> --- a/pc-bios/meson.build
>> +++ b/pc-bios/meson.build
>> @@ -1,7 +1,4 @@
>> -if 'arm-softmmu' in target_dirs or \
>> - 'aarch64-softmmu' in target_dirs or \
>> - 'i386-softmmu' in target_dirs or \
>> - 'x86_64-softmmu' in target_dirs
>> +if install_edk2_blobs
>> bzip2 = find_program('bzip2', required: true)
>> fds = [
>> 'edk2-aarch64-code.fd',
>>
>
> I vaguely understand what this patch does (I haven't followed the meson
> conversion), but I'm unsure why it does that.
>
> Is this patch useful in itself, or only in preparation for patch#2?
Well, something I forgot to mention is it disable the configure_file()
calls when arm/aarch64/i386/x86_64-softmmu targets are not selected.
(currently if you configure a restricted set of targets, such
--target-list=riscv64-softmmu,ppc-softmmu, it is called, and
the json descriptors files are installed, even if these targets
don't require them).
next prev parent reply other threads:[~2021-01-14 19:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 17:45 [PATCH 0/2] meson.build: Fix bzip2 program detection for EDK2 blobs installation Philippe Mathieu-Daudé
2021-01-14 17:45 ` [PATCH 1/2] meson.build: Declare global edk2_targets / install_edk2_blobs variables Philippe Mathieu-Daudé
2021-01-14 19:49 ` Laszlo Ersek
2021-01-14 19:57 ` Philippe Mathieu-Daudé [this message]
2021-01-14 20:05 ` Laszlo Ersek
2021-01-14 17:45 ` [PATCH 2/2] meson.build: Detect bzip2 program Philippe Mathieu-Daudé
2021-01-14 19:10 ` John Snow
2021-01-14 19:50 ` Laszlo Ersek
2021-01-14 19:46 ` [PATCH 0/2] meson.build: Fix bzip2 program detection for EDK2 blobs installation Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dec726cf-5247-dcbe-914a-a54b0d4b2b03@redhat.com \
--to=philmd@redhat.com \
--cc=jsnow@redhat.com \
--cc=lersek@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).