[PATCH 123/132] meson: install edk2 json descriptors

[Paolo Bonzini]

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 b88110b..22f9883 100644
--- a/Makefile
+++ b/Makefile
@@ -222,13 +222,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)"
 
@@ -249,16 +242,6 @@ ifneq ($(vhost-user-json-y),)
                $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \
        done
 endif
-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 0000000..7c715ba
--- /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 dc7de21..75475a6 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -24,6 +24,8 @@ foreach f: fds
                 install_dir: config_host['qemu_datadir'])
 endforeach
 
+subdir('descriptors')
+
 blobs = files(
   'QEMU,cgthree.bin',
   'QEMU,tcx.bin',
-- 
1.8.3.1