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

[Daniel De Graaf <dgdegra@tycho.nsa.gov>]

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