diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-01-14 18:45:08 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-23 15:55:06 -0500 |
| commit | eae9a1d18beb2bfe42fc48330a009339dc7e8eee (patch) | |
| tree | 19892d604bd34828ecced793ca522280bbcf13c2 /pc-bios | |
| parent | 69a78ccea9964190dd1f1d053a975fad1395b0aa (diff) | |
meson.build: Declare global edk2_targets / install_edk2_blobs variables
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>
Message-Id: <20210114174509.2944817-2-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/descriptors/meson.build | 30 | ||||
| -rw-r--r-- | pc-bios/meson.build | 5 |
2 files changed, 17 insertions, 18 deletions
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build index 7040834573..ac6ec66b00 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 fab323af84..6a341b6cea 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', |