[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.5_rc1-1
Guido Günther
agx at sigxcpu.org
Tue Apr 30 14:01:24 UTC 2013
The following commit has been merged in the master branch:
commit 2625e81a9d7e59cfbabef440d5c533ae9cbae690
Author: Guido Günther <agx at sigxcpu.org>
Date: Tue Apr 30 10:23:59 2013 +0200
Update patches. Dropped
Add-sanitytest.py.patch
applied upstream.
diff --git a/debian/patches/Add-sanitytest.py.patch b/debian/patches/Add-sanitytest.py.patch
deleted file mode 100644
index 56bacd8..0000000
--- a/debian/patches/Add-sanitytest.py.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 8 Mar 2013 18:37:35 +0100
-Subject: Add sanitytest.py
-
-missing in the upstream tarball
----
- python/sanitytest.py | 36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
- create mode 100644 python/sanitytest.py
-
-diff --git a/python/sanitytest.py b/python/sanitytest.py
-new file mode 100644
-index 0000000..ace6792
---- /dev/null
-+++ b/python/sanitytest.py
-@@ -0,0 +1,36 @@
-+#!/usr/bin/python
-+
-+import libvirt
-+
-+globals = dir(libvirt)
-+
-+# Sanity test that the generator hasn't gone wrong
-+
-+# Look for core classes
-+for clsname in ["virConnect",
-+ "virDomain",
-+ "virDomainSnapshot",
-+ "virInterface",
-+ "virNWFilter",
-+ "virNodeDevice",
-+ "virNetwork",
-+ "virSecret",
-+ "virStoragePool",
-+ "virStorageVol",
-+ "virStream",
-+ ]:
-+ assert(clsname in globals)
-+ assert(object in getattr(libvirt, clsname).__bases__)
-+
-+# Constants
-+assert("VIR_CONNECT_RO" in globals)
-+
-+# Error related bits
-+assert("libvirtError" in globals)
-+assert("VIR_ERR_AUTH_FAILED" in globals)
-+assert("virGetLastError" in globals)
-+
-+# Some misc methods
-+assert("virInitialize" in globals)
-+assert("virEventAddHandle" in globals)
-+assert("virEventRegisterDefaultImpl" in globals)
diff --git a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
index 5a6dd01..766493b 100644
--- a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
+++ b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
@@ -19,10 +19,10 @@ Closes: #685749
12 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
-index 8f3fbd9..cc58db8 100644
+index 106ca73..9745e26 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
-@@ -253,13 +253,13 @@
+@@ -263,13 +263,13 @@
<define name='emulator'>
<element name='emulator'>
@@ -39,10 +39,10 @@ index 8f3fbd9..cc58db8 100644
</define>
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 4d43b7b..5b5f180 100644
+index d0fc755..981910a 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2336,11 +2336,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
+@@ -2324,11 +2324,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
if ((guest = virCapabilitiesAddGuest(caps,
guest_archs[i].hvm ? "hvm" : "xen",
guest_archs[i].arch,
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index 1a3be4b..5132eed 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -10,10 +10,10 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 4af2599..70474f4 100644
+index b9de33c..477661f 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -3150,7 +3150,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+@@ -3171,7 +3171,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 627e6e1..d87b609 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -10,7 +10,7 @@ Origin: vendor
2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 1c9c46b..f36995f 100644
+index 4f2e203..3ad8864 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -1,32 +1,41 @@
@@ -70,7 +70,7 @@ index 1c9c46b..f36995f 100644
RETVAL=0
-@@ -514,8 +523,7 @@ gueststatus() {
+@@ -515,8 +524,7 @@ gueststatus() {
# rh_status
# Display current status: whether saved state exists, and whether start
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index 50f949c..299c55b 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -10,10 +10,10 @@ to not interfere with existing network configurations
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index c1659a4..d511bdb 100644
+index cd098db..4152d08 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2055,9 +2055,6 @@ if WITH_NETWORK
+@@ -2191,9 +2191,6 @@ if WITH_NETWORK
cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -24,10 +24,10 @@ index c1659a4..d511bdb 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index 1c86c6b..dda3782 100644
+index b77c778..dff659c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -7455,9 +7455,6 @@ install-data-local: install-init install-systemd
+@@ -7632,9 +7632,6 @@ install-data-local: install-init install-systemd
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
diff --git a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index 35c1bdd..1227c2e 100644
--- a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
@@ -13,10 +13,10 @@ Closes: #517059
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index d803972..4d43b7b 100644
+index 9dbbe07..d0fc755 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2340,7 +2340,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
+@@ -2328,7 +2328,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
"/usr/lib64/xen/bin/qemu-dm" :
"/usr/lib/xen/bin/qemu-dm"),
(guest_archs[i].hvm ?
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index c06a3fd..6bda2d7 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index a5d8fe6..1daa427 100644
+index 11984bc..05a30ca 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index c4a6fd3..4659b14 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,10 +42,10 @@ to savely detect that the command 'info migrate' is not implemented.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 58f6323..ff67d09 100644
+index daade3d..8546eb0 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1588,7 +1588,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1572,7 +1572,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
}
status->disk_total *= 1024;
}
diff --git a/debian/patches/series b/debian/patches/series
index a7f7841..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
Reduce-udevadm-settle-timeout-to-10-seconds.patch
debian/Debianize-systemd-service-files.patch
Allow-xen-toolstack-to-find-it-s-binaries.patch
-Add-sanitytest.py.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list