From: Florian Fainelli Date: Sat, 20 Mar 2010 17:18:47 +0000 (+0000) Subject: fix svn download with older svn client versions X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=b195af191bf1ba33c9c299d02365814b99061a6c;p=openwrt%2Fstaging%2Fmkresin.git fix svn download with older svn client versions SVN-Revision: 20322 --- diff --git a/include/download.mk b/include/download.mk index 4e201464b4..2d3f35fee9 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)/ && \