build: Make all GIT download URLs depend correctly on GIT_HTTP={y,n}

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/Config.mk b/Config.mk
index 5c5b66a3b7f4ad0b4ac33077484c05494aa12108..cd15726009cb65222e5c384bf9ca0248b9cc27f6 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -140,14 +140,22 @@ XSM_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 --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 1fd4ebc4912a918f12c15aaf8c7ec2c48dfe4508..e8adf6350a7d5912d153c7aab3bf758df8129f1b 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -4,9 +4,12 @@ XEN_ROOT = ../../..
 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