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

ar71xx/image: make tar calls reproducible

Browse Source 
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>
This commit is contained in:
Alexander Couzens
2017-06-18 21:30:30 +02:00
parent 6adc757097
commit d6331d5583
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/ar71xx/image/legacy.mk
View File

@@ -589,7 +589,10 @@ define Image/Build/ALFA
cd $(KDIR)/$(1); \ cd $(KDIR)/$(1); \
cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(7); \ cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(7); \
cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(8); \ 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 WRM7222C | dd bs=32 count=1 conv=sync; \
echo -ne '\xfe'; \ echo -ne '\xfe'; \
@@ -611,7 +614,9 @@ define Image/Build/Senao
of=$(KDIR_TMP)/$(2)/openwrt-senao-$(2)-root.$(1) bs=64k conv=sync of=$(KDIR_TMP)/$(2)/openwrt-senao-$(2)-root.$(1) bs=64k conv=sync
( \ ( \
cd $(KDIR_TMP)/$(2)/; \ 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)/ -rm -rf $(KDIR_TMP)/$(2)/
-sh $(TOPDIR)/scripts/combined-image.sh \ -sh $(TOPDIR)/scripts/combined-image.sh \

5
target/linux/ar71xx/image/senao.mk
View File

@@ -8,7 +8,10 @@ define Build/senao-factory-image
$(CP) $(IMAGE_KERNEL) $@.senao/openwrt-senao-$(board)-uImage-lzma.bin $(CP) $(IMAGE_KERNEL) $@.senao/openwrt-senao-$(board)-uImage-lzma.bin
$(CP) $(rootfs) $@.senao/openwrt-senao-$(board)-root.squashfs $(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 rm -rf $@.senao
endef endef