[Xen-devel] [PATCH] tools: adjust rules for FLASK policy generation

[Doug Goldstein <cardoe@xxxxxxxxxx>]

Change the default on the --{enable,disable}-xsmpolicy configure switch
to disabled by default but always build the necessary utilities for
FLASK. The result is that the tools will always be built (and can be
omitted by the packager) but the policy won't always be generated and
installed if the tools are built. Previously the policy was always built
if the tools were built.

CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CC: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
CC: Ian Campbell <ian.campbell@xxxxxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
---
So this patch is a replacement for:
http://lists.xenproject.org/archives/html/xen-devel/2015-12/msg02538.html

This was to address concerns that the FLASK policy was now always built and
installed and would confuse users. Patches to handle this potential change
have been submitted in osstest have already been submitted to the ML. I
posted more rationale behind this on the other patch at:
http://lists.xenproject.org/archives/html/xen-devel/2016-01/msg01591.html
---
 tools/Makefile     | 2 +-
 tools/configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 9f74ac7..3f9289b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,7 +5,7 @@ SUBDIRS-y :=
 SUBDIRS-y += include
 SUBDIRS-y += libs
 SUBDIRS-y += libxc
-SUBDIRS-$(FLASK_ENABLE) += flask
+SUBDIRS-y += flask
 SUBDIRS-y += xenstore
 SUBDIRS-y += misc
 SUBDIRS-y += examples
diff --git a/tools/configure.ac b/tools/configure.ac
index 6c70040..e0fb862 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -80,7 +80,7 @@ AX_ARG_DEFAULT_DISABLE([rpath], [Build tools with 
-Wl,-rpath,LIBDIR])
 AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP])
 AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring 
tools])
 AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
-AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation])
+AX_ARG_DEFAULT_DISABLE([xsmpolicy], [Disable XSM policy compilation])
 AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
 AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
 
-- 
2.4.10


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel