gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Yann E. MORIN 2014-08-03 19:53:37 +02:00 committed by Thomas Petazzoni
parent 84469226c1
commit 389f50dfb6
2 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/pkg-download.mk
View File

@ -129,9 +129,12 @@ endef
define DOWNLOAD_CVS
test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
$(EXTRA_ENV) support/download/cvs $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \
$($(PKG)_DL_VERSION) $($(PKG)_RAWNAME) \
$($(PKG)_BASE_NAME) $(DL_DIR)/$($(PKG)_SOURCE)
$(EXTRA_ENV) support/download/wrapper cvs \
$(DL_DIR)/$($(PKG)_SOURCE) \
$(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \
$($(PKG)_DL_VERSION) \
$($(PKG)_RAWNAME) \
$($(PKG)_BASE_NAME)
endef
# Not all CVS servers support ls/rls, use login to see if we can connect

54
support/download/cvs
View File

@ -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}"