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

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

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@xxxxxxxx>
> >
> > Signed-off-by: Vadim A. Misbakh-Soloviov <mva@xxxxxxxx>
> > ---
> >   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@xxxxxxxxxxxxx>

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



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel