patchbot at xen
Aug 1, 2012, 2:11 PM
Post #1 of 1
(38 views)
Permalink
|
|
[xen-unstable] tools/config: Allow building of components to be controlled from .config
|
|
# HG changeset patch
# User Andrew Cooper <andrew.cooper3 [at] citrix>
# Date 1343821611 -3600
# Node ID d801c1c1fec8b5d2b27b519d61f884e714405460
# Parent 9d52ee4e4e6f15ba3215c72bee0a58dc0c177379
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 [at] citrix>
Acked-by: Ian Jackson <ian.jackson [at] eu>
Committed-by: Ian Campbell <ian.campbell [at] citrix>
---
diff -r 9d52ee4e4e6f -r d801c1c1fec8 config/x86_32.mk
--- a/config/x86_32.mk Wed Aug 01 12:46:50 2012 +0100
+++ b/config/x86_32.mk Wed Aug 01 12:46:51 2012 +0100
@@ -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 -r 9d52ee4e4e6f -r d801c1c1fec8 config/x86_64.mk
--- a/config/x86_64.mk Wed Aug 01 12:46:50 2012 +0100
+++ b/config/x86_64.mk Wed Aug 01 12:46:51 2012 +0100
@@ -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 -r 9d52ee4e4e6f -r d801c1c1fec8 tools/Rules.mk
--- a/tools/Rules.mk Wed Aug 01 12:46:50 2012 +0100
+++ b/tools/Rules.mk Wed Aug 01 12:46:51 2012 +0100
@@ -40,9 +40,9 @@ LDLIBS_libxenvchan = $(SHLIB_libxenctrl)
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)
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
