From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 10 Feb 2015 16:08:54 +0000 (-0500)
Subject: Makefile: QEMU build options.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=28a10beae1649961c6d3ccc3fa7a22a372707fa6;p=xentesttools%2Fbootstrap.git

Makefile: QEMU build options.

For Xen 4.4 and later we want to limit the amount of pieces of
code that qemu-xen is built with. It pulls in libSDL, libgtk, etc.

We also want to disable BLKTAP1 as we do not need it.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/Makefile b/Makefile
index d3df89e..fc06958 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ linux-distclean: linux-clean
 
 XEN_DISTDIR = xen/dist/install
 
-#XEN_MINOR = $(shell cat xen/xen/Makefile | grep XEN_SUBVERSION | head -1 |sed 's/.*= //g')
+XEN_MINOR = $(shell cat xen/xen/Makefile | grep XEN_SUBVERSION | head -1 |sed 's/.*= //g')
 
 xen-DISTRIB_TARGET = dist/common/xen.gz
 
@@ -179,7 +179,11 @@ xen-tools:
 	if [ -e xen/tools/firmware/seabios-dir ]; then \
 		$(MAKE) -C xen/tools/firmware/seabios-dir defconfig; \
 	fi
-	$(MAKE) -C xen IOEMU_CONFIGURE_CROSS="--disable-curses --disable-slirp --disable-sdl --disable-kvm --disable-vnc-tls" tools -j$$(($(NCPUS) * 2))
+	@if [ $(XEN_MINOR) -lt 4 ]; then \
+		$(MAKE) -C xen IOEMU_CONFIGURE_CROSS="--disable-curses --disable-slirp --disable-sdl --disable-kvm --disable-vnc-tls" tools -j$$(($(NCPUS) * 2)) \
++       ; else \
+		$(MAKE) -C xen CONFIG_QEMUU_EXTRA_ARGS="--disable-sdl --disable-gtk --disable-spice" CONFIG_BLKTAP1=n IOEMU_CONFIGURE_CROSS="--disable-curses --disable-slirp --disable-sdl --disable-kvm --disable-vnc-tls" tools -j$$(($(NCPUS) * 2)) \
+	; fi
 
 ifeq ($(NOXEN),1)
 .PHONY: xen-dist