X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fdownload.mk;h=1c3f23e94ba552aa2297ac3c1f5165152c98bf3c;hb=4c711d18f77c8ae88cd82959c71da145d99844d9;hp=7009bfcd44c58d18fb8b92fdbe72aea84fbce515;hpb=45e42754c7e705c8e999a9db9fc380390af259f4;p=openwrt.git diff --git a/include/download.mk b/include/download.mk index 7009bfcd44..1c3f23e94b 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)" "$(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 @@ -87,8 +87,8 @@ define DownloadMethod/git cd $(TMP_DIR)/dl && \ rm -rf $(SUBDIR) && \ [ \! -d $(SUBDIR) ] && \ - git clone $(URL) $(SUBDIR) && \ - (cd $(SUBDIR) && git checkout $(VERSION)) && \ + git clone $(URL) $(SUBDIR) --recursive && \ + (cd $(SUBDIR) && git checkout $(VERSION) && git submodule update) && \ echo "Packing checkout..." && \ rm -rf $(SUBDIR)/.git && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \