From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH] xsm/policy: remove gawk-ism line in Makefile Date: Tue, 3 Mar 2015 13:33:36 +0000 Message-ID: <1425389616.24959.159.camel@citrix.com> References: <1425386678-25158-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1425386678-25158-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Liu Cc: Daniel De Graaf , Ian Jackson , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Tue, 2015-03-03 at 12:44 +0000, Wei Liu wrote: > Translate gawk regex to mawk regex to allow using mawk. The new regex > works on both gawk and mawk. I think [[:alpha:]] might include A-Z too, but I presume that doesn't affect our inputs or your tests would have failed. So for my part: > Signed-off-by: Wei Liu Acked-by: Ian Campbell > Cc: Ian Jackson > Cc: Daniel De Graaf > --- > tools/flask/policy/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile > index 54a845b..58d9ce1 100644 > --- a/tools/flask/policy/Makefile > +++ b/tools/flask/policy/Makefile > @@ -86,7 +86,7 @@ DETECTED_MODS := $(sort $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te))) > MODENABLED := on > > # extract settings from modules.conf > -ENABLED_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) > +ENABLED_MODS := $(foreach mod,$(shell awk '/^[ \t]*[a-z]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) > > ALL_MODULES := $(filter $(ENABLED_MODS),$(DETECTED_MODS)) >