[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] Allow bootstrap to build gnulib from local git source if $GNULIB_SRCDIR is non-empty.



'bootstrap' script clones the .gnulib submodule from upstream git 
sources only (provided in .gitmodules), irrespective of whether 
$GNULIB_SRCDIR is provided.
This patch allows gnulib git sources provided by $GNULIB_SRCDIR to be 
used for adding the gnulib submodule.

>From c5428697c4a1c34daaefaa38708bd59d3b9eefed Mon Sep 17 00:00:00 2001
From: Prerna Saxena <prerna linux vnet ibm com>
Date: Mon, 9 May 2011 13:30:59 +0530
Subject: [PATCH] [Fix] Do not pull from upstream git repo if local copy 
of git sources is provided.
Presently, gnulib gets cloned from git://git.sv.gnu.org/gnulib.git 
irrespective of local sources in $GNULIB_SRCDIR.

---
 bootstrap |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bootstrap b/bootstrap
index 7cbb5dc..145e4cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -528,7 +528,7 @@ case ${GNULIB_SRCDIR--} in
     echo "$0: getting gnulib files..."
     if git submodule -h|grep -- --reference > /dev/null; then
       # Prefer the one-liner available in git 1.6.4 or newer.
-      git submodule update --init --reference "$GNULIB_SRCDIR" \
+      git submodule update --reference "$GNULIB_SRCDIR" \
         "$gnulib_path" || exit $?
     else
       # This fallback allows at least git 1.5.5.
-- 
1.7.2.5


-- 
Prerna Saxena

Linux Technology Centre,
IBM Systems and Technology Lab,
Bangalore, India


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]