From 3b7286df8600de9856d068ee864e3b88390bfb71 Mon Sep 17 00:00:00 2001
From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Thu, 2 Apr 2009 15:50:40 +0100
Subject: [PATCH] Fix the compilation: 	- Remove pre generated isal file 
 - Remove python compilation 	- Remove ioemu checkout

---
 xen-3.4/fix_compilation | 76 +++++++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 15 deletions(-)

diff --git a/xen-3.4/fix_compilation b/xen-3.4/fix_compilation
index 7f8451f..2ab4568 100644
--- a/xen-3.4/fix_compilation
+++ b/xen-3.4/fix_compilation
@@ -1,7 +1,8 @@
-diff -r 0477f9061c8a tools/Makefile
---- a/tools/Makefile	Fri Mar 20 17:42:46 2009 +0000
-+++ b/tools/Makefile	Thu Apr 02 14:13:31 2009 +0200
-@@ -2,16 +2,16 @@
+diff --git a/tools/Makefile b/tools/Makefile
+index 00e3981..ea26bd9 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -2,16 +2,16 @@ XEN_ROOT = ../
  include $(XEN_ROOT)/tools/Rules.mk
  
  SUBDIRS-y :=
@@ -22,7 +23,7 @@ diff -r 0477f9061c8a tools/Makefile
  SUBDIRS-$(CONFIG_X86) += firmware
  SUBDIRS-$(ACM_SECURITY) += security
  SUBDIRS-y += console
-@@ -23,7 +23,7 @@
+@@ -23,15 +23,15 @@ SUBDIRS-$(CONFIG_Linux) += libaio
  SUBDIRS-$(CONFIG_Linux) += blktap
  SUBDIRS-y += libfsimage
  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
@@ -31,7 +32,19 @@ diff -r 0477f9061c8a tools/Makefile
  SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
  SUBDIRS-y += xenpmd
  
-@@ -54,7 +54,7 @@
+ # These don't cross-compile
+-ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
+-SUBDIRS-$(PYTHON_TOOLS) += python
+-SUBDIRS-$(PYTHON_TOOLS) += pygrub
+-endif
++#ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
++#SUBDIRS-$(PYTHON_TOOLS) += python
++#SUBDIRS-$(PYTHON_TOOLS) += pygrub
++#endif
+ 
+ # For the sake of linking, set the sys-root
+ ifneq ($(CROSS_COMPILE),)
+@@ -54,7 +54,7 @@ install: subdirs-install
  clean distclean: subdirs-clean
  
  ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
@@ -40,9 +53,38 @@ diff -r 0477f9061c8a tools/Makefile
  			 --cross-prefix=$(CROSS_COMPILE) \
  			 --interp-prefix=$(CROSS_SYS_ROOT)
  endif
-diff -r 0477f9061c8a tools/firmware/hvmloader/acpi/dsdt.c
---- a/tools/firmware/hvmloader/acpi/dsdt.c	Fri Mar 20 17:42:46 2009 +0000
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -69,26 +69,6 @@ subdir-clean-ioemu:
+ 	$(MAKE) -C ioemu distclean
+ 
+ ioemu-dir-find:
+-	set -ex; \
+-	if test -d $(CONFIG_QEMU); then \
+-		rm -f ioemu-dir; \
+-		ln -sf $(CONFIG_QEMU) ioemu-dir; \
+-	else \
+-		if [ ! -d ioemu-remote ]; then \
+-			rm -rf ioemu-remote ioemu-remote.tmp; \
+-			mkdir ioemu-remote.tmp; rmdir ioemu-remote.tmp; \
+-			$(GIT) clone $(CONFIG_QEMU) ioemu-remote.tmp; \
+-			if [ "$(QEMU_TAG)" ]; then			\
+-				cd ioemu-remote.tmp;			\
+-				$(GIT) branch -D dummy >/dev/null 2>&1 ||:; \
+-				$(GIT) checkout -b dummy $(QEMU_TAG);	\
+-				cd ..;					\
+-			fi;						\
+-			mv ioemu-remote.tmp ioemu-remote; \
+-		fi; \
+-		rm -f ioemu-dir; \
+-		ln -sf ioemu-remote ioemu-dir; \
+-	fi
+ 	set -e; \
+ 		$(absolutify_xen_root); \
+ 		cd ioemu-dir; \
+diff --git a/tools/firmware/hvmloader/acpi/dsdt.c b/tools/firmware/hvmloader/acpi/dsdt.c
+deleted file mode 100644
+index ca58b32..0000000
+--- a/tools/firmware/hvmloader/acpi/dsdt.c
++++ /dev/null
 @@ -1,1617 +0,0 @@
 -/*
 - * 
@@ -1661,9 +1703,11 @@ diff -r 0477f9061c8a tools/firmware/hvmloader/acpi/dsdt.c
 -    0x54,0x5F,
 -};
 -int DsdtLen=sizeof(AmlCode);
-diff -r 0477f9061c8a tools/firmware/hvmloader/acpi/ssdt_pm.h
---- a/tools/firmware/hvmloader/acpi/ssdt_pm.h	Fri Mar 20 17:42:46 2009 +0000
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+diff --git a/tools/firmware/hvmloader/acpi/ssdt_pm.h b/tools/firmware/hvmloader/acpi/ssdt_pm.h
+deleted file mode 100644
+index 020af0b..0000000
+--- a/tools/firmware/hvmloader/acpi/ssdt_pm.h
++++ /dev/null
 @@ -1,202 +0,0 @@
 -/*
 - * 
@@ -1867,9 +1911,11 @@ diff -r 0477f9061c8a tools/firmware/hvmloader/acpi/ssdt_pm.h
 -    0x54,0x31,0x0A,0x03,0x00,0x52,0x45,0x4C,  /* 000005C8    "T1...REL" */
 -    0x5F,0xA4,0x42,0x53,0x54,0x31,
 -};
-diff -r 0477f9061c8a tools/firmware/hvmloader/acpi/ssdt_tpm.h
---- a/tools/firmware/hvmloader/acpi/ssdt_tpm.h	Fri Mar 20 17:42:46 2009 +0000
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+diff --git a/tools/firmware/hvmloader/acpi/ssdt_tpm.h b/tools/firmware/hvmloader/acpi/ssdt_tpm.h
+deleted file mode 100644
+index 2585314..0000000
+--- a/tools/firmware/hvmloader/acpi/ssdt_tpm.h
++++ /dev/null
 @@ -1,25 +0,0 @@
 -/*
 - * 
-- 
2.39.5