From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 1 Aug 2012 11:46:51 +0000 (+0100)
Subject: tools/config: Allow building of components to be controlled from .config
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8104
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f47d809c449a105b77fbc5fc6f058b24f8537a94;p=xen.git

tools/config: Allow building of components to be controlled from .config

For build systems which build certain Xen components separately, allow certain
components to be conditionally built based on .config, rather than always
building them.

This patch allows qemu and blktap to be configured in this manner.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/config/x86_32.mk b/config/x86_32.mk
index 1f5cd6097d..df52bd6d3e 100644
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -5,7 +5,7 @@ CONFIG_X86_$(XEN_OS) := y
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
-CONFIG_IOEMU := y
+CONFIG_IOEMU ?= y
 
 CFLAGS += -m32 -march=i686
 
diff --git a/config/x86_64.mk b/config/x86_64.mk
index 7bead5c455..4ec6cc196b 100644
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -6,7 +6,7 @@ CONFIG_COMPAT := y
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
-CONFIG_IOEMU := y
+CONFIG_IOEMU ?= y
 
 CFLAGS += -m64
 
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 2dd8ed3913..f4e84c1b77 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -40,9 +40,9 @@ LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN)
 SHLIB_libxenvchan  = -Wl,-rpath-link=$(XEN_LIBVCHAN)
 
 ifeq ($(CONFIG_Linux),y)
-LIBXL_BLKTAP = y
+LIBXL_BLKTAP ?= y
 else
-LIBXL_BLKTAP = n
+LIBXL_BLKTAP ?= n
 endif
 
 ifeq ($(LIBXL_BLKTAP),y)