[Pkg-xen-changes] r759 - in trunk/xen-3/debian: . patches

[Bastian Blank]

Author: waldi
Date: Thu May 27 16:57:57 2010
New Revision: 759

Log:
* debian/changelog: Updatze.
* debian/patches/config-ioemu-disable.diff: Remove patch.
* debian/patches/series: Update.
* debian/patches/tools-disable.diff:
  Add patch, disable blktap, libaio and ioemu.
* debian/libxen-dev.install: Don't install blktap files.

Added:
   trunk/xen-3/debian/patches/tools-disable.diff
Deleted:
   trunk/xen-3/debian/patches/config-ioemu-disable.diff
Modified:
   trunk/xen-3/debian/changelog
   trunk/xen-3/debian/libxen-dev.install
   trunk/xen-3/debian/patches/series

Modified: trunk/xen-3/debian/changelog
==============================================================================
--- trunk/xen-3/debian/changelog	Thu May 27 16:30:22 2010	(r758)
+++ trunk/xen-3/debian/changelog	Thu May 27 16:57:57 2010	(r759)
@@ -1,3 +1,10 @@
+xen-3 (3.4.3~rc6-2) UNRELEASED; urgency=low
+
+  * Disable blktap support, it is unusable with current kernels.
+  * Disable libaio, was only used by blktap.
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 27 May 2010 18:40:37 +0200
+
 xen-3 (3.4.3~rc6-1) unstable; urgency=low
 
   * New upstream release candidate.

Modified: trunk/xen-3/debian/libxen-dev.install
==============================================================================
--- trunk/xen-3/debian/libxen-dev.install	Thu May 27 16:30:22 2010	(r758)
+++ trunk/xen-3/debian/libxen-dev.install	Thu May 27 16:57:57 2010	(r759)
@@ -1,7 +1,5 @@
-usr/lib/libblktap.a
 usr/lib/{libxenctrl.a,libxenguest.a}
 usr/lib/libxenstore.{a,so}
-usr/include/blktaplib.h
 usr/include/{xenctrl.h,xenguest.h}
 usr/include/{xs.h,xs_lib.h}
 usr/include/xen

Modified: trunk/xen-3/debian/patches/series
==============================================================================
--- trunk/xen-3/debian/patches/series	Thu May 27 16:30:22 2010	(r758)
+++ trunk/xen-3/debian/patches/series	Thu May 27 16:57:57 2010	(r759)
@@ -37,7 +37,7 @@
 tools-python-xen-xm-relative-path.diff
 tools-misc-xend-startup.diff
 
-config-ioemu-disable.diff
+tools-disable.diff
 
 tools-blktap-crypto.patch
 

Added: trunk/xen-3/debian/patches/tools-disable.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-disable.diff	Thu May 27 16:57:57 2010	(r759)
@@ -0,0 +1,15 @@
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -19,12 +19,9 @@
+ SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
+ SUBDIRS-$(VTPM_TOOLS) += vtpm
+ SUBDIRS-y += xenstat
+-SUBDIRS-$(CONFIG_Linux) += libaio
+-SUBDIRS-$(CONFIG_Linux) += blktap
+ SUBDIRS-y += libfsimage
+ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
+ SUBDIRS-$(CONFIG_Linux) += fs-back
+-SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
+ SUBDIRS-y += xenpmd
+ 
+ # These don't cross-compile