ar71xx/image: make tar calls reproducible
authorAlexander Couzens <lynxis@fe80.eu>
Sun, 18 Jun 2017 19:30:30 +0000 (21:30 +0200)
committerAlexander Couzens <lynxis@fe80.eu>
Sun, 25 Jun 2017 10:11:41 +0000 (12:11 +0200)
Use --mtime when SOURCE_DATE_EPOCH is set.
Use gzip -n9z instead of tar z to remove
timestamp in gzip header.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
target/linux/ar71xx/image/legacy.mk
target/linux/ar71xx/image/senao.mk

index a9f535f..919ac7e 100644 (file)
@@ -589,7 +589,10 @@ define Image/Build/ALFA
                cd $(KDIR)/$(1); \
                cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(7); \
                cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(8); \
-               $(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(7) $(8); \
+               $(TAR) c \
+                       $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+                       -C $(KDIR)/$(1) $(7) $(8) \
+                               | gzip -9nc > $(call factoryname,$(1),$(2)); \
                ( \
                        echo WRM7222C | dd bs=32 count=1 conv=sync; \
                        echo -ne '\xfe'; \
@@ -611,7 +614,9 @@ define Image/Build/Senao
                of=$(KDIR_TMP)/$(2)/openwrt-senao-$(2)-root.$(1) bs=64k conv=sync
        ( \
                cd $(KDIR_TMP)/$(2)/;  \
-               $(TAR) -cz -f $(call factoryname,$(1),$(2)) * \
+               $(TAR) -c \
+                       $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+                       * | gzip -9nc > $(call factoryname,$(1),$(2)) \
        )
        -rm -rf $(KDIR_TMP)/$(2)/
        -sh $(TOPDIR)/scripts/combined-image.sh \
index 46ea970..0c56aa4 100644 (file)
@@ -8,7 +8,10 @@ define Build/senao-factory-image
        $(CP) $(IMAGE_KERNEL) $@.senao/openwrt-senao-$(board)-uImage-lzma.bin
        $(CP) $(rootfs) $@.senao/openwrt-senao-$(board)-root.squashfs
 
-       $(TAR) -czf $@ -C $@.senao .
+       $(TAR) -c \
+               $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+               -C $@.senao . | gzip -9nc > $@
+
        rm -rf $@.senao
 endef