[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 1/2] make: Check tools/qemu-xen[-traditional] for qemu before downloading
Currently xen, qemu-xen, and qemu-xen-traditional are kept in separate repositories, but when we release them as a tarball, qemu-xen and qemu-xen-traditional are in-lined into the tools/ directory. In order to make this "just work", at the moment developer doing the release manually modifies Config.mk as part of the relase process so that CONFIG_QEMU and QEMU_UPSTREAM_URL point into the tools/ directory instead. Modify Config.mk to automatically check there before trying a remote repository. Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx> --- Since we're essentially manually doing this for each release anyway, I propose this c/s be backported to all currently-maintained branches. CC: Ian Campbell <ian.campbell@xxxxxxxxxx> CC: Ian Jackson <ian.jackson@xxxxxxxxxx> CC: Jan Beulich <jbeulich@xxxxxxxx> --- Config.mk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Config.mk b/Config.mk index e7f14ef..dac9893 100644 --- a/Config.mk +++ b/Config.mk @@ -224,6 +224,19 @@ else QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git endif +# Specify which qemu-dm to use. This may be `ioemu' to use the old +# Mercurial in-tree version, or a local directory, or a git URL. +# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git +ifneq (,$(wildcard $(XEN_ROOT)/tools/qemu-xen-traditional)) +CONFIG_QEMU ?= $(XEN_ROOT)/tools/qemu-xen-traditional +else +CONFIG_QEMU ?= $(QEMU_REMOTE) +endif + +ifneq (,$(wildcard $(XEN_ROOT)/tools/qemu-xen)) +QEMU_UPSTREAM_URL ?= $(XEN_ROOT)/tools/qemu-xen +endif + ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git @@ -241,11 +254,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.7.4 ETHERBOOT_NICS ?= rtl8139 8086100e -# Specify which qemu-dm to use. This may be `ioemu' to use the old -# Mercurial in-tree version, or a local directory, or a git URL. -# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git -CONFIG_QEMU ?= $(QEMU_REMOTE) - QEMU_TAG ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |