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

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: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 84469226

package/pkg-download.mk

+6 −3
Original line number Diff line number Diff line
@@ -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

support/download/cvs

+16 −38
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 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}"