aboutsummaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2014-08-03 19:53:41 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-08-04 20:12:25 +0200
commita92290aa20a446b3f01822f0637a2ef7a4846c0b (patch)
tree5df478d27f082f24ed55de3cce74b6180ca33339 /support
parent5b3880e174983caa8410a3678975bb7233f33d36 (diff)
downloadbuildroot-a92290aa20a446b3f01822f0637a2ef7a4846c0b.tar.gz
buildroot-a92290aa20a446b3f01822f0637a2ef7a4846c0b.tar.bz2
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: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> (Tested by running 'make open2300-source') Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support')
-rwxr-xr-xsupport/download/svn48
1 files changed, 13 insertions, 35 deletions
diff --git a/support/download/svn b/support/download/svn
index 39cbbcb904..3a9512dddc 100755
--- a/support/download/svn
+++ b/support/download/svn
@@ -1,44 +1,22 @@
#!/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}"