X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fdownload.mk;h=372db03194a5e41739031b1e2bc395e062f9658f;hb=6b2112610930f34361001f86d7f0896a375a6f4b;hp=fd197ea2167766ff6de9ee017141e944bf25c0b9;hpb=a9714431a9a75003cc0445dc8f173cf66ed5dfd4;p=openwrt.git diff --git a/include/download.mk b/include/download.mk index fd197ea216..372db03194 100644 --- a/include/download.mk +++ b/include/download.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -29,8 +29,8 @@ $(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/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 +45,7 @@ define DownloadMethod/default endef define wrap_mirror - $(if $(MIRROR),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ( $(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 @@ -87,7 +87,7 @@ define DownloadMethod/git cd $(TMP_DIR)/dl && \ rm -rf $(SUBDIR) && \ [ \! -d $(SUBDIR) ] && \ - git clone $(URL) $(SUBDIR) && \ + git clone $(URL) $(SUBDIR) --recursive && \ (cd $(SUBDIR) && git checkout $(VERSION)) && \ echo "Packing checkout..." && \ rm -rf $(SUBDIR)/.git && \ @@ -158,6 +158,7 @@ define Download/Defaults MD5SUM:= SUBDIR:= MIRROR:=1 + MIRROR_MD5SUM:=x VERSION:= endef