[Xen-changelog] [xen-unstable] Download external tarballs from xenbits.xensource.com

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1231154356 0
# Node ID d6889b3b64231dd4c2cd86ca6e66d0a4ef2d5dfc
# Parent  5a7caf864f4e31e17dc87a3bca2fc6c34c7b8839
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@xxxxxxxxxxxxx>
---
 Config.mk                              |    5 +++++
 Makefile                               |    3 ++-
 buildconfigs/src.tarball               |    2 +-
 stubdom/Makefile                       |   20 +++++++++++++++-----
 tools/firmware/hvmloader/acpi/Makefile |    3 ++-
 tools/vnet/Makefile                    |    3 ++-
 6 files changed, 27 insertions(+), 9 deletions(-)

diff -r 5a7caf864f4e -r d6889b3b6423 Config.mk
--- a/Config.mk Mon Jan 05 11:16:41 2009 +0000
+++ b/Config.mk Mon Jan 05 11:19:16 2009 +0000
@@ -96,6 +96,11 @@ FLASK_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 -r 5a7caf864f4e -r d6889b3b6423 Makefile
--- a/Makefile  Mon Jan 05 11:16:41 2009 +0000
+++ b/Makefile  Mon Jan 05 11:19:16 2009 +0000
@@ -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 -r 5a7caf864f4e -r d6889b3b6423 buildconfigs/src.tarball
--- a/buildconfigs/src.tarball  Mon Jan 05 11:16:41 2009 +0000
+++ b/buildconfigs/src.tarball  Mon Jan 05 11:19:16 2009 +0000
@@ -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 -r 5a7caf864f4e -r d6889b3b6423 stubdom/Makefile
--- a/stubdom/Makefile  Mon Jan 05 11:16:41 2009 +0000
+++ b/stubdom/Makefile  Mon Jan 05 11:19:16 2009 +0000
@@ -8,15 +8,25 @@ include $(XEN_ROOT)/Config.mk
 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 -r 5a7caf864f4e -r d6889b3b6423 tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile    Mon Jan 05 11:16:41 2009 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile    Mon Jan 05 11:19:16 2009 +0000
@@ -23,7 +23,8 @@ OBJS  = $(patsubst %.c,%.o,$(C_SRC))
 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 -r 5a7caf864f4e -r d6889b3b6423 tools/vnet/Makefile
--- a/tools/vnet/Makefile       Mon Jan 05 11:16:41 2009 +0000
+++ b/tools/vnet/Makefile       Mon Jan 05 11:19:16 2009 +0000
@@ -17,7 +17,8 @@ all: compile
 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

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