NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support/download: convert git to use the wrapper

Browse Source 
This drastically simplifies the git 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 fmc-fsl-sdk-source')
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-08-03 19:53:38 +02:00 committed by Thomas Petazzoni
parent 389f50dfb6
commit 7e40a1103a
2 changed files with 25 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/pkg-download.mk
View File

@ -95,8 +95,11 @@ endef
# problems # problems
define DOWNLOAD_GIT define DOWNLOAD_GIT
test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
$(EXTRA_ENV) support/download/git $($(PKG)_SITE) $($(PKG)_DL_VERSION) \ $(EXTRA_ENV) support/download/wrapper git \
$($(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

62
support/download/git
View File

@ -1,60 +1,38 @@
#!/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 git # Download helper for git, to be called from the download wrapper script
# Call it with: # Expected arguments:
# $1: git repo # $1: output file
# $2: git cset # $2: git repo
# $3: package's basename (eg. foobar-1.2.3) # $3: git cset
# $4: output file # $4: package's basename (eg. foobar-1.2.3)
# And this environment: # And this environment:
# GIT : the git command to call # GIT : the git 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-git-checkout" # Try to see if we can do a shallow clone, since it is faster
tmp_tar="$( mktemp "${BUILD_DIR}/.XXXXXX" )" # than a full clone.
tmp_output="$( mktemp "${output}.XXXXXX" )"
# Play tic-tac-toe with temp files
# - first, we download to a trashable location (the build-dir)
# - then we create the uncomporessed tarball in tht same trashable location
# - then we create a temporary compressed tarball in the final location, so
# it is on the same filesystem as the final file
# - finally, we atomically rename to the final file
cd "${BUILD_DIR}"
# Remove leftovers from a previous failed run
rm -rf "${repodir}"
git_done=0
if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then
printf "Doing shallow clone\n" printf "Doing shallow clone\n"
if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${repodir}"; then if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${basename}"; then
git_done=1 git_done=1
else
printf "Shallow clone failed, falling back to doing a full clone\n"
fi fi
fi fi
if [ ${git_done} -eq 0 ]; then if [ ${git_done} -eq 0 ]; then
printf "Doing full clone\n" printf "Doing full clone\n"
${GIT} clone --bare "${repo}" "${repodir}" ${GIT} clone --bare "${repo}" "${basename}"
fi fi
ret=1 GIT_DIR="${basename}" \
pushd "${repodir}" >/dev/null ${GIT} archive --prefix="${basename}/" -o "${output}" --format=tar "${cset}"
if ${GIT} archive --prefix="${basename}/" -o "${tmp_tar}" \
--format=tar "${cset}"; then
if gzip -c "${tmp_tar}" >"${tmp_output}"; then
mv "${tmp_output}" "${output}"
ret=0
fi
fi
popd >/dev/null
rm -rf "${repodir}" "${tmp_tar}" "${tmp_output}" gzip "${output}"
exit ${ret}