Commit 95a57228 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

pkg-infra: move the git download helper to a script 



The git download helper is getting a bit more complex. Fixing it in the
Makefile when it breaks (like the recent breakage with a non-existing
sha1-cset) proves to be challenging, to say the least.

Move it into a shell script in support/download/git, which will make
it much easier to read, maintain, fix and enhance in the future.

[Peter: redirect pushd/popd output to /dev/null]
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Cc: Arnout Vandecappelle <arnout@mind.be>
Reviewed-by: default avatarSamuel Martin <s.martin49@gmail.com>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 2d4fd5d3

package/pkg-download.mk

+3 −14
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ WGET := $(call qstrip,$(BR2_WGET)) $(QUIET) 
SVN := $(call qstrip,$(BR2_SVN))

CVS := $(call qstrip,$(BR2_CVS))

BZR := $(call qstrip,$(BR2_BZR))

GIT := $(call qstrip,$(BR2_GIT))

export GIT := $(call qstrip,$(BR2_GIT))

HG := $(call qstrip,$(BR2_HG)) $(QUIET)

SCP := $(call qstrip,$(BR2_SCP)) $(QUIET)

SSH := $(call qstrip,$(BR2_SSH)) $(QUIET)
@@ -84,19 +84,8 @@ github = https://github.com/$(1)/$(2)/archive/$(3) 
# problems

define DOWNLOAD_GIT

	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \

	(pushd $(DL_DIR) > /dev/null && \

	 ((test "`git ls-remote $($(PKG)_SITE) $($(PKG)_DL_VERSION)`" && \

	   echo "Doing shallow clone" && \

	   $(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) || \

	  (echo "Doing full clone" && \

	   $(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME))) && \

	pushd $($(PKG)_BASE_NAME) > /dev/null && \

	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ -o $(DL_DIR)/.$($(PKG)_SOURCE).tmp $($(PKG)_DL_VERSION) && \

	gzip -c $(DL_DIR)/.$($(PKG)_SOURCE).tmp > $(DL_DIR)/$($(PKG)_SOURCE) && \

	rm -f $(DL_DIR)/.$($(PKG)_SOURCE).tmp && \

	popd > /dev/null && \

	rm -rf $($(PKG)_DL_DIR) && \

	popd > /dev/null)

	$(EXTRA_ENV) support/download/git $($(PKG)_SITE) $($(PKG)_DL_VERSION) \

					  $($(PKG)_BASE_NAME) $(DL_DIR)/$($(PKG)_SOURCE)

endef



# TODO: improve to check that the given PKG_DL_VERSION exists on the remote

support/download/git

0 → 100755
+37 −0
Original line number Diff line number Diff line 
#!/bin/bash



# We want to catch any command 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

# And this environment:

#   BR2_DL_DIR: path to Buildroot's download dir

#   GIT       : the git command to call



repo="${1}"

cset="${2}"

basename="${3}"

output="${4}"



repodir="${BR2_DL_DIR}/${basename}"



if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then

    printf "Doing shallow clone\n"

    ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${repodir}"

else

    printf "Doing full clone\n"

    ${GIT} clone --bare "${repo}" "${repodir}"

fi



pushd "${repodir}" >/dev/null

${GIT} archive --prefix="${basename}/" -o "${output}.tmp" --format=tar "${cset}"

gzip -c "${output}.tmp" >"${output}"

rm -f "${output}.tmp"

popd >/dev/null



rm -rf "${repodir}"