[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.7-3
Guido Günther
agx at sigxcpu.org
Fri Feb 18 15:07:49 UTC 2011
The following commit has been merged in the master branch:
commit ecb74addcb60163fc2efb1ab31d8b27334e53a21
Author: Guido Günther <agx at sigxcpu.org>
Date: Fri Feb 18 15:45:32 2011 +0100
Drop numbers from patches
this keeps the diff smaller.
Git-Dch: Ignore
diff --git a/debian/patches/0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch b/debian/patches/0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch
deleted file mode 100644
index fb8d7c1..0000000
--- a/debian/patches/0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Eric Litak <elitak at gmail.com>
-Date: Wed, 1 Dec 2010 15:03:11 +0100
-Subject: [PATCH] OpenVZ: take veid from vmdef->name when defining new domains
-
-to fix domain creation.
-Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=50a7c59bb30b95fd56cda34510f319f48f97f90e
----
- src/openvz/openvz_driver.c | 40 +---------------------------------------
- 1 files changed, 1 insertions(+), 39 deletions(-)
-
-diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
-index d2f91c6..556df52 100644
---- a/src/openvz/openvz_driver.c
-+++ b/src/openvz/openvz_driver.c
-@@ -103,10 +103,6 @@ openvzDomainDefineCmd(const char *args[],
- int maxarg, virDomainDefPtr vmdef)
- {
- int narg;
-- int veid;
-- int max_veid;
-- char str_id[10];
-- FILE *fp;
-
- for (narg = 0; narg < maxarg; narg++)
- args[narg] = NULL;
-@@ -135,36 +131,7 @@ openvzDomainDefineCmd(const char *args[],
- ADD_ARG_LIT(VZCTL);
- ADD_ARG_LIT("--quiet");
- ADD_ARG_LIT("create");
--
-- if ((fp = popen(VZLIST " -a -ovpsid -H 2>/dev/null", "r")) == NULL) {
-- openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-- _("popen failed"));
-- return -1;
-- }
-- max_veid = 0;
-- while (!feof(fp)) {
-- if (fscanf(fp, "%d\n", &veid) != 1) {
-- if (feof(fp))
-- break;
--
-- openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-- _("Failed to parse vzlist output"));
-- goto cleanup;
-- }
-- if (veid > max_veid) {
-- max_veid = veid;
-- }
-- }
-- fclose(fp);
--
-- if (max_veid == 0) {
-- max_veid = 100;
-- } else {
-- max_veid++;
-- }
--
-- sprintf(str_id, "%d", max_veid);
-- ADD_ARG_LIT(str_id);
-+ ADD_ARG_LIT(vmdef->name);
-
- ADD_ARG_LIT("--name");
- ADD_ARG_LIT(vmdef->name);
-@@ -188,11 +155,6 @@ no_memory:
- openvzError(VIR_ERR_INTERNAL_ERROR,
- _("Could not put argument to %s"), VZCTL);
- return -1;
--
--cleanup:
-- fclose(fp);
-- return -1;
--
- #undef ADD_ARG
- #undef ADD_ARG_LIT
- }
---
diff --git a/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch b/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch
deleted file mode 100644
index 5c5b892..0000000
--- a/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 1 Dec 2010 15:06:18 +0100
-Subject: [PATCH] OpenVZ: Fix some overwritten error codes
-
-Don't overwrite errors during domain creation/definition to ease
-tracking down problems.
-
-Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=2d626c7d08b0b815155b93065d466ba89dfb82f7
----
- src/openvz/openvz_driver.c | 10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
-index 556df52..698d0e6 100644
---- a/src/openvz/openvz_driver.c
-+++ b/src/openvz/openvz_driver.c
-@@ -57,6 +57,7 @@
- #include "nodeinfo.h"
- #include "memory.h"
- #include "bridge.h"
-+#include "logging.h"
-
- #define VIR_FROM_THIS VIR_FROM_OPENVZ
-
-@@ -209,8 +210,7 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef)
- else
- {
- if (openvzDomainDefineCmd(prog, OPENVZ_MAX_ARG, vmdef) < 0) {
-- openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-- _("Error creating command for container"));
-+ VIR_ERROR0(_("Error creating command for container"));
- goto cleanup;
- }
-
-@@ -870,8 +870,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
- vm->persistent = 1;
-
- if (openvzSetInitialConfig(vm->def) < 0) {
-- openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-- _("Error creating initial configuration"));
-+ VIR_ERROR0(_("Error creating initial configuration"));
- goto cleanup;
- }
-
-@@ -954,8 +953,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
- vm->persistent = 1;
-
- if (openvzSetInitialConfig(vm->def) < 0) {
-- openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-- _("Error creating initial configuration"));
-+ VIR_ERROR0(_("Error creating initial configuration"));
- goto cleanup;
- }
-
---
diff --git a/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch b/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
similarity index 98%
rename from debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
rename to debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
index 61adb9a..9ae67f7 100644
--- a/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
+++ b/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
Date: Wed, 6 Oct 2010 18:12:46 +0200
-Subject: [PATCH] Autodetect if the remote nc command supports the -q option
+Subject: Autodetect if the remote nc command supports the -q option
Author: Marc Deslauriers <marc.deslauriers at ubuntu.com>
Origin: other, based on http://hg.fedorahosted.org/hg/virt-manager/rev/1f781890ea4a
diff --git a/debian/patches/0010-Debianize-libvirt-guests.patch b/debian/patches/Debianize-libvirt-guests.patch
similarity index 98%
rename from debian/patches/0010-Debianize-libvirt-guests.patch
rename to debian/patches/Debianize-libvirt-guests.patch
index ce33869..0e8519c 100644
--- a/debian/patches/0010-Debianize-libvirt-guests.patch
+++ b/debian/patches/Debianize-libvirt-guests.patch
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
Date: Thu, 9 Dec 2010 22:36:29 +0100
-Subject: [PATCH] Debianize libvirt-guests
+Subject: Debianize libvirt-guests
Origin: vendor
---
diff --git a/debian/patches/0007-Disable-CHECKSUM-rule.patch b/debian/patches/Disable-CHECKSUM-rule.patch
similarity index 95%
rename from debian/patches/0007-Disable-CHECKSUM-rule.patch
rename to debian/patches/Disable-CHECKSUM-rule.patch
index 19ba997..7513e4a 100644
--- a/debian/patches/0007-Disable-CHECKSUM-rule.patch
+++ b/debian/patches/Disable-CHECKSUM-rule.patch
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
Date: Wed, 6 Oct 2010 18:37:20 +0200
-Subject: [PATCH] Disable CHECKSUM rule
+Subject: Disable CHECKSUM rule
not supported by Squeeze's iptables
diff --git a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch b/debian/patches/allow-libvirt-group-to-access-the-socket.patch
similarity index 96%
rename from debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
rename to debian/patches/allow-libvirt-group-to-access-the-socket.patch
index 33e7f26..391343f 100644
--- a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/allow-libvirt-group-to-access-the-socket.patch
@@ -1,6 +1,6 @@
From: Guido Guenther <agx at sigxcpu.org>
Date: Thu, 26 Jun 2008 20:01:38 +0200
-Subject: [PATCH] allow libvirt group to access the socket
+Subject: allow libvirt group to access the socket
---
daemon/libvirtd.conf | 8 ++++----
diff --git a/debian/patches/0009-build-let-xgettext-see-strings-in-libvirt-guests.patch b/debian/patches/build-let-xgettext-see-strings-in-libvirt-guests.patch
similarity index 99%
rename from debian/patches/0009-build-let-xgettext-see-strings-in-libvirt-guests.patch
rename to debian/patches/build-let-xgettext-see-strings-in-libvirt-guests.patch
index a975ec0..67c2ec2 100644
--- a/debian/patches/0009-build-let-xgettext-see-strings-in-libvirt-guests.patch
+++ b/debian/patches/build-let-xgettext-see-strings-in-libvirt-guests.patch
@@ -1,6 +1,6 @@
From: Eric Blake <eblake at redhat.com>
Date: Thu, 6 Jan 2011 12:00:30 -0700
-Subject: [PATCH] build: let xgettext see strings in libvirt-guests
+Subject: build: let xgettext see strings in libvirt-guests
* tools/libvirt-guests.init.in: Rename...
* tools/libvirt-guests.init.sh: ...so that xgettext's language
diff --git a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
similarity index 98%
rename from debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
rename to debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
index f50f160..6ef1600 100644
--- a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
Date: Thu, 26 Feb 2009 14:29:58 +0100
-Subject: [PATCH] fix Debian specific path to hvm loader
+Subject: fix Debian specific path to hvm loader
Closes: #517059
---
diff --git a/debian/patches/0008-libvirt-guests-remove-bashisms.patch b/debian/patches/libvirt-guests-remove-bashisms.patch
similarity index 99%
rename from debian/patches/0008-libvirt-guests-remove-bashisms.patch
rename to debian/patches/libvirt-guests-remove-bashisms.patch
index 437626a..b31fa9b 100644
--- a/debian/patches/0008-libvirt-guests-remove-bashisms.patch
+++ b/debian/patches/libvirt-guests-remove-bashisms.patch
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
Date: Tue, 4 Jan 2011 19:13:56 +0100
-Subject: [PATCH] libvirt-guests: remove bashisms
+Subject: libvirt-guests: remove bashisms
* tools/libvirt-guests.init.sh: Use only POSIX shell features, which
includes using gettext.sh for translation rather than $"".
diff --git a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
similarity index 96%
rename from debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
rename to debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index af3e50a..c713ffc 100644
--- a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <biessmann at corscience.de>
Date: Thu, 18 Mar 2010 13:05:59 +0100
-Subject: [PATCH] patch qemuMonitorTextGetMigrationStatus to intercept unknown command 'info migrate'
+Subject: patch qemuMonitorTextGetMigrationStatus to intercept unknown command 'info migrate'
Debian package kvm up to version 72 has not implemented the command 'info migrate'.
This command interface returns help page of info commands and looks like this:
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/qemu-disable-network.diff.patch
similarity index 97%
rename from debian/patches/0002-qemu-disable-network.diff.patch
rename to debian/patches/qemu-disable-network.diff.patch
index cc44ef9..4160500 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/qemu-disable-network.diff.patch
@@ -1,6 +1,6 @@
From: Guido Guenther <agx at sigxcpu.org>
Date: Fri, 7 Mar 2008 09:08:26 +0100
-Subject: [PATCH] qemu-disable-network.diff
+Subject: qemu-disable-network.diff
---
src/Makefile.am | 3 ---
diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/remove-RHism.diff.patch
similarity index 95%
rename from debian/patches/0001-remove-RHism.diff.patch
rename to debian/patches/remove-RHism.diff.patch
index 3f9a581..ce6e06d 100644
--- a/debian/patches/0001-remove-RHism.diff.patch
+++ b/debian/patches/remove-RHism.diff.patch
@@ -1,6 +1,6 @@
From: Guido Guenther <agx at sigxcpu.org>
Date: Fri, 7 Mar 2008 09:08:25 +0100
-Subject: [PATCH] remove-RHism.diff
+Subject: remove-RHism.diff
---
tools/virsh.pod | 2 +-
diff --git a/debian/patches/series b/debian/patches/series
index 37a82ca..c6e7ab5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
-0001-remove-RHism.diff.patch
-0002-qemu-disable-network.diff.patch
-0003-allow-libvirt-group-to-access-the-socket.patch
-0004-fix-Debian-specific-path-to-hvm-loader.patch
-0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
-0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
-0007-Disable-CHECKSUM-rule.patch
-0008-libvirt-guests-remove-bashisms.patch
-0009-build-let-xgettext-see-strings-in-libvirt-guests.patch
-0010-Debianize-libvirt-guests.patch
+remove-RHism.diff.patch
+qemu-disable-network.diff.patch
+allow-libvirt-group-to-access-the-socket.patch
+fix-Debian-specific-path-to-hvm-loader.patch
+Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
+patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+Disable-CHECKSUM-rule.patch
+libvirt-guests-remove-bashisms.patch
+build-let-xgettext-see-strings-in-libvirt-guests.patch
+Debianize-libvirt-guests.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list