Vadim A. Misbakh-Soloviov
2013-Jul-29 17:01 UTC
[PATCH 1/2] Fixed flask policy''s install path to avoid installing it as ''/boot'' file
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
Vadim A. Misbakh-Soloviov
2013-Jul-29 17:01 UTC
[PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled
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
Andrew Cooper
2013-Jul-29 17:09 UTC
Re: [PATCH 2/2] Fixed xen-tools makefile to build flask-tools and flask policy only if flask build especially enabled
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 > +endifSUBDIRS-$(FLASK_ENABLE) += flask Is the preferred way of doing this. ~Andrew> SUBDIRS-y += xenstore > SUBDIRS-y += misc > SUBDIRS-y += examples
Daniel De Graaf
2013-Jul-29 17:18 UTC
Re: [PATCH 1/2] Fixed flask policy''s install path to avoid installing it as ''/boot'' file
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
Vadim A. Misbakh-Soloviov
2013-Jul-29 17:20 UTC
Re: [PATCH 1/2] Fixed flask policy''s install path to avoid installing it as ''/boot'' file
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. >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Ian Campbell
2013-Jul-30 09:51 UTC
Re: [PATCH 1/2] Fixed flask policy''s install path to avoid installing it as ''/boot'' file
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. >
Vadim A. Misbakh-Soloviov
2013-Jul-30 11:35 UTC
Re: [PATCH 1/2] Fixed flask policy''s install path to avoid installing it as ''/boot'' file
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? ;) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel