fix problems with the use of a passphrase, add option to use a key instead of passphrase

[openwrt.git] / include / download.mk

diff --git a/include/download.mk b/include/download.mk
index 3c7cb7e..0558d49 100644 (file)
--- a/include/download.mk
+++ b/include/download.mk
@@ -14,7 +14,9 @@ $(strip \
     $(if $(filter @GNU/% @KERNEL/% @SF/% ftp://% http://%,$(1)),default, \
       $(if $(filter git://%,$(1)),git, \
         $(if $(filter svn://%,$(1)),svn, \
-          unknown \
+          $(if $(filter cvs://%,$(1)),cvs, \
+            unknown \
+         ) \
         ) \
       ) \
     ) \
@@ -22,7 +24,7 @@ $(strip \
 )
 endef
 
-# code for creating tarballs from svn/git checkouts - useful for mirror support
+# code for creating tarballs from cvs/svn/git checkouts - useful for mirror support
 dl_pack/bz2=$(TAR) cfj $(1) $(2)
 dl_pack/gz=$(TAR) cfz $(1) $(2)
 dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
@@ -39,11 +41,25 @@ 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/cvs
+       $(call wrap_mirror, \
+               echo "Checking out files from the cvs repository..."; \
+                mkdir -p $(TMP_DIR)/dl && \
+                cd $(TMP_DIR)/dl && \
+                rm -rf $(SUBDIR) && \
+                [ \! -d $(SUBDIR) ] && \
+                cvs co -r$(VERSION) $(URL) $(SUBDIR) && \
+                find $(SUBDIR) -name CVS | xargs rm -rf && \
+                echo "Packing checkout..." && \
+                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+                mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+        )
+endef
+
+
 define DownloadMethod/svn
        $(call wrap_mirror, \
                echo "Checking out files from the svn repository..."; \
@@ -75,6 +91,7 @@ define DownloadMethod/git
        )
 endef
 
+Validate/cvs=VERSION SUBDIR
 Validate/svn=VERSION SUBDIR
 Validate/git=VERSION SUBDIR