mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
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>
This commit is contained in:
parent
7e40a1103a
commit
93e678b767
@ -184,8 +184,11 @@ endef
|
|||||||
|
|
||||||
define DOWNLOAD_HG
|
define DOWNLOAD_HG
|
||||||
test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
|
test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
|
||||||
$(EXTRA_ENV) support/download/hg $($(PKG)_SITE) $($(PKG)_DL_VERSION) \
|
$(EXTRA_ENV) support/download/wrapper hg \
|
||||||
$($(PKG)_BASE_NAME) $(DL_DIR)/$($(PKG)_SOURCE)
|
$(DL_DIR)/$($(PKG)_SOURCE) \
|
||||||
|
$($(PKG)_SITE) \
|
||||||
|
$($(PKG)_DL_VERSION) \
|
||||||
|
$($(PKG)_BASE_NAME)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
|
# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
|
||||||
|
@ -1,46 +1,24 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# We want to catch any command failure, and exit immediately
|
# We want to catch any unexpected failure, and exit immediately
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Download helper for hg
|
# Download helper for hg, to be called from the download wrapper script
|
||||||
# Call it with:
|
# Expected arguments:
|
||||||
# $1: hg repo
|
# $1: output file
|
||||||
# $2: hg cset
|
# $2: hg repo
|
||||||
# $3: package's basename (eg. foobar-1.2.3)
|
# $3: hg cset
|
||||||
# $4: output file
|
# $4: package's basename (eg. foobar-1.2.3)
|
||||||
# And this environment:
|
# And this environment:
|
||||||
# HG : the hg command to call
|
# HG : the hg command to call
|
||||||
# BUILD_DIR: path to Buildroot's build dir
|
|
||||||
|
|
||||||
repo="${1}"
|
output="${1}"
|
||||||
cset="${2}"
|
repo="${2}"
|
||||||
basename="${3}"
|
cset="${3}"
|
||||||
output="${4}"
|
basename="${4}"
|
||||||
|
|
||||||
repodir="${basename}.tmp-hg-checkout"
|
${HG} clone --noupdate --rev "${cset}" "${repo}" "${basename}"
|
||||||
tmp_output="$( mktemp "${output}.XXXXXX" )"
|
|
||||||
|
|
||||||
cd "${BUILD_DIR}"
|
${HG} archive --repository "${basename}" --type tgz \
|
||||||
# Remove leftovers from a previous failed run
|
--prefix "${basename}" --rev "${cset}" \
|
||||||
rm -rf "${repodir}"
|
"${output}"
|
||||||
|
|
||||||
# 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}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user