Re: [ptxdist] [PATCH v2 1/2] doc: ref_make_macros: make clear that permission should be four digits

[Michael Olbrich <m.olbrich@pengutronix.de>]

Hello Roland hand Alexander,

On Wed, Aug 19, 2020 at 01:04:31PM +0200, Alexander Dahl wrote:
> Am Mittwoch, 19. August 2020, 12:59:08 CEST schrieb Roland Hieber:
> > Three octal digits are not enough, we must also respect the
> > sticky/setuid/setgid bits. Even if these are mostly implied to be 0, we
> > should be explicit here. This should also help to prevent permission
> > clashes when more than one packages install the same directory.
> > 
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> 
> Acked-by: Alexander Dahl <ada@thorsis.com>

Thanks for sorting this out. I'll apply the patches because I think this is
better for consistency. But we should probably accept the versions without
leading zeros as well. The final result is the same after all.

Probably something like this:


diff --git a/scripts/lib/ptxd_lib_check_dir_permissions.awk b/scripts/lib/ptxd_lib_check_dir_permissions.awk
index faa0c64373f0..e6eb99f1937e 100644
--- a/scripts/lib/ptxd_lib_check_dir_permissions.awk
+++ b/scripts/lib/ptxd_lib_check_dir_permissions.awk
@@ -35,7 +35,7 @@ function check_parents(base) {
 
 $1 ~ "d" {
 	path = gensub(/\/$/,"",1,$2)
-	perm = $3 "." $4 " " $5
+	perm = $3 "." $4 " 0" sprintf("%o", strtonum("0" $5))
 	check(path, perm, "")
 	check_parents(path)
 }

What do you think?

Michael

> > ---
> >  * v2: unchanged
> > 
> >  doc/ref_make_macros.rst | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/doc/ref_make_macros.rst b/doc/ref_make_macros.rst
> > index 6f056adf3e7d..ae65cb9408cf 100644
> > --- a/doc/ref_make_macros.rst
> > +++ b/doc/ref_make_macros.rst
> > @@ -173,7 +173,7 @@ Some of the parameters have fixed meanings:
> >  **<GID>**
> >    Group ID the file should use in the target's root filesystem
> >  **<permission>**
> > -  Permission (in an octal value) the file should use in the target's root
> > filesystem +  Permission (as a four-digit octal value) the file should use
> > in the target's root filesystem
> > 
> >  The remaining parameters vary with the use case:
> > 
> > @@ -384,7 +384,7 @@ The base parameters and their meanings:
> >  **<GID>**
> >    Group ID the file should use in the target's root filesystem
> >  **<permission>**
> > -  Permission (in an octal value) the file should use in the target's root
> > filesystem +  Permission (as a four-digit octal value) the file should use
> > in the target's root filesystem
> > 
> >  The parameter <destination> is meant as an absolute path
> >  and filename in target's root filesystem. PTXdist searches for the source
> > @@ -581,7 +581,7 @@ The parameters and their meanings:
> >  **<GID>**
> >    Group ID the directories and files should use in the target's root
> > filesystem **<permission>**
> > -  Permission (as an octal value) the library should use in the target's
> > root +  Permission (as a four-digit octal value) the library should use in
> > the target's root filesystem (mostly 0644)
> >  **<libname>**
> >    Basename of the library without any extension and path
> 
> 
> 
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de