diff options
author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-08-03 19:53:37 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-08-04 20:12:24 +0200 |
commit | 389f50dfb68b5e87413b348b34e87d69ff875e82 (patch) | |
tree | 2f41d11f9c8a5c96f38e660b359137cd3c105af6 /support/download | |
parent | 84469226c1d4e6b7bf7052ef9039b26991041311 (diff) | |
download | buildroot-389f50dfb68b5e87413b348b34e87d69ff875e82.tar.gz buildroot-389f50dfb68b5e87413b348b34e87d69ff875e82.zip |
support/download: convert cvs to use the wrapper
This drastically simplifies the cvs 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>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support/download')
-rwxr-xr-x | support/download/cvs | 54 |
1 files changed, 16 insertions, 38 deletions
diff --git a/support/download/cvs b/support/download/cvs index 9aeed79b29..c92d491fd1 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -1,47 +1,25 @@ #!/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 cvs -# Call it with: -# $1: cvs repo -# $2: cvs revision -# $3: package's name (eg. foobar) -# $4: package's basename (eg. foobar-1.2.3) -# $5: output file +# Download helper for cvs, to be called from the download wrapper script +# Expected arguments: +# $1: output file +# $2: cvs repo +# $3: cvs revision +# $4: package's name (eg. foobar) +# $5: package's basename (eg. foobar-1.2.3) # And this environment: # CVS : the cvs command to call -# BUILD_DIR: path to Buildroot's build dir -repo="${1}" -rev="${2}" -rawname="${3}" -basename="${4}" -output="${5}" +output="${1}" +repo="${2}" +rev="${3}" +rawname="${4}" +basename="${5}" -repodir="${basename}.tmp-cvs-checkout" -tmp_output="$( mktemp "${output}.XXXXXX" )" +${CVS} -z3 -d":pserver:anonymous@${repo}" \ + co -d "${basename}" -r ":${rev}" -P "${rawname}" -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 ${CVS} -z3 -d":pserver:anonymous@${repo}" \ - co -d "${repodir}" -r ":${rev}" -P "${rawname}"; 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}" |