From 5c77cadc26ff4f34b061e147d348707075d9618585707b7d4871a8e72e05f5a5 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 12 May 2010 20:44:48 +0000 Subject: [PATCH] Various fixes for libvirt 0.8.1 package OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=50 --- libvirt.changes | 9 +++++++ libvirt.spec | 19 +++++++------- remote-rm-unused-field.patch | 50 ++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 remote-rm-unused-field.patch diff --git a/libvirt.changes b/libvirt.changes index f192591..699fafe 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed May 12 11:29:44 MDT 2010 - jfehlig@novell.com + +- Don't package directories/files under /var/run +- Add upstream commit 34a7f3f6 to fix unintentional breakage of + RPC protocol. +- Disable numa support in openSUSE11.3/Factory pending resolution + of bnc#598488 + ------------------------------------------------------------------- Fri Apr 30 15:25:52 MDT 2010 - jfehlig@novell.com diff --git a/libvirt.spec b/libvirt.spec index 8b868d8..cad6402 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -62,6 +62,10 @@ %ifnarch x86_64 ia64 %define with_numactl 0 %endif +# TEMP: no numa on 11.3 / Factory until bnc#598488 is resolved +%if 0%{?suse_version} > 1120 +%define with_numactl 0 +%endif # SLES doesn't contain OpenVZ, VBox, UML, OpenNebula, or ESX %if 0%{?sles_version} %define with_openvz 0 @@ -117,7 +121,7 @@ Version: 0.8.1 Release: 1 Summary: A C toolkit to interract with the virtualization capabilities of Linux # The client side, i.e. shared libs and virsh are in a subpackage -Requires: libvirt-client = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} Requires: bridge-utils Requires: iptables Requires: lvm2 @@ -138,6 +142,7 @@ Requires: PolicyKit >= 0.6 Source0: %{name}-%{version}.tar.bz2 Source1: libvirtd.init # Upstream patches +Patch0: remote-rm-unused-field.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: socat.patch @@ -194,7 +199,7 @@ Authors: License: LGPLv2.1+ Summary: A C toolkit to interract with the virtualization capabilities of Linux Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} libxml2-devel +Requires: %{name}-client = %{version}-%{release} libxml2-devel %if %{with_xen} Requires: xen-devel %endif @@ -216,7 +221,7 @@ Authors: License: LGPLv2.1+ Summary: A C toolkit to interract with the virtualization capabilities of Linux Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{name}-client = %{version}-%{release} %description doc Libvirt is a C toolkit to interract with the virtualization @@ -234,7 +239,7 @@ Authors: License: LGPLv2.1+ Summary: A C toolkit to interract with the virtualization capabilities of Linux Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{name}-client = %{version}-%{release} %py_requires %description python @@ -251,6 +256,7 @@ Authors: %prep %setup -q +%patch0 -p1 %patch100 -p1 %patch101 -p1 %patch102 @@ -352,7 +358,6 @@ cd docs ; cp -a *.html $RPM_BUILD_ROOT%{_docdir}/%{name} ; cp -a *.png $RPM_BU rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@latin # don't autostart the default network rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/libvirt mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt rm $RPM_BUILD_ROOT%{_libdir}/*.*a $RPM_BUILD_ROOT%{py_sitedir}/*.*a %if ! %{with_lxc} @@ -426,7 +431,6 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/libvirt/libvirtd.conf %config %{_sysconfdir}/libvirt/qemu/networks/default.xml %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ -%dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ @@ -441,7 +445,6 @@ rm -rf $RPM_BUILD_ROOT %if %{with_qemu} %config (noreplace)%{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu -%dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ @@ -449,14 +452,12 @@ rm -rf $RPM_BUILD_ROOT %if %{with_lxc} %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc -%dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc %endif %if %{with_uml} %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml -%dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ %endif diff --git a/remote-rm-unused-field.patch b/remote-rm-unused-field.patch new file mode 100644 index 0000000..0a5f271 --- /dev/null +++ b/remote-rm-unused-field.patch @@ -0,0 +1,50 @@ +commit 34a7f3f6be9c63ac3d4c4604c1fb2482a4e5053b +Author: Matthew Booth +Date: Fri May 7 16:38:05 2010 +0200 + + Remove unused nwfilter field from struct remote_error + + Change 965466c1 added a new field to struct remote_error, which broke + the RPC protocol. Fortunately the new field is unused, so this change + simply removes it again. + + * src/remote/remote_protocol.(c|h|x): Remove remote_nwfilter from struct + remote_error + +diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c +index 187281d..972bf52 100644 +--- a/src/remote/remote_protocol.c ++++ b/src/remote/remote_protocol.c +@@ -227,8 +227,6 @@ xdr_remote_error (XDR *xdrs, remote_error *objp) + return FALSE; + if (!xdr_remote_network (xdrs, &objp->net)) + return FALSE; +- if (!xdr_remote_nwfilter (xdrs, &objp->nwfilter)) +- return FALSE; + return TRUE; + } + +diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h +index 6f01da7..a600af6 100644 +--- a/src/remote/remote_protocol.h ++++ b/src/remote/remote_protocol.h +@@ -143,7 +143,6 @@ struct remote_error { + int int1; + int int2; + remote_network net; +- remote_nwfilter nwfilter; + }; + typedef struct remote_error remote_error; + +diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x +index 8000ee0..1ce488c 100644 +--- a/src/remote/remote_protocol.x ++++ b/src/remote/remote_protocol.x +@@ -266,7 +266,6 @@ struct remote_error { + int int1; + int int2; + remote_network net; +- remote_nwfilter nwfilter; + }; + + /* Authentication types available thus far.... */