mirror of
https://github.com/xen-project/xen.git
synced 2026-10-30 03:00:05 +01:00
Clone and build upstream Qemu by default
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
Stefano Stabellini committed
1 parent
145854fa0d
commit
9233be8d2c
4 files changed
+23
-1
No files matched your search
@@ -293,6 +293,8 @@
|
||||
^tools/xm-test/tests/.*\.test$
|
||||
^tools/qemu-xen-traditional-dir-remote
|
||||
^tools/qemu-xen-traditional-dir$
|
||||
^tools/qemu-xen-dir-remote
|
||||
^tools/qemu-xen-dir$
|
||||
^tools/ocaml/.*/.*\.annot$
|
||||
^tools/ocaml/.*/.*\.cmx?a$
|
||||
^tools/ocaml/.*/META$
|
||||
|
||||
@@ -192,6 +192,10 @@ else
|
||||
QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git
|
||||
endif
|
||||
|
||||
# Only available through the git protocol at the moment
|
||||
QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/people/sstabellini/qemu-dm.git
|
||||
QEMU_UPSTREAM_TAG ?= origin/xen-stable-0.15
|
||||
|
||||
# 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
|
||||
|
||||
@@ -70,7 +70,7 @@ install-tools:
|
||||
$(MAKE) -C tools install
|
||||
|
||||
ifeq ($(CONFIG_IOEMU),y)
|
||||
install-tools: tools/qemu-xen-traditional-dir
|
||||
install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir
|
||||
endif
|
||||
|
||||
.PHONY: install-kernels
|
||||
@@ -91,6 +91,9 @@ tools/qemu-xen-traditional-dir:
|
||||
tools/qemu-xen-traditional-dir-force-update:
|
||||
$(MAKE) -C tools qemu-xen-traditional-dir-force-update
|
||||
|
||||
tools/qemu-xen-dir:
|
||||
$(MAKE) -C tools qemu-xen-dir-find
|
||||
|
||||
.PHONY: install-docs
|
||||
install-docs:
|
||||
sh ./docs/check_pkgs && $(MAKE) -C docs install || true
|
||||
|
||||
@@ -31,6 +31,7 @@ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
|
||||
# do not recurse in to a dir we are about to delete
|
||||
ifneq "$(MAKECMDGOALS)" "distclean"
|
||||
SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
|
||||
SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
|
||||
endif
|
||||
|
||||
SUBDIRS-y += xenpmd
|
||||
@@ -71,6 +72,7 @@ clean: subdirs-clean
|
||||
.PHONY: distclean
|
||||
distclean: subdirs-distclean
|
||||
rm -rf qemu-xen-traditional-dir qemu-xen-traditional-dir-remote
|
||||
rm -rf qemu-xen-dir qemu-xen-dir-remote
|
||||
|
||||
ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
|
||||
IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
|
||||
@@ -81,6 +83,9 @@ endif
|
||||
qemu-xen-traditional-dir-find:
|
||||
$(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) qemu-xen-traditional-dir
|
||||
|
||||
qemu-xen-dir-find:
|
||||
$(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_URL) $(QEMU_UPSTREAM_TAG) qemu-xen-dir
|
||||
|
||||
.PHONY: qemu-xen-traditional-dir-force-update
|
||||
qemu-xen-traditional-dir-force-update:
|
||||
set -ex; \
|
||||
@@ -98,6 +103,14 @@ subdir-clean-qemu-xen-traditional-dir:
|
||||
$(MAKE) -C qemu-xen-traditional-dir clean; \
|
||||
fi
|
||||
|
||||
subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
|
||||
|
||||
subdir-clean-qemu-xen-dir:
|
||||
set -e; if test -d qemu-xen-dir/.; then \
|
||||
$(buildmakevars2shellvars); \
|
||||
$(MAKE) -C qemu-xen-dir clean; \
|
||||
fi
|
||||
|
||||
subdir-clean-debugger/gdbsx subdir-distclean-debugger/gdbsx: .phony
|
||||
$(MAKE) -C debugger/gdbsx clean
|
||||
|
||||
|
||||