[PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file

[PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file

[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

[PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled

[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

Re: [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled

[Andrew Cooper]

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

Re: [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file

[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.

-- 
Daniel De Graaf
National Security Agency

Re: [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file

[Vadim A. Misbakh-Soloviov]

[-- 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

Re: [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file

[Ian Campbell]

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.
> 

Re: [PATCH 1/2] Fixed flask policy's install path to avoid installing it as '/boot' file

[Vadim A. Misbakh-Soloviov]

[-- Attachment #1.1: Type: text/plain, Size: 272 bytes --]

30.07.2013 13:51, Ian Campbell wrote:
> 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.


So, V3? ;)


[-- 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