diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:22:06 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:29:56 +0100 |
commit | 8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 (patch) | |
tree | 8b22aaa4e3c283a73fe2af2eccdfa3926a5430ef /fs | |
parent | 42dd856ca930f79a831361e337d25fb8dd6e0dd1 (diff) | |
parent | 4f29cc436b24a8007b065253babe27b9346a479e (diff) |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/common.mk | 3 | ||||
-rw-r--r-- | fs/tar/tar.mk | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/fs/common.mk b/fs/common.mk index 2b31e1293..7515fdc77 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -95,6 +95,9 @@ endif $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) +ifeq ($$(BR2_REPRODUCIBLE),y) + echo "find $$(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$$(SOURCE_DATE_EPOCH)" >> $$(FAKEROOT_SCRIPT) +endif $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT) diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk index 11c69c5a8..b14c977d7 100644 --- a/fs/tar/tar.mk +++ b/fs/tar/tar.mk @@ -7,7 +7,8 @@ TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) define ROOTFS_TAR_CMD - tar $(TAR_OPTS) -cf $@ --numeric-owner -C $(TARGET_DIR) . + (cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \ + tar $(TAR_OPTS) -cf $@ --null -T - --no-recursion --numeric-owner) endef $(eval $(call ROOTFS_TARGET,tar)) |