X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fdownload.mk;h=cc4ffb0cfb544131704d7d0ffca3f11c0d8ef33b;hb=06ce4510ab1fe7da294eb5fa1c58009a13ebec16;hp=6cc10d95c3057e49fe17454f0873cbc67608b17d;hpb=5649d3310defd45249dbf15e8b7b6385c11310b7;p=openwrt.git diff --git a/include/download.mk b/include/download.mk index 6cc10d95c3..cc4ffb0cfb 100644 --- a/include/download.mk +++ b/include/download.mk @@ -29,8 +29,9 @@ $(strip \ endef # code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support -dl_pack/bz2=$(TAR) cfj $(1) $(2) -dl_pack/gz=$(TAR) cfz $(1) $(2) +dl_pack/bz2=$(TAR) cjf $(1) $(2) +dl_pack/gz=$(TAR) czf $(1) $(2) +dl_pack/xz=$(TAR) c $(2) | xz -zc > $(1) dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false define dl_pack $(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown)) @@ -45,7 +46,7 @@ define DownloadMethod/default endef define wrap_mirror - $(if $(MIRROR),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" || ( $(1) ),$(1)) + $(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" || ( $(1) ),$(1)) endef define DownloadMethod/cvs @@ -88,7 +89,7 @@ define DownloadMethod/git rm -rf $(SUBDIR) && \ [ \! -d $(SUBDIR) ] && \ git clone $(URL) $(SUBDIR) --recursive && \ - (cd $(SUBDIR) && git checkout $(VERSION)) && \ + (cd $(SUBDIR) && git checkout $(VERSION) && git submodule update) && \ echo "Packing checkout..." && \ rm -rf $(SUBDIR)/.git && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \