target permissions

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 <[email protected]>

---
 Makefile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Makefile +15 -0

index 3d8283b..eeb1412 100644
@@ -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

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 <[email protected]>

---
 Makefile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

We use 'rsync -a' to copy the skeleton and overlays, so the target ends up with the exact same permissions as on the repo. The problem is we don't track these permissions, since Git doesn't allow for that (except for the exec bit). This means users with different umasks at the time of cloning could end up with different target permissions.

Fix this by using --chmod on rsync calls so we don't depend on the current permission set for the skeleton and overlays. We do depend on the exec bit, but that's fine since that one is tracked by Git.

Signed-off-by Guido Mart?nez <[email protected]>

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Makefile +2 -2

index eeb1412..5880bbb 100644
@@ -489,7 +489,7 @@ RSYNC_VCS_EXCLUSIONS = \
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
 	rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
-		--chmod=Du+w --exclude .empty --exclude '*~' \
+		--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
 		$(TARGET_SKELETON)/ $(TARGET_DIR)/
 	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
 	@ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK)

@@ -625,7 +625,7 @@ endif
 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
 		rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
-			--chmod=Du+w --exclude .empty --exclude '*~' \
+			--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
 			$(d)/ $(TARGET_DIR)$(sep))
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \

Since the rsync of skeleton or rootfs now changes the permissions of the copied files and directories, this may break existing setups that rely on these permissions being kept. So add a release not explaining

how it should be done.

Since the rsync of skeleton or rootfs now changes the permissions of the copied files and directories, this may break existing setups that rely on these permissions being kept. So add a release not explaining how it should be done.

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 CHANGES | 11 +++++++++++
 1 file changed, 11 insertions(+)

We use 'rsync -a' to copy the skeleton and overlays, so the target ends up with the exact same permissions as on the repo. The problem is we don't track these permissions, since Git doesn't allow for that (except for the exec bit). This means users with different umasks at the time of cloning could end up with different target permissions.

Fix this by using --chmod on rsync calls so we don't depend on the current permission set for the skeleton and overlays. We do depend on the exec bit, but that's fine since that one is tracked by Git.

Signed-off-by Guido Mart?nez <[email protected]>

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

This makes sure we don't have any weird permissions on the staging dir, which could affect the target.

Signed-off-by Guido Mart?nez <[email protected]>

---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

toolchain/helpers.mk +1 -1

index 3121da4..46f5f22 100644
@@ -139,7 +139,7 @@ copy_toolchain_sysroot = \
 	SUPPORT_LIB_DIR="$(strip $5)" ; \
 	for i in etc $${ARCH_LIB_DIR} sbin usr usr/$${ARCH_LIB_DIR}; do \
 		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
-			rsync -au --chmod=Du+w --exclude 'usr/lib/locale' \
+			rsync -au --chmod=u=rwX,go=rX --exclude 'usr/lib/locale' \
 				--exclude lib --exclude lib32 --exclude lib64 \
 				$${ARCH_SYSROOT_DIR}/$$i/ $(STAGING_DIR)/$$i/ ; \
 		fi ; \

This makes sure we don't have any weird permissions on the staging dir, which could affect the target.

Signed-off-by Guido Mart?nez <[email protected]>

---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Reset permissions for rsynced packages (when using OVERRIDE_SRCDIR) to 755/644. We do this under the assumption that source files shouldn't care about their permissions, except possibly for the exec bit.

This guarantees that if a package uses 'rsync -a' or 'cp -p' to copy a file from its build dir to the target, it'll end up with the same permissions on the target every time.

Signed-off-by Guido Mart?nez <[email protected]>

---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

in order to not depend on the previous permissions of the file

Signed-off-by Guido Mart?nez <[email protected]>

---
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Small optimization so we don't have another 'make' level (caused by the umask fix) when running the generated makefile.

Signed-off-by Guido Mart?nez <[email protected]>

---
 support/scripts/mkmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Guido Mart?nez (9):

nitrogen6x: use install instead of cp
boot/grub: use install instead of cp
fs/iso9660: use install instead of cp

Dear Guido Mart?nez,

Quoted 1 line · Guido Mart?nez

Guido Mart?nez (9):

[...]

Quoted 3 lines

nitrogen6x: use install instead of cp
boot/grub: use install instead of cp
fs/iso9660: use install instead of cp

I've applied those three patches to the next branch. The other ones are more sensitive, so I'll wait to get more feedback/review, but applying those three patches means you'll have less patches to carry in your branch :)

Hey guys,

fourth patchset to fix the target permissions variability.

I checked (to the best of my knowledge) every 'cp' and 'rsync' call under package/. There are two bigs cases:

(1) Copies from the package or download directory to the build directory (example: cache-calibrator, fan-ctrl, ramspeed, samba4). They are OK, since they copy source code, a Makefile or some other build files. These files _shouldn't_ affect the result, so I left them the way they are. We can change them if you agree, but I thought it'd be too much noise for now.

(2) Copies from anything under output/ to the target. These should all be fine. Since we now build with a controlled umask and reset any permissions that could vary (tar files don't vary), we shouldn't observe any variability under output/ (modulo (1)-kind copies).

I tested parallel builds with this, as Yann suggested, and they seem to work the same, which is expected since we just wrap everything at the top level.

Differences from v3 are:

- Recursive running of make is done with $(MAKE), and not using --no-print-directory. Also, change the "%" rule in "$(MAKECMDGOALS)" to properly detect phony rules.

- Use --chmod on the external toolchain's rsync, to prevent any weird permissions coming from there. This isn't stricly necessary, since the toolchain libs are copied to the target via 'install', which won't depend on any existing permissions. But this way we're safer in case anything changes in the future. Also we make sure everything under output/ is controlled.

- Fix some cp's to the target from non-controlled dirs on boot/grub/grub.mk, fs/iso9660/iso9660.mk, and board/boundarydevices/nitrogen6x/post-build.sh

- Fifth patch dropped as it was accepted.

- Added the umask setting in the Makefile generated in the $(O) dir. This is just an optimization so we don't have another level of 'make' running.

- Fixed 'install' call on matchbox-keyboard patch (#4)

Thanks!

---

Guido Mart?nez (9):
Makefile: don't depend on the umask
Makefile: don't depend on current skeleton/overlay permissions toolchain/helpers.mk: use --chmod on rsync pkg-generic.mk: don't depend on external package permissions
package: matchbox-keyboard: use install instead of cp
scripts: mkmakefile: set umask before calling BR's makefile
nitrogen6x: use install instead of cp
boot/grub: use install instead of cp
fs/iso9660: use install instead of cp

 Makefile                                              | 19 +++++++++++++++++--
 board/boundarydevices/nitrogen6x/post-build.sh        |  6 +++---
 boot/grub/grub.mk                                     | 14 +++++++-------
 fs/iso9660/iso9660.mk                                 | 16 +++++++++-------
 .../matchbox/matchbox-keyboard/matchbox-keyboard.mk   |  2 +-
 package/pkg-generic.mk                                |  2 +-
 support/scripts/mkmakefile                            |  2 +-
 toolchain/helpers.mk                                  |  2 +-
 8 files changed, 40 insertions(+), 23 deletions(-)

[...]
Guido Mart?nez (9):
Makefile: don't depend on the umask
Makefile: don't depend on current skeleton/overlay permissions toolchain/helpers.mk: use --chmod on rsync pkg-generic.mk: don't depend on external package permissions
package: matchbox-keyboard: use install instead of cp
scripts: mkmakefile: set umask before calling BR's makefile
nitrogen6x: use install instead of cp
boot/grub: use install instead of cp
fs/iso9660: use install instead of cp

 Makefile                                              | 19 +++++++++++++++++--
 board/boundarydevices/nitrogen6x/post-build.sh        |  6 +++---
 boot/grub/grub.mk                                     | 14 +++++++-------
 fs/iso9660/iso9660.mk                                 | 16 +++++++++-------
 .../matchbox/matchbox-keyboard/matchbox-keyboard.mk   |  2 +-
 package/pkg-generic.mk                                |  2 +-
 support/scripts/mkmakefile                            |  2 +-
 toolchain/helpers.mk                                  |  2 +-
 8 files changed, 40 insertions(+), 23 deletions(-)