[Pkg-xen-changes] r860 - trunk/xen/debian/patches

[Bastian Blank]

Author: waldi
Date: Sun Mar 27 21:36:24 2011
New Revision: 860

Log:
debian/patches/tools-disable.diff: Only disable ioemu if the qemu component is missing.

Modified:
   trunk/xen/debian/patches/tools-disable.diff

Modified: trunk/xen/debian/patches/tools-disable.diff
==============================================================================
--- trunk/xen/debian/patches/tools-disable.diff	Sun Mar 27 20:50:31 2011	(r859)
+++ trunk/xen/debian/patches/tools-disable.diff	Sun Mar 27 21:36:24 2011	(r860)
@@ -1,6 +1,6 @@
 --- a/tools/Makefile
 +++ b/tools/Makefile
-@@ -12,28 +12,19 @@
+@@ -12,16 +12,13 @@
  SUBDIRS-y += hotplug
  SUBDIRS-y += xentrace
  SUBDIRS-$(CONFIG_XCUTILS) += xcutils
@@ -17,15 +17,15 @@
  SUBDIRS-$(CONFIG_Linux) += blktap2
  SUBDIRS-$(CONFIG_NetBSD) += libaio
  SUBDIRS-$(CONFIG_NetBSD) += blktap2
- SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
- SUBDIRS-y += libfsimage
- SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
--
--# do not recurse in to a dir we are about to delete
--ifneq "$(MAKECMDGOALS)" "distclean"
--SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
--endif
--
+@@ -31,8 +28,11 @@
+ 
+ # do not recurse in to a dir we are about to delete
+ ifneq "$(MAKECMDGOALS)" "distclean"
++CONFIG_QEMU = $(CURDIR)/../qemu
++ifneq ($(wildcard $(CONFIG_QEMU)),)
+ SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
+ endif
++endif
+ 
  SUBDIRS-y += xenpmd
  SUBDIRS-y += libxl
- SUBDIRS-y += remus