[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 129/142] meson: install blobs
From: |
Paolo Bonzini |
Subject: |
[PATCH 129/142] meson: install blobs |
Date: |
Tue, 28 Jan 2020 18:53:29 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile | 29 ---------------------
pc-bios/meson.build | 62 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 29 deletions(-)
diff --git a/Makefile b/Makefile
index e4b3470b36..af635a3939 100644
--- a/Makefile
+++ b/Makefile
@@ -220,33 +220,9 @@ de-ch es fo fr-ca hu ja mk pt sl tr \
bepo cz
ifdef INSTALL_BLOBS
-BLOBS=bios.bin bios-256k.bin bios-microvm.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
@@ -263,11 +239,6 @@ endif
ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
install: all install-datadir install-localstatedir
-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 792679d396..6988c81f51 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -24,3 +24,65 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
command: [ bzip2, '-dc', '@INPUT0@' ])
endforeach
endif
+
+blobs = files(
+ 'QEMU,cgthree.bin',
+ 'QEMU,tcx.bin',
+ 'bamboo.dtb',
+ 'bios-256k.bin',
+ 'bios.bin',
+ 'bios-microvm.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
--
2.21.0
- [PATCH 121/142] build-sys/rules.mak: remove version.o, (continued)
- [PATCH 121/142] build-sys/rules.mak: remove version.o, Paolo Bonzini, 2020/01/28
- [PATCH 119/142] Aaaaallelujah!, Paolo Bonzini, 2020/01/28
- [PATCH 122/142] remove Makefile.target, Paolo Bonzini, 2020/01/28
- [PATCH 123/142] meson: sphinx-build, Paolo Bonzini, 2020/01/28
- [PATCH 124/142] meson: generate version.texi, Paolo Bonzini, 2020/01/28
- [PATCH 126/142] meson: add NSIS building, Paolo Bonzini, 2020/01/28
- [PATCH 125/142] meson: build texi doc, Paolo Bonzini, 2020/01/28
- [PATCH 127/142] meson: install some scripts, Paolo Bonzini, 2020/01/28
- [PATCH 128/142] meson: install edk2, Paolo Bonzini, 2020/01/28
- [PATCH 130/142] meson: install edk2 json descriptors, Paolo Bonzini, 2020/01/28
- [PATCH 129/142] meson: install blobs,
Paolo Bonzini <=
- [PATCH 132/142] meson: install desktop file, Paolo Bonzini, 2020/01/28
- [PATCH 131/142] meson: install icons, Paolo Bonzini, 2020/01/28
- [PATCH 133/142] meson: convert pc-bios/keymaps/Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 134/142] meson: convert po/, Paolo Bonzini, 2020/01/28
- [PATCH 137/142] meson: convert pc-bios/optionrom, Paolo Bonzini, 2020/01/28
- [PATCH 136/142] meson: convert pc-bios/s390-ccw, Paolo Bonzini, 2020/01/28
- [PATCH 135/142] meson: replace mostly useless pc-bios/Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 138/142] rules.mak: drop unneeded macros, Paolo Bonzini, 2020/01/28
- [PATCH 139/142] meson: convert check-block, Paolo Bonzini, 2020/01/28
- [PATCH 140/142] meson: convert check-decodetree, Paolo Bonzini, 2020/01/28