Commit a92290aa authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

support/download: convert svn to use the wrapper 



This drastically simplifies the svn helper, as it no longer has to deal
with atomically saving the downloaded archive.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
(Tested by running 'make open2300-source')
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5b3880e1

package/pkg-download.mk

+5 −2
Original line number Diff line number Diff line
@@ -151,8 +151,11 @@ endef 


define DOWNLOAD_SVN

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

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

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

	$(EXTRA_ENV) support/download/wrapper svn \

		$(DL_DIR)/$($(PKG)_SOURCE) \

		$($(PKG)_SITE) \

		$($(PKG)_DL_VERSION) \

		$($(PKG)_BASE_NAME)

endef



define SOURCE_CHECK_SVN

support/download/svn

+13 −35
Original line number Diff line number Diff line 
#!/bin/bash



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

# We want to catch any unexpected 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

# Download helper for svn, to be called from the download wrapper script

# Expected arguments:

#   $1: output file

#   $2: svn repo

#   $3: svn revision

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

# And this environment:

#   SVN      : the svn command to call

#   BUILD_DIR: path to Buildroot's build dir



repo="${1}"

rev="${2}"

basename="${3}"

output="${4}"

output="${1}"

repo="${2}"

rev="${3}"

basename="${4}"



repodir="${basename}.tmp-svn-checkout"

tmp_output="$( mktemp "${output}.XXXXXX" )"

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



cd "${BUILD_DIR}"

# Remove leftovers from a previous failed run

rm -rf "${repodir}"



# Play tic-tac-toe with temp files

# - first, we download to a trashable location (the build-dir)

# - then we create a temporary tarball in the final location, so it is

#   on the same filesystem as the final file

# - finally, we atomically rename to the final file



ret=1

if ${SVN} export "${repo}@${rev}" "${repodir}"; then

    if tar czf "${tmp_output}" "${repodir}"; then

        mv "${tmp_output}" "${output}"

        ret=0

    fi

fi



# Cleanup

rm -rf "${repodir}" "${tmp_output}"

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