1. Patchew
  2. QEMU
  3. View series

[PATCH] meson: install pc-bios blobs

marcandre.lureau@redhat.com posted 1 patch 3 years, 8 months ago
Test docker-quick@centos7 failed
Test docker-mingw@fedora failed
Test checkpatch failed
Test FreeBSD failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200826113432.534348-1-marcandre.lureau@redhat.com
Makefile            | 31 ----------------------
pc-bios/meson.build | 63 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 31 deletions(-)
[PATCH] meson: install pc-bios blobs
Posted by marcandre.lureau@redhat.com 3 years, 8 months ago 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 Makefile            | 31 ----------------------
 pc-bios/meson.build | 63 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 3ebd6929b4..be5acf10e6 100644
--- a/Makefile
+++ b/Makefile
@@ -229,32 +229,6 @@ distclean: clean ninja-distclean
 	rm -f linux-headers/asm
 	rm -Rf .sdk
 
-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 \
-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-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.bin \
-opensbi-riscv32-generic-fw_dynamic.elf opensbi-riscv64-generic-fw_dynamic.elf
-else
-BLOBS=
-endif
-
 install-datadir:
 	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
 
@@ -272,11 +246,6 @@ export DESTDIR
 install: all install-datadir install-localstatedir
 ifdef CONFIG_TRACE_SYSTEMTAP
 	$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
-endif
-ifneq ($(BLOBS),)
-	set -e; for x in $(BLOBS); do \
-		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \
-	done
 endif
 	for s in $(ICON_SIZES); do \
 		mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index c11e52ba26..8087e5c0a7 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -24,5 +24,68 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
   endforeach
 endif
 
+blobs = files(
+  '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',
+  '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-generic-fw_dynamic.bin',
+  'opensbi-riscv64-generic-fw_dynamic.bin',
+  'opensbi-riscv32-generic-fw_dynamic.elf',
+  'opensbi-riscv64-generic-fw_dynamic.elf',
+)
+
+if install_blobs
+  install_data(blobs, install_dir: config_host['qemu_datadir'])
+endif
+
 subdir('descriptors')
 subdir('keymaps')
-- 
2.26.2
Re: [PATCH] meson: install pc-bios blobs
Posted by Marc-André Lureau 3 years, 8 months ago 
Hi

On Wed, Aug 26, 2020 at 3:34 PM <marcandre.lureau@redhat.com> wrote:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  Makefile            | 31 ----------------------
>  pc-bios/meson.build | 63 +++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 63 insertions(+), 31 deletions(-)
>
>
I bit the bullet and included this patch in "[PATCH 0/6] meson: convert the
remaining of install target" series.

diff --git a/Makefile b/Makefile
> index 3ebd6929b4..be5acf10e6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -229,32 +229,6 @@ distclean: clean ninja-distclean
>         rm -f linux-headers/asm
>         rm -Rf .sdk
>
> -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 \
> -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-generic-fw_dynamic.bin
> opensbi-riscv64-generic-fw_dynamic.bin \
> -opensbi-riscv32-generic-fw_dynamic.elf
> opensbi-riscv64-generic-fw_dynamic.elf
> -else
> -BLOBS=
> -endif
> -
>  install-datadir:
>         $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
>
> @@ -272,11 +246,6 @@ export DESTDIR
>  install: all install-datadir install-localstatedir
>  ifdef CONFIG_TRACE_SYSTEMTAP
>         $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
> -endif
> -ifneq ($(BLOBS),)
> -       set -e; for x in $(BLOBS); do \
> -               $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x
> "$(DESTDIR)$(qemu_datadir)"; \
> -       done
>  endif
>         for s in $(ICON_SIZES); do \
>                 mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
> diff --git a/pc-bios/meson.build b/pc-bios/meson.build
> index c11e52ba26..8087e5c0a7 100644
> --- a/pc-bios/meson.build
> +++ b/pc-bios/meson.build
> @@ -24,5 +24,68 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
>    endforeach
>  endif
>
> +blobs = files(
> +  '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',
> +  '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-generic-fw_dynamic.bin',
> +  'opensbi-riscv64-generic-fw_dynamic.bin',
> +  'opensbi-riscv32-generic-fw_dynamic.elf',
> +  'opensbi-riscv64-generic-fw_dynamic.elf',
> +)
> +
> +if install_blobs
> +  install_data(blobs, install_dir: config_host['qemu_datadir'])
> +endif
> +
>  subdir('descriptors')
>  subdir('keymaps')
> --
> 2.26.2
>
>
>

-- 
Marc-André Lureau

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.