X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fdownload.mk;h=0558d4979ec8a562b7f9184894d93606c31e6594;hb=9050c1c2192c90c142a24743c00c4c79462bd609;hp=23f2996ed14004436cf345c12e2be54798160890;hpb=5698039c6bc30b0ff8920e6c559aff290dc12293;p=openwrt-10.03%2F.git diff --git a/include/download.mk b/include/download.mk index 23f2996ed..0558d4979 100644 --- 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 @@ -42,6 +44,22 @@ define wrap_mirror @$(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..."; \ @@ -73,6 +91,7 @@ define DownloadMethod/git ) endef +Validate/cvs=VERSION SUBDIR Validate/svn=VERSION SUBDIR Validate/git=VERSION SUBDIR