[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/1.0.0_rc1-1
Guido Günther
agx at sigxcpu.org
Sun Oct 28 18:56:48 UTC 2012
The following commit has been merged in the experimental branch:
commit a8b162b5f612053c82541be66ce717c89328da5e
Author: Guido Günther <agx at sigxcpu.org>
Date: Fri Oct 26 08:53:07 2012 +0200
Refresh patches
Fixed upstream:
* Properly-parse-unsigned-long-long.patch
* storage-lvm-Don-t-overwrite-lvcreate-errors.patch
* storage-lvm-lvcreate-fails-with-allocation-0-don-t-d.patch
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 3ea255d..5cfb507 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
@@ -39,10 +39,10 @@ index 8c928bc..b1930ba 100644
</define>
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 86f64f1..85ebcda 100644
+index 81fbf99..606e528 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2347,10 +2347,10 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2359,10 +2359,10 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
guest_archs[i].model,
guest_archs[i].bits,
(STREQ(hostmachine, "x86_64") ?
diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index c2f375d..01cf4f4 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -8,7 +8,7 @@ until we debugged the interaction with pbuilder
1 file changed, 2 insertions(+)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index 0395601..c887db4 100644
+index e31f19a..c0fab45 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -496,10 +496,12 @@ mymain(void)
diff --git a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
index f4baef3..1b832e9 100644
--- a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
+++ b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
@@ -7,10 +7,10 @@ Subject: Don't fail if we can't setup avahi
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
-index 0a6ecdc..0520b32 100644
+index cf15240..e534109 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
-@@ -709,8 +709,7 @@ void virNetServerRun(virNetServerPtr srv)
+@@ -962,8 +962,7 @@ void virNetServerRun(virNetServerPtr srv)
virNetServerLock(srv);
diff --git a/debian/patches/Properly-parse-unsigned-long-long.patch b/debian/patches/Properly-parse-unsigned-long-long.patch
deleted file mode 100644
index 7aa64be..0000000
--- a/debian/patches/Properly-parse-unsigned-long-long.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 13 Oct 2012 01:05:40 +0200
-Subject: Properly parse (unsigned) long long
-
-This fixes problems on platforms where sizeof(long) != sizeof(long long)
-like ia32.
----
- python/generator.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/generator.py b/python/generator.py
-index a98a894..ced7e41 100755
---- a/python/generator.py
-+++ b/python/generator.py
-@@ -259,8 +259,8 @@ py_types = {
- 'double': ('d', None, "double", "double"),
- 'unsigned int': ('i', None, "int", "int"),
- 'unsigned long': ('l', None, "long", "long"),
-- 'long long': ('l', None, "longlong", "long long"),
-- 'unsigned long long': ('l', None, "longlong", "long long"),
-+ 'long long': ('L', None, "longlong", "long long"),
-+ 'unsigned long long': ('L', None, "longlong", "long long"),
- 'unsigned char *': ('z', None, "charPtr", "char *"),
- 'char *': ('z', None, "charPtr", "char *"),
- 'const char *': ('z', None, "constcharPtr", "const char *"),
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 96ff8e3..f714a9b 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/util.c b/src/util/util.c
-index 9068e0f..7ed7bf1 100644
+index 117a50f..5f94906 100644
--- a/src/util/util.c
+++ b/src/util/util.c
-@@ -2973,7 +2973,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+@@ -3028,7 +3028,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
index d62d6fc..766326c 100644
--- a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
@@ -7,7 +7,7 @@ Subject: Allow libvirt group to access the socket
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index 3d296cd..2ab3de6 100644
+index 47da520..bf0b92a 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 2b60bf0..9163108 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -4,9 +4,6 @@ Subject: Debianize libvirt-guests
Origin: vendor
-
-
-
---
tools/libvirt-guests.init.sh | 41 +++++++++++++----------------------------
tools/libvirt-guests.sysconf | 4 ++--
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 0ccdca2..10a7e42 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
@@ -4,19 +4,16 @@ Subject: Don't enable default network on boot
to not interfere with existing network configurations
-
-
-
---
src/Makefile.am | 3 ---
src/Makefile.in | 3 ---
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 95e1bea..52c22a5 100644
+index 187663f..94f807e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1729,9 +1729,6 @@ if WITH_NETWORK
+@@ -1768,9 +1768,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; }
@@ -27,10 +24,10 @@ index 95e1bea..52c22a5 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index 2e2f6eb..1aee11f 100644
+index 230e879..cd3e29f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -6751,9 +6751,6 @@ install-data-local:
+@@ -6907,9 +6907,6 @@ install-data-local:
@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 1df3162..f823ae6 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
@@ -4,9 +4,6 @@ Subject: fix Debian specific path to hvm loader
Closes: #517059
-
-
-
---
src/xen/xen_hypervisor.c | 2 +-
tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +-
@@ -16,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 86e0514..2e081b6 100644
+index 406079b..81fbf99 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2350,7 +2350,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2362,7 +2362,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
"/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 5b101ca..fd660cd 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,10 +7,10 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index cad5b1c..a5d2d5d 100644
+index 76f32c2..10536c1 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
-@@ -103,7 +103,7 @@ alphabetic character, @, [, ], \, ^, _.
+@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
Most B<virsh> operations rely upon the libvirt library being able to
connect to an already running libvirtd service. This can usually be
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 93ef92f..59c5536 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 a575e30..407187b 100644
+index 09f2a92..80a212f 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1658,7 +1658,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1593,7 +1593,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
}
*total += disk_total * 1024;
}
diff --git a/debian/patches/series b/debian/patches/series
index 9e42104..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +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
-Properly-parse-unsigned-long-long.patch
-storage-lvm-lvcreate-fails-with-allocation-0-don-t-d.patch
-storage-lvm-Don-t-overwrite-lvcreate-errors.patch
diff --git a/debian/patches/storage-lvm-Don-t-overwrite-lvcreate-errors.patch b/debian/patches/storage-lvm-Don-t-overwrite-lvcreate-errors.patch
deleted file mode 100644
index 4e901f2..0000000
--- a/debian/patches/storage-lvm-Don-t-overwrite-lvcreate-errors.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Tue, 16 Oct 2012 20:25:41 -0400
-Subject: storage: lvm: Don't overwrite lvcreate errors
-
-Before:
-$ sudo virsh vol-create-as --pool vgvirt sparsetest --capacity 16M --allocation 0
-error: Failed to create vol sparsetest
-error: internal error Child process (/usr/sbin/lvchange -aln vgvirt/sparsetest) unexpected exit status 5: One or more specified logical volume(s) not found.
-
-After:
-$ sudo virsh vol-create-as --pool vgvirt sparsetest --capacity 16M --allocation 0
-error: Failed to create vol sparsetest
-error: internal error Child process (/usr/sbin/lvcreate --name sparsetest -L 0K --virtualsize 16384K vgvirt) unexpected exit status 5: Unable to create new logical volume with no extents
----
- src/storage/storage_backend_logical.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
-index 2b37f07..de43c3a 100644
---- a/src/storage/storage_backend_logical.c
-+++ b/src/storage/storage_backend_logical.c
-@@ -699,6 +699,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn,
- {
- int fdret, fd = -1;
- virCommandPtr cmd = NULL;
-+ virErrorPtr err;
-
- if (vol->target.encryption != NULL) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-@@ -776,9 +777,11 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn,
- return 0;
-
- cleanup:
-+ err = virSaveLastError();
- VIR_FORCE_CLOSE(fd);
- virStorageBackendLogicalDeleteVol(conn, pool, vol, 0);
- virCommandFree(cmd);
-+ virSetError(err);
- return -1;
- }
-
diff --git a/debian/patches/storage-lvm-lvcreate-fails-with-allocation-0-don-t-d.patch b/debian/patches/storage-lvm-lvcreate-fails-with-allocation-0-don-t-d.patch
deleted file mode 100644
index aca6e87..0000000
--- a/debian/patches/storage-lvm-lvcreate-fails-with-allocation-0-don-t-d.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Tue, 16 Oct 2012 20:30:23 -0400
-Subject: storage: lvm: lvcreate fails with allocation=0, don't do that
-
-On F17 at least, this command fails:
-
-$ sudo /usr/sbin/lvcreate --name sparsetest -L 0K --virtualsize 16384K vgvirt
- Unable to create new logical volume with no extents
-
-Which is unfortunate since allocation=0 is what virt-manager tries to use
-by default.
-
-Rather than telling the user 'don't do that', let's just give them the
-smallest allocation possible if alloc=0 is requested.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=866481
----
- src/storage/storage_backend_logical.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
-index a9d785c..2b37f07 100644
---- a/src/storage/storage_backend_logical.c
-+++ b/src/storage/storage_backend_logical.c
-@@ -724,7 +724,8 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn,
- NULL);
- virCommandAddArg(cmd, "-L");
- if (vol->capacity != vol->allocation) {
-- virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(vol->allocation, 1024));
-+ virCommandAddArgFormat(cmd, "%lluK",
-+ VIR_DIV_UP(vol->allocation ? vol->allocation : 1, 1024));
- virCommandAddArg(cmd, "--virtualsize");
- }
- virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(vol->capacity, 1024));
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list