X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fdownload.mk;h=b185f1ac36805ddb4de5924e4f7c47102da2582e;hb=56d7382fa8b4c6f2110643e5384eb912a748d89d;hp=b93b774b97380dba0c34ebce9fc9a2c18dd4e4a3;hpb=08809e239030c028d3e40620738a99331f3d052f;p=openwrt-10.03%2F.git

diff --git a/include/download.mk b/include/download.mk
index b93b774b9..b185f1ac3 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -16,6 +16,7 @@ $(strip \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
             unknown \
+	  ) \
         ) \
       ) \
     ) \
@@ -40,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
@@ -66,7 +67,7 @@ define DownloadMethod/svn
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		svn co -r$(VERSION) $(URL) $(SUBDIR) && \
+		svn co --non-interactive -r$(VERSION) $(URL) $(SUBDIR) && \
 		find $(SUBDIR) -name .svn | xargs rm -rf && \
 		echo "Packing checkout..." && \
 		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
@@ -81,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)) && \
@@ -100,6 +101,7 @@ define Download/Defaults
   PROTO:=
   MD5SUM:=
   SUBDIR:=
+  MIRROR:=1
   VERSION:=
 endef