aboutsummaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2014-08-03 19:53:39 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-08-04 20:12:24 +0200
commit93e678b767a6c2645cd789b8f2231938668ecc65 (patch)
treef26754d81768453b213d2773b29ac42f860b8ade /support
parent7e40a1103a919a8177f00ddca2b46b4439953511 (diff)
downloadbuildroot-93e678b767a6c2645cd789b8f2231938668ecc65.tar.gz
buildroot-93e678b767a6c2645cd789b8f2231938668ecc65.tar.bz2
support/download: convert Hg to use the wrapper
This drastically simplifies the hg 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 vim-source') Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support')
-rwxr-xr-xsupport/download/hg52
1 files changed, 15 insertions, 37 deletions
diff --git a/support/download/hg b/support/download/hg
index 6e9e26b925..747dd34802 100755
--- a/support/download/hg
+++ b/support/download/hg
@@ -1,46 +1,24 @@
#!/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 hg
-# Call it with:
-# $1: hg repo
-# $2: hg cset
-# $3: package's basename (eg. foobar-1.2.3)
-# $4: output file
+# Download helper for hg, to be called from the download wrapper script
+# Expected arguments:
+# $1: output file
+# $2: hg repo
+# $3: hg cset
+# $4: package's basename (eg. foobar-1.2.3)
# And this environment:
# HG : the hg command to call
-# BUILD_DIR: path to Buildroot's build dir
-repo="${1}"
-cset="${2}"
-basename="${3}"
-output="${4}"
+output="${1}"
+repo="${2}"
+cset="${3}"
+basename="${4}"
-repodir="${basename}.tmp-hg-checkout"
-tmp_output="$( mktemp "${output}.XXXXXX" )"
+${HG} clone --noupdate --rev "${cset}" "${repo}" "${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 ${HG} clone --noupdate --rev "${cset}" "${repo}" "${repodir}"; then
- if ${HG} archive --repository "${repodir}" --type tgz \
- --prefix "${basename}" --rev "${cset}" \
- "${tmp_output}"; then
- mv "${tmp_output}" "${output}"
- ret=0
- fi
-fi
-
-# Cleanup
-rm -rf "${repodir}" "${tmp_output}"
-exit ${ret}
+${HG} archive --repository "${basename}" --type tgz \
+ --prefix "${basename}" --rev "${cset}" \
+ "${output}"