* [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file
@ 2013-07-29 17:01 Vadim A. Misbakh-Soloviov
2013-07-29 17:01 ` [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled Vadim A. Misbakh-Soloviov
2013-07-29 17:18 ` [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Daniel De Graaf
0 siblings, 2 replies; 7+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-07-29 17:01 UTC (permalink / raw)
To: xen-devel; +Cc: Daniel De Graaf, Ian Campbell, Vadim A. Misbakh-Soloviov
From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
---
tools/flask/policy/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index e666f3e..d917231 100644
--- a/tools/flask/policy/Makefile
+++ b/tools/flask/policy/Makefile
@@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
all: $(POLICY_FILENAME)
install: $(POLICY_FILENAME)
+ $(INSTALL_DIR) $(DESTDIR)$(POLICY_LOADPATH)
$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
$(POLICY_FILENAME): policy.conf
--
1.8.3.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled
2013-07-29 17:01 [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Vadim A. Misbakh-Soloviov
@ 2013-07-29 17:01 ` Vadim A. Misbakh-Soloviov
2013-07-29 17:09 ` Andrew Cooper
2013-07-29 17:18 ` [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Daniel De Graaf
1 sibling, 1 reply; 7+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-07-29 17:01 UTC (permalink / raw)
To: xen-devel; +Cc: Daniel De Graaf, Ian Campbell, Vadim A. Misbakh-Soloviov
From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
---
tools/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/Makefile b/tools/Makefile
index e44a3e9..c2bcbda 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,7 +8,9 @@ endif
SUBDIRS-y :=
SUBDIRS-y += include
SUBDIRS-y += libxc
+ifeq($(FLASK_ENABLE),y)
SUBDIRS-y += flask
+endif
SUBDIRS-y += xenstore
SUBDIRS-y += misc
SUBDIRS-y += examples
--
1.8.3.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled
2013-07-29 17:01 ` [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled Vadim A. Misbakh-Soloviov
@ 2013-07-29 17:09 ` Andrew Cooper
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Cooper @ 2013-07-29 17:09 UTC (permalink / raw)
To: Vadim A. Misbakh-Soloviov; +Cc: Daniel De Graaf, Ian Campbell, xen-devel
On 29/07/13 18:01, Vadim A. Misbakh-Soloviov wrote:
> From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
>
> Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
> ---
> tools/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/Makefile b/tools/Makefile
> index e44a3e9..c2bcbda 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -8,7 +8,9 @@ endif
> SUBDIRS-y :=
> SUBDIRS-y += include
> SUBDIRS-y += libxc
> +ifeq($(FLASK_ENABLE),y)
> SUBDIRS-y += flask
> +endif
SUBDIRS-$(FLASK_ENABLE) += flask
Is the preferred way of doing this.
~Andrew
> SUBDIRS-y += xenstore
> SUBDIRS-y += misc
> SUBDIRS-y += examples
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file
2013-07-29 17:01 [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Vadim A. Misbakh-Soloviov
2013-07-29 17:01 ` [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled Vadim A. Misbakh-Soloviov
@ 2013-07-29 17:18 ` Daniel De Graaf
2013-07-29 17:20 ` Vadim A. Misbakh-Soloviov
2013-07-30 9:51 ` Ian Campbell
1 sibling, 2 replies; 7+ messages in thread
From: Daniel De Graaf @ 2013-07-29 17:18 UTC (permalink / raw)
To: Vadim A. Misbakh-Soloviov; +Cc: Ian Campbell, xen-devel
On 07/29/2013 01:01 PM, Vadim A. Misbakh-Soloviov wrote:
> From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
>
> Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
> ---
> tools/flask/policy/Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
> index e666f3e..d917231 100644
> --- a/tools/flask/policy/Makefile
> +++ b/tools/flask/policy/Makefile
> @@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
> all: $(POLICY_FILENAME)
>
> install: $(POLICY_FILENAME)
> + $(INSTALL_DIR) $(DESTDIR)$(POLICY_LOADPATH)
> $(INSTALL_DATA) $^ $(POLICY_LOADPATH)
>
> $(POLICY_FILENAME): policy.conf
>
POLICY_LOADPATH is defined as $(DESTDIR)/boot, so this expands to:
$(INSTALL_DIR) $(DESTDIR)$(DESTDIR)/boot
I believe the correct fix is to instead add:
$(INSTALL_DIR) $(POLICY_LOADPATH)
With that change, this patch is
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Patch 2/2 looks correct as-is or with Andrew's cleanup.
--
Daniel De Graaf
National Security Agency
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file
2013-07-29 17:18 ` [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Daniel De Graaf
@ 2013-07-29 17:20 ` Vadim A. Misbakh-Soloviov
2013-07-30 9:51 ` Ian Campbell
1 sibling, 0 replies; 7+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-07-29 17:20 UTC (permalink / raw)
To: Daniel De Graaf; +Cc: Ian Campbell, xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 1261 bytes --]
Okay, thanks.
So, Can I just ammend commits and resend both patches again? :)
29.07.2013 21:18, Daniel De Graaf пишет:
> On 07/29/2013 01:01 PM, Vadim A. Misbakh-Soloviov wrote:
>> From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
>>
>> Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
>> ---
>> tools/flask/policy/Makefile | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
>> index e666f3e..d917231 100644
>> --- a/tools/flask/policy/Makefile
>> +++ b/tools/flask/policy/Makefile
>> @@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS)
>> $(ISID_DEFS)
>> all: $(POLICY_FILENAME)
>>
>> install: $(POLICY_FILENAME)
>> + $(INSTALL_DIR) $(DESTDIR)$(POLICY_LOADPATH)
>> $(INSTALL_DATA) $^ $(POLICY_LOADPATH)
>>
>> $(POLICY_FILENAME): policy.conf
>>
>
> POLICY_LOADPATH is defined as $(DESTDIR)/boot, so this expands to:
> $(INSTALL_DIR) $(DESTDIR)$(DESTDIR)/boot
>
> I believe the correct fix is to instead add:
> $(INSTALL_DIR) $(POLICY_LOADPATH)
>
> With that change, this patch is
>
> Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
>
> Patch 2/2 looks correct as-is or with Andrew's cleanup.
>
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file
2013-07-29 17:18 ` [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Daniel De Graaf
2013-07-29 17:20 ` Vadim A. Misbakh-Soloviov
@ 2013-07-30 9:51 ` Ian Campbell
2013-07-30 11:35 ` Vadim A. Misbakh-Soloviov
1 sibling, 1 reply; 7+ messages in thread
From: Ian Campbell @ 2013-07-30 9:51 UTC (permalink / raw)
To: Daniel De Graaf; +Cc: xen-devel, Vadim A. Misbakh-Soloviov
On Mon, 2013-07-29 at 13:18 -0400, Daniel De Graaf wrote:
> On 07/29/2013 01:01 PM, Vadim A. Misbakh-Soloviov wrote:
> > From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
> >
> > Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
> > ---
> > tools/flask/policy/Makefile | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
> > index e666f3e..d917231 100644
> > --- a/tools/flask/policy/Makefile
> > +++ b/tools/flask/policy/Makefile
> > @@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
> > all: $(POLICY_FILENAME)
> >
> > install: $(POLICY_FILENAME)
> > + $(INSTALL_DIR) $(DESTDIR)$(POLICY_LOADPATH)
> > $(INSTALL_DATA) $^ $(POLICY_LOADPATH)
> >
> > $(POLICY_FILENAME): policy.conf
> >
>
> POLICY_LOADPATH is defined as $(DESTDIR)/boot, so this expands to:
> $(INSTALL_DIR) $(DESTDIR)$(DESTDIR)/boot
>
> I believe the correct fix is to instead add:
> $(INSTALL_DIR) $(POLICY_LOADPATH)
>
> With that change, this patch is
>
> Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
I think it would be a bit less surprising for drive by patchers etc to
remove the DESTDIR from POLICY_LOADPATH and add it to the install
target, which is the usual way to do things. Up to you/Vadim though.
>
> Patch 2/2 looks correct as-is or with Andrew's cleanup.
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-07-30 11:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-29 17:01 [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Vadim A. Misbakh-Soloviov
2013-07-29 17:01 ` [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled Vadim A. Misbakh-Soloviov
2013-07-29 17:09 ` Andrew Cooper
2013-07-29 17:18 ` [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file Daniel De Graaf
2013-07-29 17:20 ` Vadim A. Misbakh-Soloviov
2013-07-30 9:51 ` Ian Campbell
2013-07-30 11:35 ` Vadim A. Misbakh-Soloviov
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).