etherboot: Download ipxe from XEN_EXTFILES_URL

Allows us to build even if the ipxe git server is down. We still fall
back to the git server if we cannot download a suitably named tarball
from our own URL.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index b5fc17edc750135fc824531dacd9bdd0dccad489..8c3a422e6baa164eca4d6e4ef120848b1e77023e 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -12,8 +12,10 @@ endif
 
 IPXE_GIT_TAG := v1.0.0
 
+IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
+
 D=ipxe
-T=ipxe-git-snapshot.tar.gz
+T=ipxe.tar.gz
 
 ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(NICS)))
 
@@ -33,10 +35,13 @@ eb-roms.h: Config
        mv -f $@.new $@
 
 $T:
-       $(GIT) clone $(IPXE_GIT_URL) $D.git
-       cd $D.git && \
-       $(GIT) archive --format=tar --prefix=$D/ $(IPXE_GIT_TAG) | gzip >../$T
-       rm -rf $D.git
+       if ! wget -O _$T $(IPXE_TARBALL_URL); then \
+               $(GIT) clone $(IPXE_GIT_URL) $D.git; \
+               (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
+               $(IPXE_GIT_TAG) | gzip >../_$T); \
+               rm -rf $D.git; \
+       fi
+       mv _$T $T
 
 $D/src/arch/i386/Makefile: $T Config
        rm -rf $D
@@ -51,7 +56,7 @@ $D/src/bin/NIC: $D/src/arch/i386/Makefile
 
 .PHONY: clean
 clean:
-       rm -rf $D $D.git *~ eb-roms.h
+       rm -rf $D $D.git *~ eb-roms.h _$T
 
 .PHONY: distclean
 distclean: clean