Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Guido Martínez" <guido@vanguardiasur.com.ar>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 1/5] Makefile: don't depend on the umask
Date: Tue, 18 Nov 2014 14:01:40 -0300	[thread overview]
Message-ID: <20141118170140.GA20682@fox> (raw)
In-Reply-To: <546A6496.6050709@mind.be>

Hi Arnout, all,

On Mon, Nov 17, 2014 at 10:11:50PM +0100, Arnout Vandecappelle wrote:
> On 17/11/14 18:19, Guido Mart?nez wrote:
> > Some packages and BR itself create files and directories on the target
> > with cp/mkdir/etc which depend on the umask at the time of building.
> > 
> > To fix this, use a trick inside the Makefile which wraps all rules when
> > the umask is not 0022. This sets the umask at the top level, and then
> > the building process continues as usual.
> > 
> > Signed-off-by: Guido Mart?nez <guido@vanguardiasur.com.ar>
> > ---
> >  Makefile | 15 +++++++++++++++
> >  1 file changed, 15 insertions(+)
> > 
> > diff --git a/Makefile b/Makefile
> > index 471edf9..5ad8235 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -24,6 +24,19 @@
> >  # You shouldn't need to mess with anything beyond this point...
> >  #--------------------------------------------------------------
> >  
> > +# Trick for always running with a fixed umask
> > +UMASK=0022
> > +ifneq ($(shell umask),$(UMASK))
> > +.PHONY:*
> 
>  What is this * supposed to do? It will expand to all existing files and
> directories in the buildroot directory... Don't you mean:
> 
> .PHONY: all $(MAKECMDGOALS)
> 
> ?
Right, it was supposed to expand to existing files so we always run the
rules, but your solution is better. In fact, I tried touching a file
named "clean" and the "phoniness" didn't actually work, since apparently
"%" isn't expanded for phony rules, so I used $(MAKECMDGOALS) for the
rule too.

With Yann's comment the first patch would then be:

"""
diff --git a/Makefile b/Makefile
index 471edf9..054a6be 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,19 @@
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
 
+# Trick for always running with a fixed umask
+UMASK=0022
+ifneq ($(shell umask),$(UMASK))
+.PHONY: all $(MAKECMDGOALS)
+
+all:
+       @umask $(UMASK) && $(MAKE)
+
+$(MAKECMDGOALS):
+       @umask $(UMASK) && $(MAKE) $@
+
+else # umask
+
 # This is our default rule, so must come first
 all:
 
@@ -932,3 +945,5 @@ include docs/manual/manual.mk
 -include $(BR2_EXTERNAL)/docs/*/*.mk
 
 .PHONY: $(noconfig_targets)
+
+endif #umask
"""

Does that sound good?

>  Otherwise, looks good.
> 
>  BTW wouldn't it be nice to add the umask setting to the generated Makefile in
> the $(O) directory, to avoid another level of make?
Sure, will do.

Thanks!

-- 
Guido Mart?nez, VanguardiaSur
www.vanguardiasur.com.ar

  reply	other threads:[~2014-11-18 17:01 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-17 17:19 [Buildroot] [PATCH v3 0/5] Target permissions Guido Martínez
2014-11-17 17:19 ` [Buildroot] [PATCH v3 1/5] Makefile: don't depend on the umask Guido Martínez
2014-11-17 21:11   ` Arnout Vandecappelle
2014-11-18 17:01     ` Guido Martínez [this message]
2014-11-18 19:22       ` Arnout Vandecappelle
2014-11-17 21:36   ` Yann E. MORIN
2014-11-17 21:41     ` Arnout Vandecappelle
2014-11-17 21:48       ` Yann E. MORIN
2014-11-17 17:19 ` [Buildroot] [PATCH v3 2/5] Makefile: don't depend on current skeleton/overlay permissions Guido Martínez
2014-11-17 21:39   ` Yann E. MORIN
2014-11-17 17:19 ` [Buildroot] [PATCH v3 3/5] pkg-generic.mk: don't depend on external package permissions Guido Martínez
2014-11-17 21:41   ` Yann E. MORIN
2014-11-18 17:02     ` Guido Martínez
2014-11-17 17:19 ` [Buildroot] [PATCH v3 4/5] package: matchbox-keyboard: use install instead of cp Guido Martínez
2014-11-17 21:44   ` Yann E. MORIN
2014-11-18 17:06     ` Guido Martínez
2014-11-17 17:19 ` [Buildroot] [PATCH v3 5/5] package: linux-fusion: " Guido Martínez
2014-11-17 21:49   ` Yann E. MORIN
2014-11-17 22:06   ` Arnout Vandecappelle
2014-11-18 17:17     ` Guido Martínez
2014-11-18 19:23       ` Arnout Vandecappelle
2014-11-18 19:40         ` Guido Martínez
2014-11-18 20:58           ` Arnout Vandecappelle
2014-11-18 22:59   ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141118170140.GA20682@fox \
    --to=guido@vanguardiasur.com.ar \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox