[libvirt] [PATCH 0/2] Fix build with polkit0

Commit 0f590c62 was not the proper fix for polkit0 build issue. This series reverts 0f590c62 and adds virNetServerGetDBusConn() to libvirt_private.syms Jim Fehlig (2): Revert commit 0f590c62 Fix build with polkit0 daemon/Makefile.am | 4 ---- src/libvirt_private.syms | 1 + 2 files changed, 1 insertions(+), 4 deletions(-) -- 1.7.7

As noted by Daniel Berrange [1], the proper fix for the older PolicyKit build issue is to add virNetServerGetDBusConn to libvirt_private.syms. Revert unnecessary changes to daemon/Makefile.am [1] https://www.redhat.com/archives/libvir-list/2011-November/msg00852.html --- daemon/Makefile.am | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 59db217..e8c47ae 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -156,10 +156,6 @@ 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 -- 1.7.7

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' --- src/libvirt_private.syms | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b9d537e..4f0b723 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1261,6 +1261,7 @@ virNetServerAddSignalHandler; virNetServerAutoShutdown; virNetServerClose; virNetServerFree; +virNetServerGetDBusConn; virNetServerIsPrivileged; virNetServerNew; virNetServerQuit; -- 1.7.7

On 11/16/2011 11:46 AM, Jim Fehlig wrote:
Commit 0f590c62 was not the proper fix for polkit0 build issue. This series reverts 0f590c62 and adds virNetServerGetDBusConn() to libvirt_private.syms
Jim Fehlig (2): Revert commit 0f590c62 Fix build with polkit0
ACK series, and sorry for my premature ACK earlier. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

Eric Blake wrote:
On 11/16/2011 11:46 AM, Jim Fehlig wrote:
Commit 0f590c62 was not the proper fix for polkit0 build issue. This series reverts 0f590c62 and adds virNetServerGetDBusConn() to libvirt_private.syms
Jim Fehlig (2): Revert commit 0f590c62 Fix build with polkit0
ACK series, and sorry for my premature ACK earlier.
Thanks, pushed. Jim

On Wed, Nov 16, 2011 at 11:46:27AM -0700, Jim Fehlig wrote:
Commit 0f590c62 was not the proper fix for polkit0 build issue. This series reverts 0f590c62 and adds virNetServerGetDBusConn() to libvirt_private.syms
Jim Fehlig (2): Revert commit 0f590c62 Fix build with polkit0
daemon/Makefile.am | 4 ---- src/libvirt_private.syms | 1 + 2 files changed, 1 insertions(+), 4 deletions(-)
ACK, thanks for taking the time to change this. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (3)
-
Daniel P. Berrange
-
Eric Blake
-
Jim Fehlig