fix_compilation: Disable ioemu.

diff --git a/master/fix_compilation b/master/fix_compilation
index 4eadb849823722767b72540dde790eb7fa41cdc3..cb478bedc1004f619201c1a4841de5549d54312f 100644 (file)
--- a/master/fix_compilation
+++ b/master/fix_compilation
@@ -1,5 +1,18 @@
+diff --git a/Config.mk b/Config.mk
+index 5ecf067..37392b7 100644
+--- a/Config.mk
++++ b/Config.mk
+@@ -1,7 +1,7 @@
+ # -*- mode: Makefile; -*-
+ 
+ # A debug build of Xen and tools?
+-debug ?= y
++debug ?= n
+ 
+ XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
+                          -e s/i86pc/x86_32/ -e s/amd64/x86_64/)
 diff --git a/tools/Makefile b/tools/Makefile
-index 00e3981..56f0c60 100644
+index 00e3981..8ff2844 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
 @@ -2,16 +2,16 @@ XEN_ROOT = ../
@@ -27,8 +40,9 @@ index 00e3981..56f0c60 100644
  SUBDIRS-y += libfsimage
  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 -SUBDIRS-$(CONFIG_Linux) += fs-back
+-SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
 +SUBDIRS-n += fs-back
- SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
++#SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
  SUBDIRS-y += xenpmd
  
  # These don't cross-compile
@@ -56,7 +70,7 @@ index 00e3981..56f0c60 100644
  
  ioemu/config-host.mak:
        cd ioemu && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure \
-@@ -69,26 +67,6 @@ subdir-clean-ioemu:
+@@ -69,30 +67,6 @@ subdir-clean-ioemu:
        $(MAKE) -C ioemu distclean
  
  ioemu-dir-find:
@@ -80,6 +94,10 @@ index 00e3981..56f0c60 100644
 -              rm -f ioemu-dir; \
 -              ln -sf ioemu-remote ioemu-dir; \
 -      fi
-       set -e; \
-               $(absolutify_xen_root); \
-               cd ioemu-dir; \
+-      set -e; \
+-              $(absolutify_xen_root); \
+-              cd ioemu-dir; \
+-              ./xen-setup $(IOEMU_CONFIGURE_CROSS)
+ 
+ subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
+