aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@spot.cl.cam.ac.uk <iap10@spot.cl.cam.ac.uk>2005-06-21 06:20:10 +0000
committeriap10@spot.cl.cam.ac.uk <iap10@spot.cl.cam.ac.uk>2005-06-21 06:20:10 +0000
commit677f37671b794a0f0e39fad4ecc6679e4f738809 (patch)
tree0e31f4837c15b51885091bc618c3d211cdc0bb34
parentf21629e0cc48365033a387706844c140175e1708 (diff)
parent38539de55fb54b72f3aa5add2f301ea29edcf3dd (diff)
downloadxen-677f37671b794a0f0e39fad4ecc6679e4f738809.tar.gz
xen-677f37671b794a0f0e39fad4ecc6679e4f738809.tar.bz2
xen-677f37671b794a0f0e39fad4ecc6679e4f738809.zip
bitkeeper revision 1.1718.1.10 (42b7b19aqOS_1M8I4pIOFjiTPYWV-g)
Merge bk://xenbits.xensource.com/xen-unstable.bk into spot.cl.cam.ac.uk:C:/Documents and Settings/iap10/xen-unstable.bk
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--Config.mk3
-rw-r--r--buildconfigs/Rules.mk2
3 files changed, 5 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index afc6cd647f..0a5c65b3d9 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -38,6 +38,7 @@ iap10@labyrinth.cl.cam.ac.uk
iap10@nidd.cl.cam.ac.uk
iap10@pb001.cl.cam.ac.uk
iap10@pb007.cl.cam.ac.uk
+iap10@spot.cl.cam.ac.uk
iap10@striker.cl.cam.ac.uk
iap10@tetris.cl.cam.ac.uk
jrb44@plym.cl.cam.ac.uk
diff --git a/Config.mk b/Config.mk
index b3320b2711..390a9b3abe 100644
--- a/Config.mk
+++ b/Config.mk
@@ -31,3 +31,6 @@ endif
LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
+
+# Choose the best mirror to download linux kernel
+KERNEL_REPO = http://www.kernel.org
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index be672feab5..f2e65f0046 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -27,7 +27,7 @@ vpath linux-%.tar.bz2 $(LINUX_SRC_PATH)
linux-%.tar.bz2: override _LINUX_VDIR = $(word 1,$(subst ., ,$*)).$(word 2,$(subst ., ,$*))
linux-%.tar.bz2:
@echo "Cannot find $@ in path $(LINUX_SRC_PATH)"
- wget http://www.kernel.org/pub/linux/kernel/v$(_LINUX_VDIR)/$@ -O./$@
+ wget $(KERNEL_REPO)/pub/linux/kernel/v$(_LINUX_VDIR)/$@ -O./$@
# Expand NetBSD release to NetBSD version
NETBSD_RELEASE ?= 2.0