[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, wheezy, updated. debian/0.9.12-11-1-gaf660e5
Guido Günther
agx at sigxcpu.org
Wed Apr 24 18:12:06 UTC 2013
The following commit has been merged in the wheezy branch:
commit af660e5c3c2f3289def6299ca12ba8b2012b8f50
Author: Guido Günther <agx at sigxcpu.org>
Date: Tue Oct 2 19:19:51 2012 +0200
Allow xen toolstack to find it's binaries
Thanks: George Dunlap for the patch.
Closes: #685749
diff --git a/debian/patches/debian/Allow-xen-toolstack-to-find-it-s-binaries.patch b/debian/patches/debian/Allow-xen-toolstack-to-find-it-s-binaries.patch
new file mode 100644
index 0000000..3ea255d
--- /dev/null
+++ b/debian/patches/debian/Allow-xen-toolstack-to-find-it-s-binaries.patch
@@ -0,0 +1,243 @@
+From: George Dunlap <george.dunlap at eu.citrix.com>
+Date: Tue, 2 Oct 2012 19:19:04 +0200
+Subject: Allow xen toolstack to find it's binaries
+
+Closes: #685749
+---
+ docs/schemas/capability.rng | 4 ++--
+ src/xen/xen_hypervisor.c | 6 +++---
+ tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-i686-pae.xml | 2 +-
+ tests/xencapsdata/xen-i686.xml | 2 +-
+ tests/xencapsdata/xen-ia64-be-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-ia64-be.xml | 2 +-
+ tests/xencapsdata/xen-ia64-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-ia64.xml | 2 +-
+ tests/xencapsdata/xen-ppc64.xml | 2 +-
+ tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++-----
+ tests/xencapsdata/xen-x86_64.xml | 2 +-
+ 12 files changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
+index 8c928bc..b1930ba 100644
+--- a/docs/schemas/capability.rng
++++ b/docs/schemas/capability.rng
+@@ -241,13 +241,13 @@
+
+ <define name='emulator'>
+ <element name='emulator'>
+- <ref name='absFilePath'/>
++ <ref name='filePath'/>
+ </element>
+ </define>
+
+ <define name='loader'>
+ <element name='loader'>
+- <ref name='absFilePath'/>
++ <ref name='filePath'/>
+ </element>
+ </define>
+
+diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
+index 86f64f1..85ebcda 100644
+--- a/src/xen/xen_hypervisor.c
++++ b/src/xen/xen_hypervisor.c
+@@ -2347,10 +2347,10 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+ guest_archs[i].model,
+ guest_archs[i].bits,
+ (STREQ(hostmachine, "x86_64") ?
+- "/usr/lib64/xen/bin/qemu-dm" :
+- "/usr/lib/xen/bin/qemu-dm"),
++ "qemu-dm" :
++ "qemu-dm"),
+ (guest_archs[i].hvm ?
+- "/usr/lib/xen-default/boot/hvmloader" :
++ "hvmloader" :
+ NULL),
+ 1,
+ machines)) == NULL) {
+diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
+index 7cde6df..cf1953d 100644
+--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
++++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -34,8 +34,8 @@
+ <os_type>hvm</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml
+index 3dba6eb..c774d6c 100644
+--- a/tests/xencapsdata/xen-i686-pae.xml
++++ b/tests/xencapsdata/xen-i686-pae.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml
+index 22d7685..bc36cbf 100644
+--- a/tests/xencapsdata/xen-i686.xml
++++ b/tests/xencapsdata/xen-i686.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
+index e56e306..ddab377 100644
+--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
++++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -31,8 +31,8 @@
+ <os_type>hvm</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml
+index 017816c..4a548c6 100644
+--- a/tests/xencapsdata/xen-ia64-be.xml
++++ b/tests/xencapsdata/xen-ia64-be.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
+index 25617fc..32a0056 100644
+--- a/tests/xencapsdata/xen-ia64-hvm.xml
++++ b/tests/xencapsdata/xen-ia64-hvm.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -28,8 +28,8 @@
+ <os_type>hvm</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml
+index 82ce965..e48b29b 100644
+--- a/tests/xencapsdata/xen-ia64.xml
++++ b/tests/xencapsdata/xen-ia64.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml
+index 91401b9..2799fe8 100644
+--- a/tests/xencapsdata/xen-ppc64.xml
++++ b/tests/xencapsdata/xen-ppc64.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ppc64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
+index 493d1ea..9e79899 100644
+--- a/tests/xencapsdata/xen-x86_64-hvm.xml
++++ b/tests/xencapsdata/xen-x86_64-hvm.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='x86_64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -31,8 +31,8 @@
+ <os_type>hvm</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -49,8 +49,8 @@
+ <os_type>hvm</os_type>
+ <arch name='x86_64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml
+index 0c3279b..73e232e 100644
+--- a/tests/xencapsdata/xen-x86_64.xml
++++ b/tests/xencapsdata/xen-x86_64.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='x86_64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
diff --git a/debian/patches/series b/debian/patches/series
index 25a27e3..d50e01f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ Revert-rpc-Discard-non-blocking-calls-only-when-nece.patch
qemu-Fix-off-by-one-error-while-unescaping-monitor-s.patch
rpc-Fix-crash-on-error-paths-of-message-dispatching.patch
qemu-Add-support-for-no-user-config.patch
+debian/Allow-xen-toolstack-to-find-it-s-binaries.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list