[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 130/142] meson: install edk2 json descriptors
From: |
Paolo Bonzini |
Subject: |
[PATCH 130/142] meson: install edk2 json descriptors |
Date: |
Tue, 28 Jan 2020 18:53:30 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile | 17 -----------------
pc-bios/descriptors/meson.build | 14 ++++++++++++++
pc-bios/meson.build | 2 ++
3 files changed, 16 insertions(+), 17 deletions(-)
create mode 100644 pc-bios/descriptors/meson.build
diff --git a/Makefile b/Makefile
index af635a3939..11e87a0c77 100644
--- a/Makefile
+++ b/Makefile
@@ -219,13 +219,6 @@ ar de en-us fi fr-be hr it lv nl
pl ru th \
de-ch es fo fr-ca hu ja mk pt sl tr \
bepo cz
-ifdef INSTALL_BLOBS
-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
-DESCS=
-endif
-
install-datadir:
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
@@ -239,16 +232,6 @@ endif
ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
install: all install-datadir install-localstatedir
-ifneq ($(DESCS),)
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware"
- set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \
- for x in $(DESCS); do \
- sed -e 's,@DATADIR@,$(qemu_datadir),' \
- "$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \
- $(INSTALL_DATA) "$$tmpf" \
- "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \
- done
-endif
for s in $(ICON_SIZES); do \
mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
$(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build
new file mode 100644
index 0000000000..7c715bace8
--- /dev/null
+++ b/pc-bios/descriptors/meson.build
@@ -0,0 +1,14 @@
+foreach f: [
+ '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'
+]
+ configure_file(input: files(f),
+ output: f,
+ configuration: {'DATADIR': config_host['qemu_datadir']},
+ install: install_blobs,
+ install_dir: config_host['qemu_datadir'] / 'firmware')
+endforeach
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 6988c81f51..e53a7ae521 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -25,6 +25,8 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
endforeach
endif
+subdir('descriptors')
+
blobs = files(
'QEMU,cgthree.bin',
'QEMU,tcx.bin',
--
2.21.0
- [PATCH 120/142] meson: generate systemtap tapset files, (continued)
- [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, 2020/01/28
- [PATCH 130/142] meson: install edk2 json descriptors,
Paolo Bonzini <=
- [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
- [PATCH 139/142] meson: convert check-block, Paolo Bonzini, 2020/01/28