[Pkg-xen-changes] r268 - trunk/xen-unstable/debian/patches

[Bastian Blank]

Author: waldi
Date: Tue Aug 22 18:01:44 2006
New Revision: 268

Added:
   trunk/xen-unstable/debian/patches/blktap-disable.dpatch   (contents, props changed)
Modified:
   trunk/xen-unstable/debian/patches/00list

Log:
* debian/patches/00list: Add blktap-disable.
* debian/patches/blktap-disable.dpatch: Add.


Modified: trunk/xen-unstable/debian/patches/00list
==============================================================================
--- trunk/xen-unstable/debian/patches/00list	(original)
+++ trunk/xen-unstable/debian/patches/00list	Tue Aug 22 18:01:44 2006
@@ -5,3 +5,4 @@
 qemu-config
 libs
 qemu-arch
+blktap-disable

Added: trunk/xen-unstable/debian/patches/blktap-disable.dpatch
==============================================================================
--- (empty file)
+++ trunk/xen-unstable/debian/patches/blktap-disable.dpatch	Tue Aug 22 18:01:44 2006
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## blktap-disable.dpatch by Bastian Blank <waldi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad xen-unstable~/tools/Makefile xen-unstable/tools/Makefile
+--- xen-unstable~/tools/Makefile	2006-08-22 09:56:47.000000000 +0000
++++ xen-unstable/tools/Makefile	2006-08-22 17:56:06.202699107 +0000
+@@ -17,7 +17,6 @@
+ SUBDIRS-$(VTPM_TOOLS) += vtpm
+ SUBDIRS-y += xenstat
+ SUBDIRS-y += libaio
+-SUBDIRS-y += blktap
+ 
+ # These don't cross-compile
+ ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
+diff -urNad xen-unstable~/tools/misc/xend xen-unstable/tools/misc/xend
+--- xen-unstable~/tools/misc/xend	2006-08-22 17:56:05.754900357 +0000
++++ xen-unstable/tools/misc/xend	2006-08-22 17:56:20.568242935 +0000
+@@ -84,10 +84,6 @@
+     if os.fork() == 0:
+         os.execvp(sys.path[0] + '/xenconsoled', ['xenconsoled'])
+ 
+-def start_blktapctrl():
+-    if os.fork() == 0:
+-        os.execvp(sys.path[0] + '/blktapctrl', ['blktapctrl'])
+-            
+ def main():
+     try:
+         check_logging()
+@@ -101,19 +97,16 @@
+     elif sys.argv[1] == 'start':
+         start_xenstored()
+         start_consoled()
+-	start_blktapctrl()
+         return daemon.start()
+     elif sys.argv[1] == 'trace_start':
+         start_xenstored()
+         start_consoled()
+-        start_blktapctrl()
+         return daemon.start(trace=1)
+     elif sys.argv[1] == 'stop':
+         return daemon.stop()
+     elif sys.argv[1] == 'restart':
+         start_xenstored()
+         start_consoled()
+-        start_blktapctrl()
+         return daemon.stop() or daemon.start()
+     elif sys.argv[1] == 'status':
+         return daemon.status()