[Pkg-xen-changes] r617 - trunk/xen-common/debian/patches

[Bastian Blank]

Author: waldi
Date: Sun May 10 12:45:08 2009
New Revision: 617

Log:
* debian/patches/00list, debian/patches/network-bridge.dpatch,
  debian/patches/network-dummy.dpatch, debian/patches/path-relative.dpatch,
  debian/patches/xend-disable-relocation.dpatch: Remove.
* debian/patches/path-relative, debian/patches/series,
  debian/patches/xend-disable-network,
  debian/patches/xend-disable-relocation: Add.

Added:
   trunk/xen-common/debian/patches/path-relative
   trunk/xen-common/debian/patches/series
   trunk/xen-common/debian/patches/xend-disable-network
   trunk/xen-common/debian/patches/xend-disable-relocation
Deleted:
   trunk/xen-common/debian/patches/00list
   trunk/xen-common/debian/patches/network-bridge.dpatch
   trunk/xen-common/debian/patches/network-dummy.dpatch
   trunk/xen-common/debian/patches/path-relative.dpatch
   trunk/xen-common/debian/patches/xend-disable-relocation.dpatch

Added: trunk/xen-common/debian/patches/path-relative
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-common/debian/patches/path-relative	Sun May 10 12:45:08 2009	(r617)
@@ -0,0 +1,55 @@
+--- a/tools/examples/xmexample.hvm
++++ b/tools/examples/xmexample.hvm
+@@ -6,16 +6,9 @@
+ # you can set the parameters for the domain on the xm command line.
+ #============================================================================
+ 
+-import os, re
+-arch = os.uname()[4]
+-if re.search('64', arch):
+-    arch_libdir = 'lib64'
+-else:
+-    arch_libdir = 'lib'
+-
+ #----------------------------------------------------------------------------
+ # Kernel image file.
+-kernel = "/usr/lib/xen/boot/hvmloader"
++kernel = "hvmloader"
+ 
+ # The domain build function. HVM domain uses 'hvm'.
+ builder='hvm'
+@@ -120,7 +113,7 @@
+ #============================================================================
+ 
+ # Device Model to be used
+-device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
++device_model = 'qemu-dm'
+ 
+ #-----------------------------------------------------------------------------
+ # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
+--- a/tools/examples/xmexample.vti
++++ b/tools/examples/xmexample.vti
+@@ -6,13 +6,9 @@
+ # you can set the parameters for the domain on the xm command line.
+ #============================================================================
+ 
+-import os, re
+-arch = os.uname()[4]
+-arch_libdir = 'lib'
+-
+ #----------------------------------------------------------------------------
+ # Kernel image file.
+-kernel = "/usr/lib/xen/boot/guest_firmware.bin"
++kernel = "guest_firmware.bin"
+ 
+ # The domain build function. VTI domain uses 'hvm'.
+ builder='hvm'
+@@ -67,7 +63,7 @@
+ #============================================================================
+ 
+ # New stuff
+-device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
++device_model = 'qemu-dm'
+ 
+ #-----------------------------------------------------------------------------
+ # boot on floppy (a), hard disk (c) or CD-ROM (d) 

Added: trunk/xen-common/debian/patches/series
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-common/debian/patches/series	Sun May 10 12:45:08 2009	(r617)
@@ -0,0 +1,3 @@
+xend-disable-network
+path-relative
+xend-disable-relocation

Added: trunk/xen-common/debian/patches/xend-disable-network
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-common/debian/patches/xend-disable-network	Sun May 10 12:45:08 2009	(r617)
@@ -0,0 +1,11 @@
+--- a/tools/examples/xend-config.sxp
++++ b/tools/examples/xend-config.sxp
+@@ -149,7 +149,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.
+ #
+-(network-script network-bridge)
++#(network-script network-bridge)
+ 
+ # The script used to control virtual interfaces.  This can be overridden on a
+ # per-vif basis when creating a domain or a configuring a new vif.  The

Added: trunk/xen-common/debian/patches/xend-disable-relocation
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-common/debian/patches/xend-disable-relocation	Sun May 10 12:45:08 2009	(r617)
@@ -0,0 +1,18 @@
+--- a/tools/examples/xend-config.sxp
++++ b/tools/examples/xend-config.sxp
+@@ -58,7 +58,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-unix-path /var/lib/xend/xend-socket)
+@@ -119,7 +118,6 @@
+ #  (xend-relocation-hosts-allow '^localhost$ ^.*\\.example\\.org$')
+ #
+ #(xend-relocation-hosts-allow '')
+-(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$')
+ 
+ # The limit (in kilobytes) on the size of the console buffer
+ #(console-limit 1024)