[Patch V3 1/3] Fixed flask policy's install path to avoid installing it as '/boot' file

[Patch V3 1/3] 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..df1e8f3 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) $(POLICY_LOADPATH)
 	$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
 
 $(POLICY_FILENAME): policy.conf
-- 
1.8.3.2

[Patch V3 2/3] 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, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Makefile b/tools/Makefile
index e44a3e9..6791829 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,7 +8,7 @@ endif
 SUBDIRS-y :=
 SUBDIRS-y += include
 SUBDIRS-y += libxc
-SUBDIRS-y += flask
+SUBDIRS-$(FLASK_ENABLE) += flask
 SUBDIRS-y += xenstore
 SUBDIRS-y += misc
 SUBDIRS-y += examples
-- 
1.8.3.2

[Patch V3 3/3] Fixed policy Makefile with Ian Campbell advice:

[Vadim A. Misbakh-Soloviov]

From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>

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.

Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
---
 tools/flask/policy/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index df1e8f3..a1c0f11 100644
--- a/tools/flask/policy/Makefile
+++ b/tools/flask/policy/Makefile
@@ -33,7 +33,7 @@ M4 ?= m4
 OUTPUT_POLICY = 24
 
 POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY)
-POLICY_LOADPATH = $(DESTDIR)/boot
+POLICY_LOADPATH = /boot
 
 # policy source layout
 POLDIR := policy
@@ -103,8 +103,8 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
 all: $(POLICY_FILENAME)
 
 install: $(POLICY_FILENAME)
-	$(INSTALL_DIR) $(POLICY_LOADPATH)
-	$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
+	$(INSTALL_DIR) $(DESTDIR)/$(POLICY_LOADPATH)
+	$(INSTALL_DATA) $^ $(DESTDIR)/$(POLICY_LOADPATH)
 
 $(POLICY_FILENAME): policy.conf
 	$(CHECKPOLICY) $(CHECKPOLICY_PARAM) $^ -o $@
-- 
1.8.3.2

Re: [Patch V3 3/3] Fixed policy Makefile with Ian Campbell advice:

[Ian Campbell]

On Tue, 2013-07-30 at 16:34 +0400, Vadim A. Misbakh-Soloviov wrote:
> From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
> 
> 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.
> 
> Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>

Looks good to me, I'll give Daniel a chance to object though.

Ian.

> ---
>  tools/flask/policy/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
> index df1e8f3..a1c0f11 100644
> --- a/tools/flask/policy/Makefile
> +++ b/tools/flask/policy/Makefile
> @@ -33,7 +33,7 @@ M4 ?= m4
>  OUTPUT_POLICY = 24
>  
>  POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY)
> -POLICY_LOADPATH = $(DESTDIR)/boot
> +POLICY_LOADPATH = /boot
>  
>  # policy source layout
>  POLDIR := policy
> @@ -103,8 +103,8 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
>  all: $(POLICY_FILENAME)
>  
>  install: $(POLICY_FILENAME)
> -	$(INSTALL_DIR) $(POLICY_LOADPATH)
> -	$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
> +	$(INSTALL_DIR) $(DESTDIR)/$(POLICY_LOADPATH)
> +	$(INSTALL_DATA) $^ $(DESTDIR)/$(POLICY_LOADPATH)
>  
>  $(POLICY_FILENAME): policy.conf
>  	$(CHECKPOLICY) $(CHECKPOLICY_PARAM) $^ -o $@

Re: [Patch V3 3/3] Fixed policy Makefile with Ian Campbell advice:

[Daniel De Graaf]

On 07/30/2013 09:16 AM, Ian Campbell wrote:
> On Tue, 2013-07-30 at 16:34 +0400, Vadim A. Misbakh-Soloviov wrote:
>> From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
>>
>> 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.
>>
>> Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
>
> Looks good to me, I'll give Daniel a chance to object though.
>
> Ian.

Also looks good to me. It ends up being $(DESTDIR)//boot, but that's
rather harmless.

Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>

I have already acked patch 1; if you send additional versions of the series
with these patches, you can add the Acked-by: line below your Signed-off-by:
to reflect this.

>
>> ---
>>   tools/flask/policy/Makefile | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
>> index df1e8f3..a1c0f11 100644
>> --- a/tools/flask/policy/Makefile
>> +++ b/tools/flask/policy/Makefile
>> @@ -33,7 +33,7 @@ M4 ?= m4
>>   OUTPUT_POLICY = 24
>>
>>   POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY)
>> -POLICY_LOADPATH = $(DESTDIR)/boot
>> +POLICY_LOADPATH = /boot
>>
>>   # policy source layout
>>   POLDIR := policy
>> @@ -103,8 +103,8 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
>>   all: $(POLICY_FILENAME)
>>
>>   install: $(POLICY_FILENAME)
>> -	$(INSTALL_DIR) $(POLICY_LOADPATH)
>> -	$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
>> +	$(INSTALL_DIR) $(DESTDIR)/$(POLICY_LOADPATH)
>> +	$(INSTALL_DATA) $^ $(DESTDIR)/$(POLICY_LOADPATH)
>>
>>   $(POLICY_FILENAME): policy.conf
>>   	$(CHECKPOLICY) $(CHECKPOLICY_PARAM) $^ -o $@
>
>
>


-- 
Daniel De Graaf
National Security Agency

Re: [Patch V3 3/3] Fixed policy Makefile with Ian Campbell advice:

[Vadim A. Misbakh-Soloviov]

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

Nice, that both of you agreed with patchset. But unfortunately I'm a
newbie in Xen development, so I don't know, what should I do now. Just
wait when someone commit it into staging? Or I should push it somewhere? :)

30.07.2013 17:16, Ian Campbell пишет:
> On Tue, 2013-07-30 at 16:34 +0400, Vadim A. Misbakh-Soloviov wrote:
>> From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
>>
>> 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.
>>
>> Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
> 
> Looks good to me, I'll give Daniel a chance to object though.
> 
> Ian.
> 
>> ---
>>  tools/flask/policy/Makefile | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
>> index df1e8f3..a1c0f11 100644
>> --- a/tools/flask/policy/Makefile
>> +++ b/tools/flask/policy/Makefile
>> @@ -33,7 +33,7 @@ M4 ?= m4
>>  OUTPUT_POLICY = 24
>>  
>>  POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY)
>> -POLICY_LOADPATH = $(DESTDIR)/boot
>> +POLICY_LOADPATH = /boot
>>  
>>  # policy source layout
>>  POLDIR := policy
>> @@ -103,8 +103,8 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
>>  all: $(POLICY_FILENAME)
>>  
>>  install: $(POLICY_FILENAME)
>> -	$(INSTALL_DIR) $(POLICY_LOADPATH)
>> -	$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
>> +	$(INSTALL_DIR) $(DESTDIR)/$(POLICY_LOADPATH)
>> +	$(INSTALL_DATA) $^ $(DESTDIR)/$(POLICY_LOADPATH)
>>  
>>  $(POLICY_FILENAME): policy.conf
>>  	$(CHECKPOLICY) $(CHECKPOLICY_PARAM) $^ -o $@
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
> 


[-- 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 V3 3/3] Fixed policy Makefile with Ian Campbell advice:

[Ian Campbell]

 On Wed, 2013-07-31 at 23:29 +0400, Vadim A. Misbakh-Soloviov wrote:
> Nice, that both of you agreed with patchset. But unfortunately I'm a
> newbie in Xen development, so I don't know, what should I do now. Just
> wait when someone commit it into staging? Or I should push it somewhere? :)

It's on my list of things to commit next time I'm doing that sort of
thing (a few days at most), unless another committer beats me to it.

Thanks!

Ian.

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

[Ian Campbell]

I applied all three of these. I tweaked the commit messages somewhat so
that the first line read as a standalone summary while remaining <80
chars.

On Tue, 2013-07-30 at 16:34 +0400, 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..df1e8f3 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) $(POLICY_LOADPATH)
>  	$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
>  
>  $(POLICY_FILENAME): policy.conf

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

[Vadim A. Misbakh-Soloviov]

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

Great!
Thank you, Ian! ;)

02.08.2013 20:07, Ian Campbell пишет:
> I applied all three of these. I tweaked the commit messages somewhat so
> that the first line read as a standalone summary while remaining <80
> chars.
> 
> On Tue, 2013-07-30 at 16:34 +0400, 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..df1e8f3 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) $(POLICY_LOADPATH)
>>  	$(INSTALL_DATA) $^ $(POLICY_LOADPATH)
>>  
>>  $(POLICY_FILENAME): policy.conf
> 
> 


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