Commit daf034f8 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

pkg-infra: move the svn download helper to a script 



Maintaining the download helpers in the Makefile has proved to be a bit
complex, so move it to a shell script.

[Peter: redirect pushd/popd output to /dev/null]
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarSamuel Martin <s.martin49@gmail.com>
Reviewed-by: default avatarRyan Barnett <ryan.barnett@rockwellcollins.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 95a57228

package/pkg-download.mk

+3 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


# Download method commands

WGET := $(call qstrip,$(BR2_WGET)) $(QUIET)

SVN := $(call qstrip,$(BR2_SVN))

export SVN := $(call qstrip,$(BR2_SVN))

CVS := $(call qstrip,$(BR2_CVS))

BZR := $(call qstrip,$(BR2_BZR))

export GIT := $(call qstrip,$(BR2_GIT))
@@ -133,11 +133,8 @@ endef 


define DOWNLOAD_SVN

	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \

	(pushd $(DL_DIR) > /dev/null && \

	$(SVN) export $($(PKG)_SITE)@$($(PKG)_DL_VERSION) $($(PKG)_DL_DIR) && \

	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \

	rm -rf $($(PKG)_DL_DIR) && \

	popd > /dev/null)

	$(EXTRA_ENV) support/download/svn $($(PKG)_SITE) $($(PKG)_DL_VERSION) \

					  $($(PKG)_BASE_NAME) $(DL_DIR)/$($(PKG)_SOURCE)

endef



define SOURCE_CHECK_SVN

support/download/svn

0 → 100755
+25 −0
Original line number Diff line number Diff line 
#!/bin/bash



# We want to catch any command failure, and exit immediately

set -e



# Download helper for svn

# Call it with:

#   $1: svn repo

#   $2: svn revision

#   $3: package's basename (eg. foobar-1.2.3)

#   $4: output file

# And this environment:

#   SVN       : the svn command to call

#   BR2_DL_DIR: path to Buildroot's download dir



repo="${1}"

rev="${2}"

basename="${3}"

output="${4}"



pushd "${BR2_DL_DIR}" >/dev/null

${SVN} export "${repo}@${rev}" "${basename}"

tar czf "${output}" "${basename}"

rm -rf "${basename}"

popd >/dev/null