[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 4/5] meson: unpack edk2 firmware even if --disable-blobs
From: |
Paolo Bonzini |
Subject: |
[PULL v2 4/5] meson: unpack edk2 firmware even if --disable-blobs |
Date: |
Sun, 26 Sep 2021 13:17:07 -0400 |
The edk2 firmware blobs are needed to run bios-tables-test. Unpack
them if any UEFI-enabled target is selected, so that the test can run.
This is a bit more than is actually necessary, since bios-tables-test
does not run for all UEFI-enabled targets, but it is the easiest
way to write this logic.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 16 ++++++++--------
pc-bios/descriptors/meson.build | 4 ++--
pc-bios/meson.build | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/meson.build b/meson.build
index 3945a6cc2d..e4bd1f9a5b 100644
--- a/meson.build
+++ b/meson.build
@@ -95,14 +95,14 @@ if targetos != 'darwin'
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
-
-bzip2 = find_program('bzip2', required: install_edk2_blobs)
+unpack_edk2_blobs = false
+foreach target : edk2_targets
+ if target in target_dirs
+ bzip2 = find_program('bzip2', required: get_option('install_blobs'))
+ unpack_edk2_blobs = bzip2.found()
+ break
+ endif
+endforeach
##################
# Compiler flags #
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build
index 29efa16d99..66f85d01c4 100644
--- a/pc-bios/descriptors/meson.build
+++ b/pc-bios/descriptors/meson.build
@@ -1,4 +1,4 @@
-if install_edk2_blobs
+if unpack_edk2_blobs and get_option('install_blobs')
foreach f: [
'50-edk2-i386-secure.json',
'50-edk2-x86_64-secure.json',
@@ -10,7 +10,7 @@ if install_edk2_blobs
configure_file(input: files(f),
output: f,
configuration: {'DATADIR': get_option('prefix') /
qemu_datadir},
- install: get_option('install_blobs'),
+ install: true,
install_dir: qemu_datadir / 'firmware')
endforeach
endif
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index f2b32598af..a3b3d87891 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -1,4 +1,4 @@
-if install_edk2_blobs
+if unpack_edk2_blobs
fds = [
'edk2-aarch64-code.fd',
'edk2-arm-code.fd',
--
2.27.0
- [PULL v2 0/5] Update meson version, Paolo Bonzini, 2021/09/26
- [PULL v2 1/5] meson: bump submodule to 0.58.2, Paolo Bonzini, 2021/09/26
- [PULL v2 3/5] hexagon: use env keyword argument to pass PYTHONPATH, Paolo Bonzini, 2021/09/26
- [PULL v2 2/5] meson: switch minimum meson version to 0.58.2, Paolo Bonzini, 2021/09/26
- [PULL v2 5/5] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs, Paolo Bonzini, 2021/09/26
- [PULL v2 4/5] meson: unpack edk2 firmware even if --disable-blobs,
Paolo Bonzini <=
- Re: [PULL v2 0/5] Update meson version, Peter Maydell, 2021/09/26