diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-16 03:32:52 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-26 07:08:39 -0400 |
| commit | c8d5450bba38560193f5648f5337199d797c5208 (patch) | |
| tree | 4cd1877ac74b4d7fa9375ceda37ab7cdf6faff3f /pc-bios | |
| parent | b37f357abfc5a52f613643502e93e0f453c79ef8 (diff) | |
| download | qemu-c8d5450bba38560193f5648f5337199d797c5208.zip qemu-c8d5450bba38560193f5648f5337199d797c5208.tar.gz qemu-c8d5450bba38560193f5648f5337199d797c5208.tar.bz2 | |
configure: move install_blobs from configure to meson
Move the conditions under which edk2 blobs are decompressed
and installed to pc-bios/meson.build.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/descriptors/meson.build | 2 | ||||
| -rw-r--r-- | pc-bios/meson.build | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build index a200e5e..7040834 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -9,6 +9,6 @@ foreach f: [ configure_file(input: files(f), output: f, configuration: {'DATADIR': qemu_datadir}, - install: install_blobs, + install: get_option('install_blobs'), install_dir: qemu_datadir / 'firmware') endforeach diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 03df50c..fab323a 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -1,7 +1,8 @@ -bzip2 = find_program('bzip2') - -install_blobs = 'INSTALL_BLOBS' in config_host -if 'DECOMPRESS_EDK2_BLOBS' in config_host +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 + bzip2 = find_program('bzip2', required: true) fds = [ 'edk2-aarch64-code.fd', 'edk2-arm-code.fd', @@ -18,7 +19,7 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host output: f, input: '@0@.bz2'.format(f), capture: true, - install: install_blobs, + install: get_option('install_blobs'), install_dir: qemu_datadir, command: [ bzip2, '-dc', '@INPUT0@' ]) endforeach @@ -85,7 +86,7 @@ blobs = files( 'npcm7xx_bootrom.bin', ) -if install_blobs +if get_option('install_blobs') install_data(blobs, install_dir: qemu_datadir) endif |