fixes cvs download, signed-off by Bruno Randolf

[openwrt/openwrt.git] / include / download.mk

diff --git a/include/download.mk b/include/download.mk
index 74986be598e84e31d331771811e7c10a8d0373cd..a8e0e99f3f230daea002bdb2d4653c560de4d949 100644 (file)
--- a/include/download.mk
+++ b/include/download.mk
@@ -41,7 +41,7 @@ define DownloadMethod/default
 endef
 
 define wrap_mirror
-       @$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ( $(1) )
+       $(if $(MIRROR),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ( $(1) ),$(1))
 endef
 
 define DownloadMethod/cvs
@@ -51,7 +51,7 @@ define DownloadMethod/cvs
                 cd $(TMP_DIR)/dl && \
                 rm -rf $(SUBDIR) && \
                 [ \! -d $(SUBDIR) ] && \
-                cvs co -r$(VERSION) $(URL) $(SUBDIR) && \
+                cvs -d $(URL) co -r $(VERSION) $(SUBDIR) && \
                 find $(SUBDIR) -name CVS | xargs rm -rf && \
                 echo "Packing checkout..." && \
                 $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
@@ -82,8 +82,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) && \
+               (cd $(SUBDIR) && git checkout $(VERSION)) && \
                echo "Packing checkout..." && \
                rm -rf $(SUBDIR)/.git && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
@@ -101,6 +101,7 @@ define Download/Defaults
   PROTO:=
   MD5SUM:=
   SUBDIR:=
+  MIRROR:=1
   VERSION:=
 endef