X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fffefa41d813047e81a857055e43a724c099fbfe..5e4f3f7961b85eec809c2c5e581876ab9bd94b71:/include/download.mk diff --git a/include/download.mk b/include/download.mk index 386624280..23f2996ed 100644 --- a/include/download.mk +++ b/include/download.mk @@ -39,14 +39,12 @@ define DownloadMethod/default endef define wrap_mirror - @$(if $(CONFIG_LOCALMIRROR),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ) \ - ( $(1) ) \ - $(if $(CONFIG_LOCALMIRROR),, || $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x") + @$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ( $(1) ) endef define DownloadMethod/svn $(call wrap_mirror, \ - echo "Checking out files from svn repository..."; \ + echo "Checking out files from the svn repository..."; \ mkdir -p $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \ rm -rf $(SUBDIR) && \ @@ -59,8 +57,24 @@ define DownloadMethod/svn ) endef +define DownloadMethod/git + $(call wrap_mirror, \ + echo "Checking out files from the git repository..."; \ + mkdir -p $(TMP_DIR)/dl && \ + cd $(TMP_DIR)/dl && \ + rm -rf $(SUBDIR) && \ + [ \! -d $(SUBDIR) ] && \ + git-clone $(URL) $(SUBDIR) && \ + (cd $(SUBDIR) && git-checkout $(VERSION)) && \ + echo "Packing checkout..." && \ + rm -rf $(SUBDIR)/.git && \ + $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ + mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ + ) +endef + Validate/svn=VERSION SUBDIR -#Validate/git=VERSION SUBDIR +Validate/git=VERSION SUBDIR define Download/Defaults URL:=