From 76c8282ee2ece64612ffc37e7c9be13fd0a8c7ac Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 14 Aug 2012 20:06:04 +0800 Subject: [PATCH] Fix missing symbols in libvirt daemon in rc0 snapshot --- ...ild-Link-security-driver-into-daemon.patch | 30 +++++++++++++++++++ libvirt.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 libvirt-build-Link-security-driver-into-daemon.patch diff --git a/libvirt-build-Link-security-driver-into-daemon.patch b/libvirt-build-Link-security-driver-into-daemon.patch new file mode 100644 index 0000000..77ea967 --- /dev/null +++ b/libvirt-build-Link-security-driver-into-daemon.patch @@ -0,0 +1,30 @@ +From 840b80b48c0189423993db6268f85dd5eac345ac Mon Sep 17 00:00:00 2001 +From: Jiri Denemark +Date: Wed, 1 Aug 2012 09:59:43 +0200 +Subject: [PATCH] build: Link security driver into daemon +To: libvir-list@redhat.com + +Commit aae5cfb69948fddef556f8f5b9f80a444f9c6125 removed security driver +from libvirt_la but forgot to link it into libvirtd in case libvirt is +built without modules. + +Signed-off-by: Daniel Veillard +--- + daemon/Makefile.am | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index 928aeaf..b8ecbef 100644 +--- a/daemon/Makefile.am ++++ b/daemon/Makefile.am +@@ -164,6 +164,7 @@ endif + if WITH_NWFILTER + libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la + endif ++libvirtd_LDADD += ../src/libvirt_driver_security.la + endif + + libvirtd_LDADD += ../src/libvirt.la +-- +1.7.7.6 + diff --git a/libvirt.spec b/libvirt.spec index 3d9fe50..a2c0da4 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -309,7 +309,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 0.10.0 -Release: 0rc0%{?dist}%{?extra_release} +Release: 0rc0.1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -320,6 +320,7 @@ URL: http://libvirt.org/ %endif Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}-rc0.tar.gz Patch0: libvirt-0.10.0-rc0-release-naming.patch +Patch1: libvirt-build-Link-security-driver-into-daemon.patch %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} @@ -1022,6 +1023,7 @@ of recent versions of Linux (and other OSes). %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %if ! %{with_xen} @@ -1844,6 +1846,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %endif %changelog +* Tue Aug 14 2012 Daniel Veillard - 0.10.0-0rc0.1 +- fix security driver missing from the daemon + * Wed Aug 8 2012 Daniel Veillard - 0.10.0-0rc0 - snapshot before 0.10.0 in a few weeks - adds the parallel driver support