diff options
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2014-08-03 19:53:38 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-08-04 20:12:24 +0200
commit7e40a1103a919a8177f00ddca2b46b4439953511 (patch)
parent389f50dfb68b5e87413b348b34e87d69ff875e82 (diff)
support/download: convert git to use the wrapper
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>
2 files changed, 25 insertions, 44 deletions
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 66ce02c94f..1649c8340f 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -95,8 +95,11 @@ endef
# problems
test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
- $(EXTRA_ENV) support/download/git $($(PKG)_SITE) $($(PKG)_DL_VERSION) \
+ $(EXTRA_ENV) support/download/wrapper git \
+ $(DL_DIR)/$($(PKG)_SOURCE) \
+ $($(PKG)_SITE) \
+ $($(PKG)_DL_VERSION) \
# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
diff --git a/support/download/git b/support/download/git
index 116e5a903a..6edaa90fe4 100755
--- a/support/download/git
+++ b/support/download/git
@@ -1,60 +1,38 @@
-# 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 git
-# Call it with:
-# $1: git repo
-# $2: git cset
-# $3: package's basename (eg. foobar-1.2.3)
-# $4: output file
+# Download helper for git, to be called from the download wrapper script
+# Expected arguments:
+# $1: output file
+# $2: git repo
+# $3: git cset
+# $4: package's basename (eg. foobar-1.2.3)
# And this environment:
# GIT : the git command to call
-# BUILD_DIR: path to Buildroot's build dir
-tmp_tar="$( mktemp "${BUILD_DIR}/.XXXXXX" )"
-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}"
+# Try to see if we can do a shallow clone, since it is faster
+# than a full clone.
if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then
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
+ else
+ printf "Shallow clone failed, falling back to doing a full clone\n"
if [ ${git_done} -eq 0 ]; then
printf "Doing full clone\n"
- ${GIT} clone --bare "${repo}" "${repodir}"
+ ${GIT} clone --bare "${repo}" "${basename}"
-pushd "${repodir}" >/dev/null
-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
-popd >/dev/null
+GIT_DIR="${basename}" \
+${GIT} archive --prefix="${basename}/" -o "${output}" --format=tar "${cset}"
-rm -rf "${repodir}" "${tmp_tar}" "${tmp_output}"
-exit ${ret}
+gzip "${output}"