[Xen-changelog] [xen-unstable] ioemu-stubdom: Use xen-setup-stubdom rather than configure

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1237397413 0
# Node ID 2039e82710512f2b4b45f83cf4cdb3b037bf0d7c
# Parent  6c20b04e5577ddd09387d9edfdb89527ef4cff3b
ioemu-stubdom: Use xen-setup-stubdom rather than configure

xen-setup runs the upstream configure script, and ends up
autodetecting various properties of the host and then trying to use
them in stubdom, which works badly.

In commit c609854fe18aab3216f28e1e5291b75970d398d5 in
qemu-xen-unstable we provide a new `xen-setup-stubdom' script, which
hardcodes the relevant answers.

With these two changes, stubdom should compile again.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 stubdom/Makefile |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff -r 6c20b04e5577 -r 2039e8271051 stubdom/Makefile
--- a/stubdom/Makefile  Wed Mar 18 17:25:54 2009 +0000
+++ b/stubdom/Makefile  Wed Mar 18 17:30:13 2009 +0000
@@ -6,8 +6,6 @@ export stubdom=y
 export stubdom=y
 export debug=y
 include $(XEN_ROOT)/Config.mk
-
-IOEMU_OPTIONS=--disable-sdl --disable-opengl --disable-vnc-tls 
--disable-brlapi --disable-kqemu --disable-vde
 
 #ZLIB_URL?=http://www.zlib.net
 ZLIB_URL=$(XEN_EXTFILES_URL)
@@ -237,8 +235,12 @@ ioemu: cross-zlib cross-libpci libxc
        [ -f ioemu/config-host.mak ] || \
          ( $(absolutify_xen_root); \
            cd ioemu ; \
-          CONFIG_STUBDOM=yes XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) 
CFLAGS="$(TARGET_CFLAGS)" sh ./xen-setup --cc=$(CC) --disable-gcc-check 
$(IOEMU_OPTIONS))
-       CPPFLAGS= TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu 
LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS= CONFIG_STUBDOM=yes
+           LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) \
+           TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
+           TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+           TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
+           ./xen-setup-stubdom )
+       $(MAKE) -C ioemu
 
 ######
 # caml

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog