pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper fix for libvirt policykit build issue

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=173
This commit is contained in:
James Fehlig 2011-11-16 21:18:13 +00:00 committed by Git OBS Bridge
parent 5e8fd75542
commit e4ab951a14
5 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0f590c62-polkit0.patch
View File

@ -1,28 +0,0 @@
commit 0f590c62b2af15247cafc2cc53815a7edbf5532e
Author: Jim Fehlig <jfehlig@suse.com>
Date: Tue Nov 15 15:11:49 2011 -0700
Fix build with polkit0
I missed adding libvirt_driver_remote.la to libvirtd_LDADD in
commit b8adfcc6, which didn't cause a problem in 0.9.6 but
results in this build error in 0.9.7
libvirtd-remote.o: In function `remoteDispatchAuthPolkit':
remote.c:(.text+0x188dd): undefined reference to `virNetServerGetDBusConn'
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e8c47ae..59db217 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -156,6 +156,10 @@ endif
if WITH_NWFILTER
libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la
endif
+
+if HAVE_POLKIT0
+ libvirtd_LDADD += ../src/libvirt_driver_remote.la
+endif
endif
libvirtd_LDADD += ../src/libvirt.la

25
d47ab3fe-polkit0.patch Normal file
View File

@ -0,0 +1,25 @@
commit d47ab3fe6115de6c54f999ba598fe58418840653
Author: Jim Fehlig <jfehlig@suse.com>
Date: Wed Nov 16 11:35:08 2011 -0700
Fix build with polkit0
I missed adding virNetServerGetDBusConn() to libvirtd_private.syms
in commit b8adfcc6, which didn't cause a problem in 0.9.6 but
results in this build error in 0.9.7
libvirtd-remote.o: In function `remoteDispatchAuthPolkit':
remote.c:(.text+0x188dd): undefined reference to `virNetServerGetDBusConn'
Index: libvirt-0.9.7/src/libvirt_private.syms
===================================================================
--- libvirt-0.9.7.orig/src/libvirt_private.syms
+++ libvirt-0.9.7/src/libvirt_private.syms
@@ -1217,6 +1217,7 @@ virNetServerAddSignalHandler;
virNetServerAutoShutdown;
virNetServerClose;
virNetServerFree;
+virNetServerGetDBusConn;
virNetServerIsPrivileged;
virNetServerNew;
virNetServerQuit;

2
libvirt.changes
View File

@ -2,7 +2,7 @@
Tue Nov 15 15:05:36 MST 2011 - jfehlig@suse.com
- Fix build when using older PolicyKit
polkit0.patch
d47ab3fe-polkit0.patch
-------------------------------------------------------------------
Wed Nov 9 18:52:18 MST 2011 - jfehlig@suse.com

2
libvirt.spec
View File

@ -380,7 +380,7 @@ Source1: libvirtd.init
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
Patch0: 0f590c62-polkit0.patch
Patch0: d47ab3fe-polkit0.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch

2
use-init-script-redhat.patch
View File

@ -230,7 +230,7 @@ Index: libvirt-0.9.7/daemon/Makefile.am
===================================================================
--- libvirt-0.9.7.orig/daemon/Makefile.am
+++ libvirt-0.9.7/daemon/Makefile.am
@@ -240,20 +240,12 @@ install-logrotate: $(LOGROTATE_CONFS)
@@ -236,20 +236,12 @@ install-logrotate: $(LOGROTATE_CONFS)
if LIBVIRT_INIT_SCRIPT_RED_HAT
install-init: libvirtd.init