[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 031/132] meson: configure 50-qemu-gpu.json
From: |
Paolo Bonzini |
Subject: |
[PATCH 031/132] meson: configure 50-qemu-gpu.json |
Date: |
Thu, 12 Dec 2019 13:51:15 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 7 +------
contrib/vhost-user-gpu/meson.build | 5 +++++
rules.mak | 7 -------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 7588467..0a6615c 100644
--- a/Makefile
+++ b/Makefile
@@ -118,13 +118,8 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-vhost-user-json-y =
HELPERS-y =
-ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
-vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
-endif
-
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt
docs/interop/qemu-qmp-ref.7
@@ -217,7 +212,7 @@ dummy := $(call unnest-vars,, \
include $(SRC_PATH)/tests/Makefile.include
-all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all
modules $(vhost-user-json-y)
+all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all
modules
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak
diff --git a/contrib/vhost-user-gpu/meson.build
b/contrib/vhost-user-gpu/meson.build
index 8778aa7..7303b6d 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -2,4 +2,9 @@ if 'CONFIG_VIRGL' in config_host and 'CONFIG_GBM' in config_host
executable('vhost-user-gpu', files('main.c', 'virgl.c', 'vugbm.c'),
link_with: libvhost_user,
dependencies: [qemuutil, pixman, gbm, virgl])
+
+ configure_file(input: '50-qemu-gpu.json.in',
+ output: '50-qemu-gpu.json',
+ configuration: config_host,
+ install_dir: config_host['qemu_datadir'] / 'vhost-user')
endif
diff --git a/rules.mak b/rules.mak
index fa9960c..5289184 100644
--- a/rules.mak
+++ b/rules.mak
@@ -393,10 +393,3 @@ TEXI2MAN = $(call quiet-command, \
$(call TEXI2MAN)
%.8:
$(call TEXI2MAN)
-
-GEN_SUBST = $(call quiet-command, \
- sed -e "s!@libexecdir@!$(libexecdir)!g" < $< > $@, \
- "GEN","$@")
-
-%.json: %.json.in
- $(call GEN_SUBST)
--
1.8.3.1
- [PATCH 022/132] meson: add msi generation, (continued)
- [PATCH 022/132] meson: add msi generation, Paolo Bonzini, 2019/12/12
- [PATCH 023/132] meson: add qemu-bridge-helper, Paolo Bonzini, 2019/12/12
- [PATCH 024/132] meson: add qemu-keymap, Paolo Bonzini, 2019/12/12
- [PATCH 025/132] meson: add qemu-edid, Paolo Bonzini, 2019/12/12
- [PATCH 009/132] libqemuutil: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 027/132] meson: keymap-gen, Paolo Bonzini, 2019/12/12
- [PATCH 029/132] meson: generate shader headers, Paolo Bonzini, 2019/12/12
- [PATCH 026/132] meson: add virtfs-proxy-helper, Paolo Bonzini, 2019/12/12
- [PATCH 028/132] meson: generate qemu-version.h, Paolo Bonzini, 2019/12/12
- [PATCH 030/132] meson: generate hxtool files, Paolo Bonzini, 2019/12/12
- [PATCH 031/132] meson: configure 50-qemu-gpu.json,
Paolo Bonzini <=
- [PATCH 032/132] meson: uncompress edk2 bios, Paolo Bonzini, 2019/12/12
- [PATCH 033/132] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2019/12/12
- [PATCH 035/132] meson: convert authz directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 034/132] meson: convert qom directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 036/132] meson: convert crypto directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 037/132] meson: convert io directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 039/132] meson: add macos dependencies, Paolo Bonzini, 2019/12/12
- [PATCH 038/132] meson: infrastructure for building emulators, Paolo Bonzini, 2019/12/12
- [PATCH 041/132] meson: convert chardev directory to Meson (tools part), Paolo Bonzini, 2019/12/12
- [PATCH 043/132] meson: qemu-{img,io,nbd}, Paolo Bonzini, 2019/12/12