# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 4f919c8e61adff4d8db75bbc8bfbd97d0d536701
# Parent  058f2e27476d686538de2671f57c1ded5c693b47
[TOOLS] allow the selection of blktap and firmware thru config files

The following patch enables blktap and firmware using config
variables.
Specific issues are with POWERPC:
  1) does not require firmware build
  2) nasty build break in libaio

I'm guessing for IA64.

Signed-off-by: Jimi Xenidis <[EMAIL PROTECTED]>
---
 config/ia64.mk   |    2 ++
 config/x86_32.mk |    2 ++
 config/x86_64.mk |    2 ++
 tools/Makefile   |    9 ++++-----
 4 files changed, 10 insertions(+), 5 deletions(-)

diff -r 058f2e27476d -r 4f919c8e61ad config/ia64.mk
--- a/config/ia64.mk    Mon Aug 07 17:49:16 2006 -0500
+++ b/config/ia64.mk    Tue Aug 08 14:01:39 2006 -0400
@@ -1,5 +1,7 @@ CONFIG_IA64 := y
 CONFIG_IA64 := y
 CONFIG_IOEMU := y
 CONFIG_XCUTILS := y
+CONFIG_BLKTAP := y
+CONFIG_FIRMWARE := y
 
 LIBDIR := lib
diff -r 058f2e27476d -r 4f919c8e61ad config/x86_32.mk
--- a/config/x86_32.mk  Mon Aug 07 17:49:16 2006 -0500
+++ b/config/x86_32.mk  Tue Aug 08 14:01:39 2006 -0400
@@ -4,6 +4,8 @@ CONFIG_XCUTILS := y
 CONFIG_XCUTILS := y
 CONFIG_IOEMU := y
 CONFIG_MBOOTPACK := y
+CONFIG_BLKTAP := y
+CONFIG_FIRMWARE := y
 
 CFLAGS += -m32 -march=i686
 LIBDIR := lib
diff -r 058f2e27476d -r 4f919c8e61ad config/x86_64.mk
--- a/config/x86_64.mk  Mon Aug 07 17:49:16 2006 -0500
+++ b/config/x86_64.mk  Tue Aug 08 14:01:39 2006 -0400
@@ -4,6 +4,8 @@ CONFIG_XCUTILS := y
 CONFIG_XCUTILS := y
 CONFIG_IOEMU := y
 CONFIG_MBOOTPACK := y
+CONFIG_BLKTAP := y
+CONFIG_FIRMWARE := y
 
 CFLAGS += -m64
 LIBDIR = lib64
diff -r 058f2e27476d -r 4f919c8e61ad tools/Makefile
--- a/tools/Makefile    Mon Aug 07 17:49:16 2006 -0500
+++ b/tools/Makefile    Tue Aug 08 14:01:39 2006 -0400
@@ -1,4 +1,5 @@ XEN_ROOT = ../
 XEN_ROOT = ../
+include $(XEN_ROOT)/Config.mk
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
@@ -8,16 +9,14 @@ SUBDIRS-y += examples
 SUBDIRS-y += examples
 SUBDIRS-y += xentrace
 SUBDIRS-$(CONFIG_XCUTILS) += xcutils
-SUBDIRS-y += firmware
+SUBDIRS-$(CONFIG_FIRMWARE) += firmware
 SUBDIRS-y += security
 SUBDIRS-y += console
 SUBDIRS-y += xenmon
 SUBDIRS-y += guest-headers
-SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
-SUBDIRS-$(VTPM_TOOLS) += vtpm
+SUBDIRS-$(VTPM_TOOLS) += vtpm_manager vtpm
 SUBDIRS-y += xenstat
-SUBDIRS-y += libaio
-SUBDIRS-y += blktap
+SUBDIRS-$(CONFIG_BLKTAP) += libaio blktap
 
 # These don't cross-compile
 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@lists.xensource.com
http://lists.xensource.com/xen-ppc-devel

Reply via email to