From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Fri, 22 Jan 2010 18:16:20 +0000 (+0000)
Subject: fix_compile: Disable libfsimage
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c9fbddbf74c27ddd5a62ee6985c14df45819fac7;p=xenclient%2Fxen-pq.git

fix_compile: Disable libfsimage
---

diff --git a/master/fix_compilation b/master/fix_compilation
index cb478be..7caa413 100644
--- a/master/fix_compilation
+++ b/master/fix_compilation
@@ -12,7 +12,7 @@ index 5ecf067..37392b7 100644
  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..8ff2844 100644
+index 00e3981..77e53dd 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
 @@ -2,16 +2,16 @@ XEN_ROOT = ../
@@ -35,9 +35,12 @@ index 00e3981..8ff2844 100644
  SUBDIRS-$(CONFIG_X86) += firmware
  SUBDIRS-$(ACM_SECURITY) += security
  SUBDIRS-y += console
-@@ -23,15 +23,15 @@ SUBDIRS-$(CONFIG_Linux) += libaio
+@@ -21,17 +21,17 @@ SUBDIRS-$(VTPM_TOOLS) += vtpm
+ SUBDIRS-y += xenstat
+ SUBDIRS-$(CONFIG_Linux) += libaio
  SUBDIRS-$(CONFIG_Linux) += blktap
- SUBDIRS-y += libfsimage
+-SUBDIRS-y += libfsimage
++SUBDIRS-n += libfsimage
  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 -SUBDIRS-$(CONFIG_Linux) += fs-back
 -SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir