summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-20 17:18:47 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-20 17:18:47 +0000
commit19b7cd172992a8dc97ee20064dd1d38c2c04072a (patch)
treedae65b2bf0e8d201fe0875d8e93a65390be38158
parente3e02843a6f8191790b23e4d14f4523e0bbd84b7 (diff)
fix svn download with older svn client versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20322 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/download.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/download.mk b/include/download.mk
index 4e201464b..2d3f35fee 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -63,6 +63,12 @@ define DownloadMethod/cvs
)
endef
+SVN_VERSION=$(shell svn --version | head -1 | awk '{ print $3 }' | cut -d. -f2)
+ifeq ($(SVN_VERSION),5)
+else
+SVN_OPTS:=--trust-server-cert
+endif
+
define DownloadMethod/svn
$(call wrap_mirror, \
echo "Checking out files from the svn repository..."; \
@@ -70,7 +76,7 @@ define DownloadMethod/svn
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
- svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) && \
+ svn export --non-interactive $(SVN_OPTS) -r$(VERSION) $(URL) $(SUBDIR) && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \