[PATCH] [UPDATE] stubdom: compile stubdom with qemu-remote

[PATCH] [UPDATE] stubdom: compile stubdom with qemu-remote

[Stefano Stabellini]

I am updating this patch to use the tools/ioemu-dir symlink as qemu
source directory in case CONFIG_QEMU != ioemu.
Before we were trying to figure out where is the actual qemu source dir
again.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

---

diff -r f5e72cbfbb17 stubdom/Makefile
--- a/stubdom/Makefile	Wed Sep 10 11:26:16 2008 +0100
+++ b/stubdom/Makefile	Thu Sep 11 18:30:03 2008 +0100
@@ -6,8 +6,6 @@ export stubdom=y
 export stubdom=y
 export debug=y
 include $(XEN_ROOT)/Config.mk
-
-override CONFIG_QEMU=ioemu
 
 IOEMU_OPTIONS=--disable-sdl --disable-opengl --disable-vnc-tls --disable-brlapi --disable-kqemu
 ZLIB_URL?=http://www.zlib.net
@@ -59,8 +57,8 @@ TARGET_CPPFLAGS += -isystem $(CURDIR)/$(
 TARGET_CPPFLAGS += -isystem $(CURDIR)/$(MINI_OS)/include/posix
 TARGET_CPPFLAGS += -isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include
 TARGET_CPPFLAGS += -isystem $(GCC_INSTALL)include
-TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip/src/include
-TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip/src/include/ipv4
+TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include
+TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include/ipv4
 TARGET_CPPFLAGS += -I$(CURDIR)/include
 
 TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib
@@ -164,7 +162,10 @@ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VER
 .PHONY: $(CROSS_ROOT)
 $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
 
-mk-headers-$(XEN_TARGET_ARCH):
+$(XEN_ROOT)/tools/ioemu-dir:
+	make -C $(XEN_ROOT)/tools ioemu-dir-find
+
+mk-headers-$(XEN_TARGET_ARCH): $(XEN_ROOT)/tools/ioemu-dir
 	mkdir -p include/xen && \
           ln -sf $(addprefix ../../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) include/xen && \
           ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) include/xen && \
@@ -189,7 +190,7 @@ ifeq ($(CONFIG_QEMU),ioemu)
 	  ln -sf ../$(XEN_ROOT)/tools/ioemu/* .)
 else
 	[ -h ioemu/Makefile ] || ( cd ioemu && \
-	  ln -sf $(CONFIG_QEMU)/* . && \
+	  ln -sf ../$(XEN_ROOT)/tools/ioemu-dir/* . && \
           rm -fr i386-dm && \
           rm -fr i386-stubdom && \
           mkdir i386-dm && \
@@ -336,7 +337,7 @@ clean:
 	$(MAKE) -C c clean
 	rm -fr grub-$(XEN_TARGET_ARCH)
 	[ ! -d libxc-$(XEN_TARGET_ARCH) ] || $(MAKE) -C libxc-$(XEN_TARGET_ARCH) clean
-	[ ! -d ioemu ] || $(MAKE) -C ioemu clean
+	-[ ! -d ioemu ] || $(MAKE) -C ioemu clean
 
 # clean the cross-compilation result
 .PHONY: crossclean