mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
cd3767f0b0
Upgrading to 5.5.x for libvirt. One pach refresh is required, but otherwise, build and runtime behaviour is identical to 5.3.x. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
90 lines
2.7 KiB
Diff
90 lines
2.7 KiB
Diff
From ae4b40a1b3cb63a322716b6ad1762d53ada249e1 Mon Sep 17 00:00:00 2001
|
|
From: Dengke Du <dengke.du@windriver.com>
|
|
Date: Tue, 7 May 2019 15:26:32 +0800
|
|
Subject: [PATCH] tools: add libvirt-net-rpc to virt-host-validate when TLS is
|
|
enabled
|
|
|
|
When gnu-tls is enabled for libvirt references to virNetTLSInit are
|
|
generated in libvirt. Any binaries linking against libvirt, must also
|
|
link against libvirt-net-rpc which provides the implementation.
|
|
|
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
|
[ywei: rebased to libvirt-1.3.2]
|
|
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
|
|
[MA: rebase to v4.3.0]
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
[ddu: rebase to v5.3.0]
|
|
Signed-off-by: Dengke Du <dengke.du@windriver.com>
|
|
---
|
|
examples/Makefile.am | 19 +++++++++++++++++++
|
|
tools/Makefile.am | 12 ++++++++++++
|
|
2 files changed, 31 insertions(+)
|
|
|
|
Index: libvirt-5.5.0/examples/Makefile.am
|
|
===================================================================
|
|
--- libvirt-5.5.0.orig/examples/Makefile.am
|
|
+++ libvirt-5.5.0/examples/Makefile.am
|
|
@@ -77,6 +77,10 @@
|
|
$(top_builddir)/src/libvirt-admin.la \
|
|
$(NULL)
|
|
|
|
+if WITH_GNUTLS
|
|
+LDADD += $(top_builddir)/src/libvirt-net-rpc.la
|
|
+endif
|
|
+
|
|
noinst_PROGRAMS = \
|
|
c/admin/client_close \
|
|
c/admin/client_info \
|
|
@@ -111,6 +115,21 @@
|
|
c_misc_hellolibvirt_SOURCES = c/misc/hellolibvirt.c
|
|
c_misc_openauth_SOURCES = c/misc/openauth.c
|
|
|
|
+if WITH_GNUTLS
|
|
+dominfo_info1_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
|
|
+ $(LDADD) \
|
|
+ $(NULL)
|
|
+domsuspend_suspend_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
|
|
+ $(LDADD) \
|
|
+ $(NULL)
|
|
+hellolibvirt_hellolibvirt_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
|
|
+ $(LDADD) \
|
|
+ $(NULL)
|
|
+openauth_openauth_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
|
|
+ $(LDADD) \
|
|
+ $(NULL)
|
|
+endif
|
|
+
|
|
if WITH_NWFILTER
|
|
|
|
nwfilterdir = $(sysconfdir)/libvirt/nwfilter
|
|
Index: libvirt-5.5.0/tools/Makefile.am
|
|
===================================================================
|
|
--- libvirt-5.5.0.orig/tools/Makefile.am
|
|
+++ libvirt-5.5.0/tools/Makefile.am
|
|
@@ -188,6 +188,12 @@
|
|
../gnulib/lib/libgnu.la \
|
|
$(NULL)
|
|
|
|
+if WITH_GNUTLS
|
|
+virt_host_validate_LDADD += ../src/libvirt-net-rpc.la \
|
|
+ ../gnulib/lib/libgnu.la \
|
|
+ $(NULL)
|
|
+endif
|
|
+
|
|
virt_host_validate_CFLAGS = \
|
|
$(AM_CFLAGS) \
|
|
$(NULL)
|
|
@@ -265,6 +271,12 @@
|
|
$(READLINE_CFLAGS)
|
|
BUILT_SOURCES =
|
|
|
|
+if WITH_GNUTLS
|
|
+virsh_LDADD += ../src/libvirt-net-rpc.la \
|
|
+ ../gnulib/lib/libgnu.la \
|
|
+ $(NULL)
|
|
+endif
|
|
+
|
|
if WITH_WIN_ICON
|
|
virsh_LDADD += virsh_win_icon.$(OBJEXT)
|
|
|