build: Export configure variables to hypervisor build

Since the introduction of autoconf, builds with XSM enabled in .config
have been broken unless FLASK_ENABLE was explicitly set. Since the
setting in .config has apparently been deprecated in favor of an
autoconf --enable-xsm, add config/Xen.mk to export this to Xen. This
also makes --disable-debug and some paths to be pulled from the
configure process in the hypervisor build.

Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Committed-by: Keir Fraser <keir@xen.org>

diff --git a/.gitignore b/.gitignore
index 8810b35b54cb7ae7da319fcc8f64816efd18aff6..865505fb1e427662bb4bf5247d299512f4339d7a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,7 @@ tools/config.log
 tools/config.status
 tools/config.cache
 config/Tools.mk
+config/Xen.mk
 tools/blktap2/daemon/blktapctrl
 tools/blktap2/drivers/img2qcow
 tools/blktap2/drivers/lock-util

diff --git a/.hgignore b/.hgignore
index 46655adff6a669ccf71486fe5b680e2fe678e161..7d5ccc17f8c8c26b27cb9b246bab2d1aad6c2b07 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -309,6 +309,7 @@
 ^tools/config\.status$
 ^tools/config\.cache$
 ^config/Tools\.mk$
+^config/Xen\.mk$
 ^xen/\.banner.*$
 ^xen/BLOG$
 ^xen/System.map$

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 06d5e8974b99291e80d3941cdb0e75843086158f..315ced494557a64f593f5a043c64538909719f8b 100644 (file)
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -24,10 +24,6 @@ PREPEND_LIB         := @PREPEND_LIB@
 APPEND_INCLUDES     := @APPEND_INCLUDES@
 APPEND_LIB          := @APPEND_LIB@
 
-# Enable XSM security module (by default, Flask).
-XSM_ENABLE          := @xsm@
-FLASK_ENABLE        := @xsm@
-
 # Download GIT repositories via HTTP or GIT's own protocol?
 # GIT's protocol is faster and more robust, when it works at all (firewalls
 # may block it). We make it the default, but if your GIT repository downloads

diff --git a/config/Xen.mk.in b/config/Xen.mk.in
new file mode 100644 (file)
index 0000000..e152f39
--- /dev/null
+++ b/config/Xen.mk.in
@@ -0,0 +1,19 @@
+# Prefix and install folder
+PREFIX              := @prefix@
+LIBLEAFDIR_x86_64   := @LIB_PATH@
+
+# A debug build of xen?
+debug               := @debug@
+
+# Tools path
+PYTHON              := @PYTHON@
+
+# Extra folder for libs/includes
+PREPEND_INCLUDES    := @PREPEND_INCLUDES@
+PREPEND_LIB         := @PREPEND_LIB@
+APPEND_INCLUDES     := @APPEND_INCLUDES@
+APPEND_LIB          := @APPEND_LIB@
+
+# Enable XSM security module (by default, Flask).
+XSM_ENABLE          := @xsm@
+FLASK_ENABLE        := @xsm@

diff --git a/tools/configure.ac b/tools/configure.ac
index c5dec9c59fc3438dac2d5e85378080fb16e152cb..5b2815d16c21abbc7b4e28fe8794e490f62eb2aa 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -6,6 +6,7 @@ AC_INIT([Xen Hypervisor], m4_esyscmd([../version.sh ../xen/Makefile]),
     [xen-devel@lists.xensource.com])
 AC_CONFIG_SRCDIR([libxl/libxl.c])
 AC_CONFIG_FILES([../config/Tools.mk])
+AC_CONFIG_FILES([../config/Xen.mk])
 AC_CONFIG_HEADERS([config.h])
 AC_PREFIX_DEFAULT([/usr])
 AC_CONFIG_AUX_DIR([.])

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 6123835ec14bb05073200aab9fb89d1a38876639..6c17a3fad4e357537da26caf9017b6473e7b3a17 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -12,6 +12,7 @@ frame_pointer ?= n
 lto           ?= n
 
 include $(XEN_ROOT)/Config.mk
+include $(XEN_ROOT)/config/Xen.mk
 
 # Hardcoded configuration implications and dependencies.
 # Do this is a neater way if it becomes unwieldy.