mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 18:21:39 +01:00
Revert 61c0c52a8c6c "qemu-xen: build adjustments"
It appears that the changeset qemu-xen: build adjustments to support out-of-tree builds broke the build. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
Ian Jackson committed
1 parent
762626dd33
commit
16f2fb18bc
3 files changed
+16
-21
No files matched your search
@@ -185,9 +185,9 @@ endif
|
||||
# CONFIG_QEMU ?= ../qemu-xen.git
|
||||
CONFIG_QEMU ?= $(QEMU_REMOTE)
|
||||
|
||||
QEMU_TAG ?= ad78ccc35617610bc43112788d28a05878fac91f
|
||||
# Tue Nov 23 16:40:08 2010 +0000
|
||||
# qemu-xen: build adjustments to support out-of-tree builds
|
||||
QEMU_TAG ?= 60766b459c41e429a4b2405124b42512ea362984
|
||||
# Fri Nov 19 18:50:43 2010 +0000
|
||||
# passthrough: let xen choose the pirq number
|
||||
|
||||
# Optional components
|
||||
XENSTAT_XENTOP ?= y
|
||||
|
||||
+2
-12
@@ -215,9 +215,6 @@ $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp
|
||||
.PHONY: $(CROSS_ROOT)
|
||||
$(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
|
||||
|
||||
QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
|
||||
|
||||
ifeq ($(QEMU_ROOT),.)
|
||||
$(XEN_ROOT)/tools/ioemu-dir:
|
||||
$(CROSS_MAKE) -C $(XEN_ROOT)/tools ioemu-dir-find
|
||||
|
||||
@@ -234,13 +231,6 @@ ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/ioemu-dir
|
||||
)) | \
|
||||
while read f; do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done
|
||||
touch ioemu/linkfarm.stamp
|
||||
else
|
||||
export QEMU_ROOT
|
||||
|
||||
ioemu/linkfarm.stamp:
|
||||
mkdir -p ioemu
|
||||
touch ioemu/linkfarm.stamp
|
||||
endif
|
||||
|
||||
mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
|
||||
mkdir -p include/xen && \
|
||||
@@ -297,8 +287,8 @@ ioemu: cross-zlib cross-libpci libxc
|
||||
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
||||
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
$(QEMU_ROOT)/xen-setup-stubdom )
|
||||
$(CROSS_MAKE) -C ioemu -f $(QEMU_ROOT)/Makefile
|
||||
./xen-setup-stubdom )
|
||||
$(CROSS_MAKE) -C ioemu
|
||||
|
||||
######
|
||||
# caml
|
||||
|
||||
+11
-6
@@ -81,15 +81,20 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
|
||||
--interp-prefix=$(CROSS_SYS_ROOT)
|
||||
endif
|
||||
|
||||
QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
|
||||
ifneq ($(QEMU_ROOT),.)
|
||||
export QEMU_ROOT
|
||||
endif
|
||||
ioemu/config-host.mak:
|
||||
cd ioemu && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure \
|
||||
--prefix=$(PREFIX) $(IOEMU_CONFIGURE_CROSS)
|
||||
|
||||
subdir-all-ioemu subdir-install-ioemu: ioemu/config-host.mak
|
||||
|
||||
subdir-clean-ioemu:
|
||||
$(MAKE) -C ioemu distclean
|
||||
|
||||
ioemu-dir-find:
|
||||
set -ex; \
|
||||
if test -d $(CONFIG_QEMU); then \
|
||||
mkdir -p ioemu-dir; \
|
||||
rm -f ioemu-dir; \
|
||||
ln -sf $(CONFIG_QEMU) ioemu-dir; \
|
||||
else \
|
||||
if [ ! -d ioemu-remote ]; then \
|
||||
rm -rf ioemu-remote ioemu-remote.tmp; \
|
||||
@@ -110,7 +115,7 @@ ioemu-dir-find:
|
||||
$(absolutify_xen_root); \
|
||||
$(buildmakevars2shellvars); \
|
||||
cd ioemu-dir; \
|
||||
$(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS)
|
||||
./xen-setup $(IOEMU_CONFIGURE_CROSS)
|
||||
|
||||
.PHONY: ioemu-dir-force-update
|
||||
ioemu-dir-force-update:
|
||||
|
||||