From patchwork Thu Jan 14 21:43:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8035511 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3348C9F1C0 for ; Thu, 14 Jan 2016 21:47:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B056204EB for ; Thu, 14 Jan 2016 21:47:04 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DDD4204D9 for ; Thu, 14 Jan 2016 21:47:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aJpga-00066N-2N; Thu, 14 Jan 2016 21:44:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aJpgY-00066G-Fj for xen-devel@lists.xen.org; Thu, 14 Jan 2016 21:44:02 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 7E/B8-07165-1A618965; Thu, 14 Jan 2016 21:44:01 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1452807839!16872176!1 X-Originating-IP: [209.85.160.174] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5597 invoked from network); 14 Jan 2016 21:44:00 -0000 Received: from mail-yk0-f174.google.com (HELO mail-yk0-f174.google.com) (209.85.160.174) by server-12.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 14 Jan 2016 21:44:00 -0000 Received: by mail-yk0-f174.google.com with SMTP id a85so444764742ykb.1 for ; Thu, 14 Jan 2016 13:44:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=tPtuzYRQH9gn6+v0F0CsacvRlthrBY7+w1aNxJLS7TU=; b=1A8g9vVnrS/Nilz+9vo/D7nsehah4OevmxKVVhYFzogvycfqYC4qo+xNtt/JrvfFAY 9HAulo51NvgT8OfMKdlplCE7141ael+YMChr+LagvVoMFkb7cir8O88m7SpLBEsMu8Qu uQQO259WDvxT8pkIejb7881S2LwGeSDS3HBE0U+Su8O1AWjA92BuEhqU9+YFJZeFOR46 hOZ6huzVVhFdj1Pui8J4TvCl1510P1t1jTdm7mb53yZ5q3Io2+H5+LqXoqFpEfzbdlW7 owAYLOYRj3ULJxBmsxbzIujnbd1pVTdnq2ypAuIuhsx/JqrduJ5ipHQzlB0faPZYWftl +4zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tPtuzYRQH9gn6+v0F0CsacvRlthrBY7+w1aNxJLS7TU=; b=XB108g8q7hsyqpNQ4TC5mHi+G98D46hVBblfPG9VDhp5HxOxBR1USD08mKcCyPCiOd iuSK5iwVunK+EmetZwkrS8DitXerCpcPDrp/Tv1i5sIH+nNAhmds+2/Hu0OWRtKwqL1B N6Df4eYSTNjWpARsh1G+R3tMguftYUgeNO4PriVFIPukaEYw1+JdPqccFOEb84T5g6th 2uWoC9i0Nvk1DX9Qv50WQUIW3F5FHeLIFitgRE+ZlW2yG/VRpoQulv9fGMnv5UCVrgmt zNlW5E8IKE54e1MuuARoUcpdBbt6gyrIiD0ANIgqR3NImu2SGZcMN3Lana9XLn1xBIE9 LY5A== X-Gm-Message-State: ALoCoQm8tWi8nzUFJkXx+nsvnDKVkSXOlRYdvgFaCHxxvBi19VUrRoDCr3L+VQPcw0WUSil75I1I9+mODjtvCEIXV7PkcJrG3Q== X-Received: by 10.13.194.134 with SMTP id e128mr4767722ywd.57.1452807839577; Thu, 14 Jan 2016 13:43:59 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id g64sm5853229ywa.27.2016.01.14.13.43.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jan 2016 13:43:58 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Thu, 14 Jan 2016 15:43:55 -0600 Message-Id: <1452807835-7935-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Ian Jackson , Wei Liu , Doug Goldstein , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH] tools: adjust rules for FLASK policy generation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu Signed-off-by: Doug Goldstein --- 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])