[Xen-changelog] [xen-unstable] build: Make all GIT download URLs depend correctly on GIT_HTTP={y, n}

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1279699330 -3600
# Node ID e8dbc1262f52f0d710dc73e43aafc42ed9d7e31b
# Parent  3c00cb0d9bc468c2dee2051c4e03a88e11e4c219
build: Make all GIT download URLs depend correctly on GIT_HTTP={y,n}

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 Config.mk                         |   12 ++++++++++--
 tools/firmware/etherboot/Makefile |    7 +++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff -r 3c00cb0d9bc4 -r e8dbc1262f52 Config.mk
--- a/Config.mk Wed Jul 21 08:43:35 2010 +0100
+++ b/Config.mk Wed Jul 21 09:02:10 2010 +0100
@@ -140,14 +140,22 @@ FLASK_ENABLE ?= n
 FLASK_ENABLE ?= n
 ACM_SECURITY ?= n
 
+# Download GIT repositories via HTTP or GIT's own protocol?
+# GIT's protocol is faster and more robust, when it works at all (firewalls
+# may block it). We make it the default, but if your GIT repository downloads
+# fail or hang, please specify GIT_HTTP=y in your environment.
+GIT_HTTP ?= n
+
 XEN_EXTFILES_URL=http://xenbits.xensource.com/xen-extfiles
 # All the files at that location were downloaded from elsewhere on
 # the internet.  The original download URL is preserved as a comment
 # near the place in the Xen Makefiles where the file is used.
 
-# GIT protocol can be faster than HTTP, if your firewall lets it through.
-# QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git
+ifeq ($(GIT_HTTP),y)
 QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
+else
+QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git
+endif
 
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.
diff -r 3c00cb0d9bc4 -r e8dbc1262f52 tools/firmware/etherboot/Makefile
--- a/tools/firmware/etherboot/Makefile Wed Jul 21 08:43:35 2010 +0100
+++ b/tools/firmware/etherboot/Makefile Wed Jul 21 09:02:10 2010 +0100
@@ -4,9 +4,12 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 include Config
 
-# NB. git:// protocol is faster but doesn't work through all firewalls
-# GPXE_GIT_URL := git://git.etherboot.org/scm/gpxe.git
+ifeq ($(GIT_HTTP),y)
 GPXE_GIT_URL := http://git.etherboot.org/scm/gpxe.git
+else
+GPXE_GIT_URL := git://git.etherboot.org/scm/gpxe.git
+endif
+
 GPXE_GIT_TAG := v1.0.1
 
 D=gpxe

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog