From 8252511dc0b5a71e9e64b96f233a27ad73e28b7f Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 28 Mar 2019 16:58:07 +0000 Subject: [PATCH] build: remove sgid permission from tar Otherwise tar will keep the sgid bit when running from a sgid-set directory, resulting in a different file being generated. Signed-off-by: Eneas U de Queiroz Signed-off-by: Christian Lamparter [reworked commit message, removed DMARC] --- include/download.mk | 3 ++- include/image.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/download.mk b/include/download.mk index 33141910fc..09794e155e 100644 --- a/include/download.mk +++ b/include/download.mk @@ -55,7 +55,8 @@ define dl_pack $(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown)) endef define dl_tar_pack - $(TAR) --numeric-owner --owner=0 --group=0 --sort=name $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | $(call dl_pack,$(1)) + $(TAR) --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \ + $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | $(call dl_pack,$(1)) endef ifdef CHECK diff --git a/include/image.mk b/include/image.mk index edbd5b8daa..5b02219558 100644 --- a/include/image.mk +++ b/include/image.mk @@ -291,7 +291,7 @@ endef ifdef CONFIG_TARGET_ROOTFS_TARGZ define Image/Build/targz - $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \ + $(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \ $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz endef