| From 206d1b9c38daed50fcc08d2e743e649fbb82d60b Mon Sep 17 00:00:00 2001 |
| From: Laurent Vivier <laurent@vivier.eu> |
| Date: Tue, 5 Jun 2018 18:09:58 +0200 |
| Subject: [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper |
| build |
| |
| linux-user targets don't need them, and if we ask to build statically |
| linked binaries, some static libraries they need are not available. |
| |
| Signed-off-by: Laurent Vivier <laurent@vivier.eu> |
| Reviewed-by: Peter Maydell <peter.maydell@linaro.org> |
| Message-Id: <20180605160958.5434-1-laurent@vivier.eu> |
| |
| Upstream-Status: Pending |
| |
| |
| With the split of qemu-xilinx into target,native and system-native recipes, |
| we need to avoid duplicating providers for qemu-brigde-helper. |
| |
| Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> |
| |
| |
| --- |
| Makefile | 2 +- |
| tests/Makefile.include | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/Makefile b/Makefile |
| index 023b343..e4bc34a 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -351,7 +351,7 @@ $(call set-vpath, $(SRC_PATH)) |
| |
| LIBS+=-lz $(LIBS_TOOLS) |
| |
| -HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) |
| +HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) |
| |
| ifdef BUILD_DOCS |
| DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 |
| diff --git a/tests/Makefile.include b/tests/Makefile.include |
| index d098a10..10397ed 100644 |
| --- a/tests/Makefile.include |
| +++ b/tests/Makefile.include |
| @@ -930,7 +930,7 @@ check-report.html: check-report.xml |
| |
| # Other tests |
| |
| -QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF) |
| +QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) |
| |
| .PHONY: check-tests/qemu-iotests-quick.sh |
| check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) |
| -- |
| 2.7.4 |
| |