aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-07-21 09:14:20 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-07-21 09:14:20 +0100
commita902c96cb0f9dbe638abb71bc18e0e0aa5c9ad26 (patch)
tree2fe65419e379c2ff659deb749b6a7676c5f41051
parent94eae92de5d3fd98b96637d24dcb05b4f3772a3e (diff)
downloadxen-a902c96cb0f9dbe638abb71bc18e0e0aa5c9ad26.tar.gz
xen-a902c96cb0f9dbe638abb71bc18e0e0aa5c9ad26.tar.bz2
xen-a902c96cb0f9dbe638abb71bc18e0e0aa5c9ad26.zip
build: Make all GIT download URLs depend correctly on GIT_HTTP={y,n}
Signed-off-by: Keir Fraser <keir.fraser@citrix.com> xen-unstable changeset: 21838:e8dbc1262f52 xen-unstable date: Wed Jul 21 09:02:10 2010 +0100
-rw-r--r--Config.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/Config.mk b/Config.mk
index 4c4bbcd963..c5beeaecd7 100644
--- a/Config.mk
+++ b/Config.mk
@@ -139,14 +139,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-4.0-testing.git
+else
+QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-4.0-testing.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.