KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

download.mk: remove code duplication in $(TAR) call

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-12-12 11:42:14 +01:00
parent dbbfd41118
commit 19d3b78304
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/download.mk
View file

@ -33,13 +33,16 @@ $(strip \
endef endef
# code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support # code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support
dl_pack/bz2=$(TAR) --owner=0 --group=0 --sort=name $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -cjf $(1) $(2) dl_pack/bz2=bzip2 -c > $(1)
dl_pack/gz=$(TAR) --owner=0 --group=0 --sort=name $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | gzip -nc > $(1) dl_pack/gz=gzip -nc > $(1)
dl_pack/xz=$(TAR) --owner=0 --group=0 --sort=name $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | xz -zc -7e > $(1) dl_pack/xz=xz -zc -7e > $(1)
dl_pack/unknown=$(error ERROR: Unknown pack format for file $(1)) dl_pack/unknown=$(error ERROR: Unknown pack format for file $(1))
define dl_pack define dl_pack
$(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown)) $(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown))
endef endef
define dl_tar_pack
$(TAR) --owner=0 --group=0 --sort=name $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | $(call dl_pack,$(1))
endef
define DownloadMethod/unknown define DownloadMethod/unknown
@echo "ERROR: No download method available"; false @echo "ERROR: No download method available"; false
@ -62,7 +65,7 @@ define DownloadMethod/cvs
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
cvs -d $(URL) export $(VERSION) $(SUBDIR) && \ cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \ rm -rf $(SUBDIR); \
) )
@ -80,7 +83,7 @@ define DownloadMethod/svn
svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \ svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
export TAR_TIMESTAMP="" && \ export TAR_TIMESTAMP="" && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \ rm -rf $(SUBDIR); \
) )
@ -99,7 +102,7 @@ define DownloadMethod/git
echo "Packing checkout..." && \ echo "Packing checkout..." && \
export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \ export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
rm -rf $(SUBDIR)/.git && \ rm -rf $(SUBDIR)/.git && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \ rm -rf $(SUBDIR); \
) )
@ -115,7 +118,7 @@ define DownloadMethod/bzr
bzr export --per-file-timestamps -r$(VERSION) $(SUBDIR) $(URL) && \ bzr export --per-file-timestamps -r$(VERSION) $(SUBDIR) $(URL) && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
export TAR_TIMESTAMP="" && \ export TAR_TIMESTAMP="" && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \ rm -rf $(SUBDIR); \
) )
@ -132,7 +135,7 @@ define DownloadMethod/hg
export TAR_TIMESTAMP=`cd $(SUBDIR) && hg log --template '@{date}' -l 1` && \ export TAR_TIMESTAMP=`cd $(SUBDIR) && hg log --template '@{date}' -l 1` && \
find $(SUBDIR) -name .hg | xargs rm -rf && \ find $(SUBDIR) -name .hg | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \ rm -rf $(SUBDIR); \
) )
@ -149,7 +152,7 @@ define DownloadMethod/darcs
export TAR_TIMESTAMP=`cd $(SUBDIR) && LC_ALL=C darcs log --last 1 | sed -ne 's!^Date: \+!!p'` && \ export TAR_TIMESTAMP=`cd $(SUBDIR) && LC_ALL=C darcs log --last 1 | sed -ne 's!^Date: \+!!p'` && \
find $(SUBDIR) -name _darcs | xargs rm -rf && \ find $(SUBDIR) -name _darcs | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \ rm -rf $(SUBDIR); \
) )