[PATCH 122/132] meson: install blobs

[Paolo Bonzini]

From: Marc-André Lureau <address@hidden>

Signed-off-by: Marc-André Lureau <address@hidden>
---
 Makefile            | 29 -------------------------
 pc-bios/meson.build | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index e961286..b88110b 100644
--- a/Makefile
+++ b/Makefile
@@ -223,33 +223,9 @@ de-ch  es     fo  fr-ca  hu     ja  mk  pt  sl     tr \
 bepo    cz
 
 ifdef INSTALL_BLOBS
-BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
-vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
-vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \
-ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin 
QEMU,cgthree.bin \
-pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
-pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
-efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
-efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \
-efi-e1000e.rom efi-vmxnet3.rom \
-qemu-nsis.bmp \
-bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
-multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \
-s390-ccw.img s390-netboot.img \
-slof.bin skiboot.lid \
-palcode-clipper \
-u-boot.e500 u-boot-sam460-20100605.bin \
-qemu_vga.ndrv \
-edk2-licenses.txt \
-hppa-firmware.img \
-opensbi-riscv32-virt-fw_jump.bin \
-opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin
-
-
 DESCS=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
 else
-BLOBS=
 DESCS=
 endif
 
@@ -273,11 +249,6 @@ ifneq ($(vhost-user-json-y),)
                $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \
        done
 endif
-ifneq ($(BLOBS),)
-       set -e; for x in $(BLOBS); do \
-               $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x 
"$(DESTDIR)$(qemu_datadir)"; \
-       done
-endif
 ifneq ($(DESCS),)
        $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware"
        set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 18201b0..dc7de21 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -23,3 +23,64 @@ foreach f: fds
                 install: install_blobs,
                 install_dir: config_host['qemu_datadir'])
 endforeach
+
+blobs = files(
+  'QEMU,cgthree.bin',
+  'QEMU,tcx.bin',
+  'bamboo.dtb',
+  'bios-256k.bin',
+  'bios.bin',
+  'canyonlands.dtb',
+  'edk2-licenses.txt',
+  'efi-e1000.rom',
+  'efi-e1000e.rom',
+  'efi-eepro100.rom',
+  'efi-ne2k_pci.rom',
+  'efi-pcnet.rom',
+  'efi-rtl8139.rom',
+  'efi-virtio.rom',
+  'efi-vmxnet3.rom',
+  'hppa-firmware.img',
+  'kvmvapic.bin',
+  'linuxboot.bin',
+  'linuxboot_dma.bin',
+  'multiboot.bin',
+  'openbios-ppc',
+  'openbios-sparc32',
+  'openbios-sparc64',
+  'opensbi-riscv32-virt-fw_jump.bin',
+  'opensbi-riscv64-sifive_u-fw_jump.bin',
+  'opensbi-riscv64-virt-fw_jump.bin',
+  'palcode-clipper',
+  'petalogix-ml605.dtb',
+  'petalogix-s3adsp1800.dtb',
+  'ppc_rom.bin',
+  'pvh.bin',
+  'pxe-e1000.rom',
+  'pxe-eepro100.rom',
+  'pxe-ne2k_pci.rom',
+  'pxe-pcnet.rom',
+  'pxe-rtl8139.rom',
+  'pxe-virtio.rom',
+  'qemu-nsis.bmp',
+  'qemu_vga.ndrv',
+  's390-ccw.img',
+  's390-netboot.img',
+  'sgabios.bin',
+  'skiboot.lid',
+  'slof.bin',
+  'u-boot-sam460-20100605.bin',
+  'u-boot.e500',
+  'vgabios-ati.bin',
+  'vgabios-bochs-display.bin',
+  'vgabios-cirrus.bin',
+  'vgabios-qxl.bin',
+  'vgabios-ramfb.bin',
+  'vgabios-stdvga.bin',
+  'vgabios-virtio.bin',
+  'vgabios-vmware.bin',
+)
+
+if install_blobs
+  install_data(blobs, install_dir: config_host['qemu_datadir'])
+endif
-- 
1.8.3.1