[Buildroot] [PATCH 1/1] support/download/git: add --reference option to git clone.

* [Buildroot] [PATCH 1/1] support/download/git: add --reference option to git clone.
@ 2016-06-01 14:03 Julien Rosener
  2016-06-08 22:08 ` Yann E. MORIN
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Julien Rosener @ 2016-06-01 14:03 UTC (permalink / raw)
  To: buildroot

In case of big Git repositories stored over very slow network, git clone can
take hours to be done. The option --reference can be used to specify a local
cache directory which contains mirrors.

The cache directory is a bare git repository:
  git init --bare
All mirrored repositories are added into this repository:
  git remote add <repo_name> <repo_url>
The full cache directory can be periodically updated:
  git fetch --all

It does not matter if the cache directory is not fully up to date because Git
will take the last changes from the real remote repository. If a repository is
not in the cache, git will do a full remote clone without error.

A buildroot variable was added to specify the path of the cache directory
(BR2_GIT_CACHE) at the "Build options >> Commands >> git" menu entry level. The
value is passed to the Git download helper script as an argument and is used if
defined (indeed in this case every calls to git clone will be using the cache
directory).

Signed-off-by: Julien Rosener <julien.rosener@digital-scratch.org>
---
 Config.in               | 6 ++++++
 package/pkg-download.mk | 3 ++-
 support/download/git    | 9 ++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Config.in b/Config.in
index 9bc8e51..f2bb5a6 100644
--- a/Config.in
+++ b/Config.in
@@ -96,6 +96,12 @@ config BR2_GIT
 	string "Git command"
 	default "git"
 
+config BR2_GIT_CACHE
+	string "Git cache directory"
+	default ""
+	help
+	  Path of Git cache directory (usefull to speed up git clone).
+
 config BR2_CVS
 	string "CVS command"
 	default "cvs"
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index a0f694d..5c017ca 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -80,7 +80,8 @@ define DOWNLOAD_GIT
 		-- \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
-		$($(PKG)_BASE_NAME)
+		$($(PKG)_BASE_NAME) \
+		$(BR2_GIT_CACHE)
 endef
 
 # 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 314b388..e461916 100755
--- a/support/download/git
+++ b/support/download/git
@@ -6,7 +6,7 @@ set -e
 # Download helper for git, to be called from the download wrapper script
 #
 # Call it as:
-#   .../git [-q] OUT_FILE REPO_URL CSET BASENAME
+#   .../git [-q] OUT_FILE REPO_URL CSET BASENAME REFERENCE
 #
 # Environment:
 #   GIT      : the git command to call
@@ -24,6 +24,9 @@ output="${1}"
 repo="${2}"
 cset="${3}"
 basename="${4}"
+if [ -n "${5}" ]; then
+    reference="--reference \"${5}\""
+fi
 
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
@@ -41,7 +44,7 @@ _git() {
 git_done=0
 if [ -n "$(_git ls-remote "'${repo}'" "'${cset}'" 2>&1)" ]; then
     printf "Doing shallow clone\n"
-    if _git clone ${verbose} --depth 1 -b "'${cset}'" --bare "'${repo}'" "'${basename}'"; then
+    if _git clone ${verbose} ${reference} --depth 1 -b "'${cset}'" --bare "'${repo}'" "'${basename}'"; then
         git_done=1
     else
         printf "Shallow clone failed, falling back to doing a full clone\n"
@@ -49,7 +52,7 @@ if [ -n "$(_git ls-remote "'${repo}'" "'${cset}'" 2>&1)" ]; then
 fi
 if [ ${git_done} -eq 0 ]; then
     printf "Doing full clone\n"
-    _git clone ${verbose} --mirror "'${repo}'" "'${basename}'"
+    _git clone ${verbose} ${reference} --mirror "'${repo}'" "'${basename}'"
 fi
 
 GIT_DIR="${basename}" \
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread