aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-01-05 11:19:16 +0000
committerKeir Fraser <keir.fraser@citrix.com>2009-01-05 11:19:16 +0000
commitcbd07b72a3674387f19e4c7fc44c73c08dc8a58d (patch)
treec7275ce4ce9f74233bb7a48d4c43306767945e6c
parent75c35a3fb6368e14de0c9c9aafad73ffa83cd6b7 (diff)
downloadxen-cbd07b72a3674387f19e4c7fc44c73c08dc8a58d.tar.gz
xen-cbd07b72a3674387f19e4c7fc44c73c08dc8a58d.tar.bz2
xen-cbd07b72a3674387f19e4c7fc44c73c08dc8a58d.zip
Download external tarballs from xenbits.xensource.com
I have copied the tarballs that the xen-unstable build downloads to xenbits.xensource.com (which also hosts our hg and git). This patch changes the download URLs to use that location. That way the build will depend on only one external machine, under one administration, rather than many. Also it means that the build won't break if these sites become permanently unavailable or are rearranged and we don't run a risk of having to panic and beg if a file should go missing. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--Config.mk5
-rw-r--r--Makefile3
-rw-r--r--buildconfigs/src.tarball2
-rw-r--r--stubdom/Makefile20
-rw-r--r--tools/firmware/hvmloader/acpi/Makefile3
-rw-r--r--tools/vnet/Makefile3
6 files changed, 27 insertions, 9 deletions
diff --git a/Config.mk b/Config.mk
index 9280228060..5c92a223e1 100644
--- a/Config.mk
+++ b/Config.mk
@@ -96,6 +96,11 @@ XSM_ENABLE ?= n
FLASK_ENABLE ?= n
ACM_SECURITY ?= 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.
+
QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
# Specify which qemu-dm to use. This may be `ioemu' to use the old
diff --git a/Makefile b/Makefile
index 2b724bb065..d43a2f9c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -240,7 +240,8 @@ linux26:
#
TBOOT_TARFILE = tboot-20080613.tar.gz
-TBOOT_BASE_URL = http://downloads.sourceforge.net/tboot
+#TBOOT_BASE_URL = http://downloads.sourceforge.net/tboot
+TBOOT_BASE_URL = $(XEN_EXTFILES_URL)
.PHONY: build-tboot
build-tboot: download_tboot
diff --git a/buildconfigs/src.tarball b/buildconfigs/src.tarball
index c356e4ccf5..2101e1a130 100644
--- a/buildconfigs/src.tarball
+++ b/buildconfigs/src.tarball
@@ -10,7 +10,7 @@ vpath linux-%.tar.bz2 $(LINUX_SRC_PATH)
# download a pristine Linux kernel tarball if there isn't one in LINUX_SRC_PATH
linux-%.tar.bz2:
@echo "Cannot find $@ in path $(LINUX_SRC_PATH)"
- wget $(XEN_LINUX_MIRROR)/$@ -O./$@
+ false wget $(XEN_LINUX_MIRROR)/$@ -O./$@
# XXX create a pristine tree for diff -Nurp convenience
diff --git a/stubdom/Makefile b/stubdom/Makefile
index da7be4e333..571027007d 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -8,15 +8,25 @@ export debug=y
include $(XEN_ROOT)/Config.mk
IOEMU_OPTIONS=--disable-sdl --disable-opengl --disable-vnc-tls --disable-brlapi --disable-kqemu
-ZLIB_URL?=http://www.zlib.net
+
+#ZLIB_URL?=http://www.zlib.net
+ZLIB_URL=$(XEN_EXTFILES_URL)
ZLIB_VERSION=1.2.3
-LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils
+
+#LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils
+LIBPCI_URL?=$(XEN_EXTFILES_URL)
LIBPCI_VERSION=2.2.9
-NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib
+
+#NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib
+NEWLIB_URL?=$(XEN_EXTFILES_URL)
NEWLIB_VERSION=1.16.0
-LWIP_URL?=http://download.savannah.gnu.org/releases/lwip
+
+#LWIP_URL?=http://download.savannah.gnu.org/releases/lwip
+LWIP_URL?=$(XEN_EXTFILES_URL)
LWIP_VERSION=1.3.0
-GRUB_URL?=http://alpha.gnu.org/gnu/grub
+
+#GRUB_URL?=http://alpha.gnu.org/gnu/grub
+GRUB_URL?=$(XEN_EXTFILES_URL)
GRUB_VERSION=0.97
WGET=wget -c
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index 47a7bea66c..49245aa089 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -23,7 +23,8 @@ H_SRC = $(wildcard *.h)
OBJS = $(patsubst %.c,%.o,$(C_SRC))
IASL_VER = acpica-unix-20080729
-IASL_URL = http://acpica.org/download/$(IASL_VER).tar.gz
+#IASL_URL = http://acpica.org/download/$(IASL_VER).tar.gz
+IASL_URL = $(XEN_EXTFILES_URL)/$(IASL_VER).tar.gz
CFLAGS += -I. -I.. $(CFLAGS_include)
diff --git a/tools/vnet/Makefile b/tools/vnet/Makefile
index 33827c6a90..af69d39bf0 100644
--- a/tools/vnet/Makefile
+++ b/tools/vnet/Makefile
@@ -17,7 +17,8 @@ SUBDIRS+= vnet-module
all: compile
gc.tar.gz:
- wget http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$@
+ #wget http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$@
+ wget $(XEN_EXTFILES_URL)/$@
.PHONY: gc
gc: gc.tar.gz