domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image.mk: only upgrade permissions instead of overwriting, utilize tar -p flag for targz image targets (#7667)

Browse Source 
SVN-Revision: 26259
This commit is contained in:
Jo-Philipp Wich
2011-03-21 17:38:15 +00:00
parent b8aef60e35
commit 48c8a8ddb0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/image.mk
View File

@@ -111,7 +111,8 @@ endif
ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),) ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),)
define Image/mkfs/targz define Image/mkfs/targz
$(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . # Preserve permissions (-p) when building as non-root user
$(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
endef endef
endif endif
@@ -137,9 +138,10 @@ endif
define Image/mkfs/prepare/default define Image/mkfs/prepare/default
- $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -print0 | $(XARGS) -0 chmod 0644 # Use symbolic permissions to avoid clobbering SUID/SGID/sticky bits
- $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod 0755 - $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r
- $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod 0755 - $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
- $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
$(INSTALL_DIR) $(TARGET_DIR)/tmp $(INSTALL_DIR) $(TARGET_DIR)/tmp
chmod 0777 $(TARGET_DIR)/tmp chmod 0777 $(TARGET_DIR)/tmp
endef endef