[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 128/142] meson: install edk2
From: |
Paolo Bonzini |
Subject: |
[PATCH 128/142] meson: install edk2 |
Date: |
Tue, 28 Jan 2020 18:53:28 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile | 9 +--------
pc-bios/meson.build | 3 +++
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 98582518a8..e4b3470b36 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,6 @@ CONFIG_BLOCK := $(call
lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
generated-files-y += .git-submodule-status
-edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2))
# Don't try to regenerate Makefile or configure
# We don't generate any of them
Makefile: ;
@@ -263,18 +262,12 @@ endif
ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
-install: all install-datadir install-localstatedir \
- $(if $(INSTALL_BLOBS),$(edk2-decompressed))
+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
-ifdef INSTALL_BLOBS
- set -e; for x in $(edk2-decompressed); do \
- $(INSTALL_DATA) $$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 8a3d335545..792679d396 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -1,5 +1,6 @@
bzip2 = find_program('bzip2')
+install_blobs = 'INSTALL_BLOBS' in config_host
if 'DECOMPRESS_EDK2_BLOBS' in config_host
fds = [
'edk2-aarch64-code.fd',
@@ -18,6 +19,8 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
input: '@0@.bz2'.format(f),
capture: true,
build_by_default: true,
+ install: install_blobs,
+ install_dir: config_host['qemu_datadir'],
command: [ bzip2, '-dc', '@INPUT0@' ])
endforeach
endif
--
2.21.0
- [PATCH 118/142] meson: plugins, (continued)
- [PATCH 118/142] meson: plugins, Paolo Bonzini, 2020/01/28
- [PATCH 120/142] meson: generate systemtap tapset files, Paolo Bonzini, 2020/01/28
- [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 <=
- [PATCH 130/142] meson: install edk2 json descriptors, Paolo Bonzini, 2020/01/28
- [PATCH 129/142] meson: install blobs, Paolo Bonzini, 2020/01/28
- [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