diff options
author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2011-09-14 11:38:13 +0100 |
---|---|---|
committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2011-09-14 11:38:13 +0100 |
commit | dcbc297aea6a159f2f5fad5de84666f23c2d17ad (patch) | |
tree | 3295980699da6f3ad181008469ea380a8f59ce69 /Makefile | |
parent | 2093b2b5db510fbfac4417326f8cbf16a2896abe (diff) | |
download | xen-dcbc297aea6a159f2f5fad5de84666f23c2d17ad.tar.gz xen-dcbc297aea6a159f2f5fad5de84666f23c2d17ad.tar.bz2 xen-dcbc297aea6a159f2f5fad5de84666f23c2d17ad.zip |
tools: Revert seabios and upstream qemu build changes
These have broken the build and it seems to be difficult to fix. So
we will revert the whole lot for now, and await corrected patch(es).
Revert "fix the build when CONFIG_QEMU is specified by the user"
Revert "tools: fix permissions of git-checkout.sh"
Revert "scripts/git-checkout.sh: Is not bash specific. Invoke with /bin/sh."
Revert "Clone and build Seabios by default"
Revert "Clone and build upstream Qemu by default"
Revert "Rename ioemu-dir as qemu-xen-traditional-dir"
Revert "Move the ioemu-dir-find shell script to an external file"
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -70,7 +70,7 @@ install-tools: $(MAKE) -C tools install ifeq ($(CONFIG_IOEMU),y) -install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir +install-tools: tools/ioemu-dir endif .PHONY: install-kernels @@ -78,21 +78,18 @@ 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 +install-stubdom: tools/ioemu-dir 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-traditional-dir: - $(MAKE) -C tools qemu-xen-traditional-dir-find +tools/ioemu-dir: + $(MAKE) -C tools ioemu-dir-find -.PHONY: tools/qemu-xen-traditional-dir-force-update -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: tools/ioemu-dir-force-update +tools/ioemu-dir-force-update: + $(MAKE) -C tools ioemu-dir-force-update .PHONY: install-docs install-docs: |