Skip to content

Commit

Permalink
meson.build: Declare global edk2_targets / install_edk2_blobs variables
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
philmd authored and bonzini committed Jan 23, 2021
1 parent 69a78cc commit eae9a1d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 18 deletions.
8 changes: 8 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ if cpu in ['x86', 'x86_64']
}
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 #
##################
Expand Down
30 changes: 16 additions & 14 deletions pc-bios/descriptors/meson.build
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions pc-bios/meson.build
Original file line number Diff line number Diff line change
@@ -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',
Expand Down

0 comments on commit eae9a1d

Please sign in to comment.