Commit 780f6a7354825c01b31239146aab5fb77d624b4e - libvirt

Redo patches. Laurent Léonard 14 years ago

3 changed file(s) with 7 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all

-1

debian/patches/0001-remove-RHism.diff.patch less more

6	6	1 files changed, 1 insertions(+), 1 deletions(-)
7	7
8	8	diff --git a/virsh.1 b/virsh.1
9		index ca03cc1..ffec62c 100644
	9	index 5731b4c..01f9e5b 100644
10	10	--- a/virsh.1
11	11	+++ b/virsh.1
12	12	@@ -171,7 +171,7 @@ the program.

-4

debian/patches/0002-qemu-disable-network.diff.patch less more

7	7	2 files changed, 0 insertions(+), 6 deletions(-)
8	8
9	9	diff --git a/qemud/Makefile.am b/qemud/Makefile.am
10		index 959ff88..324fb4a 100644
	10	index 3d143da..e3f42c2 100644
11	11	--- a/qemud/Makefile.am
12	12	+++ b/qemud/Makefile.am
13		@@ -166,9 +166,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
	13	@@ -173,9 +173,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
14	14	test -z "$(UUID)" \|\| \
15	15	sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
16	16	$(DESTDIR)$(sysconfdir)/$(default_xml_dest)

21	21	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
22	22	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
23	23	diff --git a/qemud/Makefile.in b/qemud/Makefile.in
24		index 471d356..c2b314f 100644
	24	index ad8b93e..8e33361 100644
25	25	--- a/qemud/Makefile.in
26	26	+++ b/qemud/Makefile.in
27		@@ -1462,9 +1462,6 @@ remote_protocol.c: remote_protocol.h
	27	@@ -1519,9 +1519,6 @@ remote_protocol.c: remote_protocol.h
28	28	@WITH_LIBVIRTD_TRUE@ test -z "$(UUID)" \|\| \
29	29	@WITH_LIBVIRTD_TRUE@ sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
30	30	@WITH_LIBVIRTD_TRUE@ $(DESTDIR)$(sysconfdir)/$(default_xml_dest)

-2

debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch less more

11	11	5 files changed, 6 insertions(+), 6 deletions(-)
12	12
13	13	diff --git a/src/xen_internal.c b/src/xen_internal.c
14		index b6bf10d..6168120 100644
	14	index 30fd8bd..c5ba835 100644
15	15	--- a/src/xen_internal.c
16	16	+++ b/src/xen_internal.c
17		@@ -2216,7 +2216,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
	17	@@ -2211,7 +2211,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
18	18	"/usr/lib64/xen/bin/qemu-dm" :
19	19	"/usr/lib/xen/bin/qemu-dm"),
20	20	(guest_archs[i].hvm ?