Bastian Blank
2009-Nov-15 14:06 UTC
[Pkg-xen-changes] r666 - trunk/xen-common/debian/patches
Author: waldi
Date: Sun Nov 15 14:06:06 2009
New Revision: 666
Log:
debian/patches: Update.
Modified:
trunk/xen-common/debian/patches/path-relative
trunk/xen-common/debian/patches/xend-disable-network
trunk/xen-common/debian/patches/xend-disable-relocation
Modified: trunk/xen-common/debian/patches/path-relative
=============================================================================---
trunk/xen-common/debian/patches/path-relative Sun Nov 15 14:04:48 2009 (r665)
+++ trunk/xen-common/debian/patches/path-relative Sun Nov 15 14:06:06 2009
(r666)
@@ -5,11 +5,11 @@
#===========================================================================
-import os, re
+-
+-arch_libdir = ''lib''
-arch = os.uname()[4]
--if re.search(''64'', arch):
+-if os.uname()[0] == ''Linux'' and
re.search(''64'', arch):
- arch_libdir = ''lib64''
--else:
-- arch_libdir = ''lib''
-
#----------------------------------------------------------------------------
# Kernel image file.
@@ -18,7 +18,7 @@
# The domain build function. HVM domain uses ''hvm''.
builder=''hvm''
-@@ -120,7 +113,7 @@
+@@ -128,7 +121,7 @@
#===========================================================================
# Device Model to be used
@@ -34,8 +34,8 @@
#===========================================================================
-import os, re
--arch = os.uname()[4]
-arch_libdir = ''lib''
+-arch = os.uname()[4]
-
#----------------------------------------------------------------------------
# Kernel image file.
Modified: trunk/xen-common/debian/patches/xend-disable-network
=============================================================================---
trunk/xen-common/debian/patches/xend-disable-network Sun Nov 15 14:04:48 2009
(r665)
+++ trunk/xen-common/debian/patches/xend-disable-network Sun Nov 15 14:06:06
2009 (r666)
@@ -1,6 +1,6 @@
--- a/tools/examples/xend-config.sxp
+++ b/tools/examples/xend-config.sxp
-@@ -149,7 +149,7 @@
+@@ -154,7 +154,7 @@
# two fake interfaces per guest domain. To do things like this, write
# yourself a wrapper script, and call network-bridge from it, as appropriate.
#
Modified: trunk/xen-common/debian/patches/xend-disable-relocation
=============================================================================---
trunk/xen-common/debian/patches/xend-disable-relocation Sun Nov 15 14:04:48 2009
(r665)
+++ trunk/xen-common/debian/patches/xend-disable-relocation Sun Nov 15 14:06:06
2009 (r666)
@@ -1,14 +1,14 @@
--- a/tools/examples/xend-config.sxp
+++ b/tools/examples/xend-config.sxp
-@@ -58,7 +58,6 @@
+@@ -62,7 +62,6 @@
#(xend-tcp-xmlrpc-server no)
#(xend-unix-xmlrpc-server yes)
#(xend-relocation-server no)
-(xend-relocation-server yes)
#(xend-relocation-ssl-server no)
+ #(xend-udev-event-server no)
- #(xend-unix-path /var/lib/xend/xend-socket)
-@@ -119,7 +118,6 @@
+@@ -124,7 +123,6 @@
# (xend-relocation-hosts-allow ''^localhost$
^.*\\.example\\.org$'')
#
#(xend-relocation-hosts-allow '''')