mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools: Make qemu-xen-traditional build optional.
Now that we have upstream qemu people may want to avoid building this extra code. There is a little bit of trickery in stubdom/configure.ac to ensure that the ioemu stubdom is only built if qemu-traditional is enabled. libxl will return an error if a caller tries to build a domain using qemu-xen-traditional when this support was disabled at build time. Since qemu-xen-traditional has been historically tightly bound to the Xen releases I don't see any value in supporting "3rd party" provision of qemu-xen-traditional. We also do not want/need this on ARM therefore default is on for x86 and off otherwise. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> [ ijc -- trivial conflicts in Tools.mk.in and tools/configure.ac. Reran autogen.sh ]
This commit is contained in:
Ian Campbell committed
1 parent
874f76a86a
commit
b0f69ec5c7
9 files changed
+238
-29
No files matched your search
@@ -73,20 +73,8 @@ install-xen:
|
||||
install-tools:
|
||||
$(MAKE) -C tools install
|
||||
|
||||
ifeq ($(CONFIG_IOEMU),y)
|
||||
install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir
|
||||
endif
|
||||
|
||||
.PHONY: install-kernels
|
||||
install-kernels:
|
||||
for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
|
||||
|
||||
.PHONY: install-stubdom
|
||||
install-stubdom: tools/qemu-xen-traditional-dir install-tools
|
||||
$(MAKE) -C stubdom install
|
||||
ifeq (x86_64,$(XEN_TARGET_ARCH))
|
||||
XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
|
||||
endif
|
||||
ifeq ($(CONFIG_QEMU_TRAD),y)
|
||||
QEMU_TRAD_DIR_TGT := tools/qemu-xen-traditional-dir
|
||||
|
||||
tools/qemu-xen-traditional-dir:
|
||||
$(MAKE) -C tools qemu-xen-traditional-dir-find
|
||||
@@ -94,6 +82,22 @@ tools/qemu-xen-traditional-dir:
|
||||
.PHONY: tools/qemu-xen-traditional-dir-force-update
|
||||
tools/qemu-xen-traditional-dir-force-update:
|
||||
$(MAKE) -C tools qemu-xen-traditional-dir-force-update
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_IOEMU),y)
|
||||
install-tools: $(QEMU_TRAD_DIR_TARGET) tools/qemu-xen-dir
|
||||
endif
|
||||
|
||||
.PHONY: install-kernels
|
||||
install-kernels:
|
||||
for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
|
||||
|
||||
.PHONY: install-stubdom
|
||||
install-stubdom: $(QEMU_TRAD_DIR_TARGET) install-tools
|
||||
$(MAKE) -C stubdom install
|
||||
ifeq (x86_64,$(XEN_TARGET_ARCH))
|
||||
XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
|
||||
endif
|
||||
|
||||
tools/qemu-xen-dir:
|
||||
$(MAKE) -C tools qemu-xen-dir-find
|
||||
|
||||