.config: Allow all URL(s) to be specified in .config

This allow building of XEN from source on a system without internet
access using either the environment or .config

Do the same with XEN_EXTFILES_URL, QEMU_REMOTE, IPXE_GIT_URL, and
IPXE_TARBALL_URL as QEMU_UPSTREAM_URL, SEABIOS_UPSTREAM_URL, etc.

Signed-off-by: Don Slutz <dslutz@verizon.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Config.mk b/Config.mk
index 7f3d8c7d7535cb4b1881b7021d124e70a51799d5..9b39d6c0335510952f9a1215c19426b33926e4df 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -213,15 +213,15 @@ EMBEDDED_EXTRA_CFLAGS += -fno-exceptions
 XSM_ENABLE ?= n
 FLASK_ENABLE ?= $(XSM_ENABLE)
 
-XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles
+XEN_EXTFILES_URL ?= http://xenbits.xen.org/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.
 
 ifeq ($(GIT_HTTP),y)
-QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-unstable.git
+QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git
 else
-QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-unstable.git
+QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git
 endif
 
 ifeq ($(GIT_HTTP),y)

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 15561fc0a8c8cc29227594bae4fd036b291aebbf..a0578d27c49c31dfbf31a6689f5c90370e390f51 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -5,14 +5,14 @@ include $(XEN_ROOT)/tools/Rules.mk
 include Config
 
 ifeq ($(GIT_HTTP),y)
-IPXE_GIT_URL := http://git.ipxe.org/ipxe.git
+IPXE_GIT_URL ?= http://git.ipxe.org/ipxe.git
 else
-IPXE_GIT_URL := git://git.ipxe.org/ipxe.git
+IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git
 endif
 
 IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e
 
-IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
+IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
 
 D=ipxe
 T=ipxe.tar.gz