summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-14 21:55:11 +0000
committerthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-14 21:55:11 +0000
commit329f2d8195300fe8af6f580af51424ffbaa5e8ce (patch)
tree806ff3b8cba42b110a313e88382bbcc59a91a321 /include
parent6772ab104f68ed7bbfcdfa41c0fb65e6e5968cf2 (diff)
Updated post r19769, integrates the missing dl_method bzr hunk from #6370, uses the export subcommand for the vcs' that provide a usable version (hg archive doesn't work remotely, git archive isn't enabled on github), from #6700
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20222 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/download.mk28
1 files changed, 16 insertions, 12 deletions
diff --git a/include/download.mk b/include/download.mk
index e19cd41476..e0d743a4d7 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -16,7 +16,9 @@ $(strip \
$(if $(filter svn://%,$(1)),svn, \
$(if $(filter cvs://%,$(1)),cvs, \
$(if $(filter hg://%,$(1)),hg, \
- unknown \
+ $(if $(filter sftp://%,$(1)),bzr, \
+ unknown \
+ ) \
) \
) \
) \
@@ -53,11 +55,11 @@ define DownloadMethod/cvs
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
- cvs -d $(URL) co $(VERSION) $(SUBDIR) && \
- find $(SUBDIR) -name CVS | xargs rm -rf && \
+ cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
- mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+ rm -rf $(SUBDIR); \
)
endef
@@ -68,11 +70,11 @@ define DownloadMethod/svn
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
- svn co --non-interactive -r$(VERSION) $(URL) $(SUBDIR) && \
- find $(SUBDIR) -name .svn | xargs rm -rf && \
+ svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
- mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+ rm -rf $(SUBDIR); \
)
endef
@@ -88,7 +90,8 @@ define DownloadMethod/git
echo "Packing checkout..." && \
rm -rf $(SUBDIR)/.git && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
- mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+ rm -rf $(SUBDIR); \
)
endef
@@ -99,11 +102,11 @@ define DownloadMethod/bzr
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
- bzr co --lightweight -r$(VERSION) $(URL) $(SUBDIR) && \
- find $(SUBDIR) -name .bzr | xargs rm -rf && \
+ bzr export -r$(VERSION) $(URL) $(SUBDIR) && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
- mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ &&
+ rm -rf $(SUBDIR); \
)
endef
@@ -118,7 +121,8 @@ define DownloadMethod/hg
find $(SUBDIR) -name .hg | xargs rm -rf && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
- mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+ rm -rf $(SUBDIR); \
)
endef