* [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION)
@ 2014-09-15 19:29 Wei Liu
2014-09-16 10:06 ` Wei Liu
2014-09-16 15:03 ` Daniel De Graaf
0 siblings, 2 replies; 4+ messages in thread
From: Wei Liu @ 2014-09-15 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Daniel De Graaf, Wei Liu, Ian Campbell
Daniel suggested we use xenpolicy-$(XEN_FULLVERSION) as flask policy
naming convention.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Cc: Ian Campbell <ian.campbell@citrix.com>
---
.gitignore | 2 +-
tools/flask/policy/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6d725aa..e5ad43d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -272,7 +272,7 @@ xen/xsm/flask/include/class_to_string.h
xen/xsm/flask/include/flask.h
xen/xsm/flask/include/initial_sid_to_string.h
tools/flask/policy/policy.conf
-tools/flask/policy/xenpolicy.24
+tools/flask/policy/xenpolicy-*
xen/xen
xen/xen-syms
xen/xen.*
diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index a1c0f11..5d8cfbf 100644
--- a/tools/flask/policy/Makefile
+++ b/tools/flask/policy/Makefile
@@ -32,7 +32,7 @@ M4 ?= m4
# include the Xen policy type (needed for static device policy).
OUTPUT_POLICY = 24
-POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY)
+POLICY_FILENAME = xenpolicy-$(shell $(MAKE) -C $(XEN_ROOT)/xen xenversion --no-print-directory)
POLICY_LOADPATH = /boot
# policy source layout
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION)
2014-09-15 19:29 [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION) Wei Liu
@ 2014-09-16 10:06 ` Wei Liu
2014-09-16 15:03 ` Daniel De Graaf
1 sibling, 0 replies; 4+ messages in thread
From: Wei Liu @ 2014-09-16 10:06 UTC (permalink / raw)
To: xen-devel; +Cc: Daniel De Graaf, Wei Liu, Ian Campbell
Ian, I forgot to label this for 4.5. Sorry.
Daniel, can you ack / nack this patch if you have time? We are
approaching freeze. However small this patch is we'd better get it in
sooner rather than later.
Wei.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION)
2014-09-15 19:29 [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION) Wei Liu
2014-09-16 10:06 ` Wei Liu
@ 2014-09-16 15:03 ` Daniel De Graaf
2014-09-24 9:16 ` Ian Campbell
1 sibling, 1 reply; 4+ messages in thread
From: Daniel De Graaf @ 2014-09-16 15:03 UTC (permalink / raw)
To: Wei Liu, xen-devel; +Cc: Ian Campbell
On 09/15/2014 03:29 PM, Wei Liu wrote:
> Daniel suggested we use xenpolicy-$(XEN_FULLVERSION) as flask policy
> naming convention.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
> Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
> ---
> .gitignore | 2 +-
> tools/flask/policy/Makefile | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index 6d725aa..e5ad43d 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -272,7 +272,7 @@ xen/xsm/flask/include/class_to_string.h
> xen/xsm/flask/include/flask.h
> xen/xsm/flask/include/initial_sid_to_string.h
> tools/flask/policy/policy.conf
> -tools/flask/policy/xenpolicy.24
> +tools/flask/policy/xenpolicy-*
> xen/xen
> xen/xen-syms
> xen/xen.*
> diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
> index a1c0f11..5d8cfbf 100644
> --- a/tools/flask/policy/Makefile
> +++ b/tools/flask/policy/Makefile
> @@ -32,7 +32,7 @@ M4 ?= m4
> # include the Xen policy type (needed for static device policy).
> OUTPUT_POLICY = 24
>
> -POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY)
> +POLICY_FILENAME = xenpolicy-$(shell $(MAKE) -C $(XEN_ROOT)/xen xenversion --no-print-directory)
> POLICY_LOADPATH = /boot
>
> # policy source layout
>
--
Daniel De Graaf
National Security Agency
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION)
2014-09-16 15:03 ` Daniel De Graaf
@ 2014-09-24 9:16 ` Ian Campbell
0 siblings, 0 replies; 4+ messages in thread
From: Ian Campbell @ 2014-09-24 9:16 UTC (permalink / raw)
To: Daniel De Graaf; +Cc: Wei Liu, xen-devel
On Tue, 2014-09-16 at 11:03 -0400, Daniel De Graaf wrote:
> On 09/15/2014 03:29 PM, Wei Liu wrote:
> > Daniel suggested we use xenpolicy-$(XEN_FULLVERSION) as flask policy
> > naming convention.
> >
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
>
> Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-24 9:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-15 19:29 [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION) Wei Liu
2014-09-16 10:06 ` Wei Liu
2014-09-16 15:03 ` Daniel De Graaf
2014-09-24 9:16 ` Ian Campbell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).