mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
libvirt: uprev to v6.1.0
Updating libvirt to the next major release series. With this, brings
some changes to the build:
- add python3-docutils-native to DEPENDS, since it is needed for doc
building
- remove a reference to libgnu.la from the Makefiles, since it is not
needed or provided in the build dependencies
- remove obselete packageconfig options: xenapi and phyp
- add an explicit do_compile rule (versus the autotools bbclass
variant), so we can create some directories before compilation
starts
- add ${B}/src to the PKG_CONFIG_PATH to the libvirt.pc file can be
found during build, as it is queried by libvirt-python
- with the ability to find the libvirt.pc file, we can also drop the
manipulations for libvirt_api_xml_path, as it is returned from
pkg-config queries.
- clear PKG_CONFIG_SYSROOT_DIR during libvirt-python builds, since
the libvirt.pc file already provides cflags/includes that are
contained to the build/src directory structure.
And finally, existing patches are refreshed to remove fuzz.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield
parent
ec7c1b229b
commit
7a8ee8e986
|
|
@ -16,10 +16,9 @@ FILES_${PN}-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
|
|||
FILES_${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
|
||||
|
||||
SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"
|
||||
SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
|
||||
|
||||
SRC_URI[libvirt_python.md5sum] = "4c8c38c409f967b8b47e0d7c6df050a4"
|
||||
SRC_URI[libvirt_python.sha256sum] = "561cafedb83e41880405905f6309f4a86981cfe05edbbc83c839f7c47d8ba603"
|
||||
SRC_URI[libvirt_python.md5sum] = "2834626b07da6ac4ca1559abfd55c118"
|
||||
SRC_URI[libvirt_python.sha256sum] = "be644f4809c0e1d368e3ac065df3c66a26dcfe61ecb607ee9706e1799f22c35a"
|
||||
|
||||
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
|
||||
export LIBVIRT_CFLAGS = "-I${S}/include"
|
||||
|
|
@ -41,6 +40,10 @@ python __anonymous () {
|
|||
|
||||
do_compile_append() {
|
||||
if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then
|
||||
# we need the python bindings to look into our source dir, not
|
||||
# the syroot staged pkgconfig entries. So we clear the sysroot
|
||||
# for just this portion.
|
||||
export PKG_CONFIG_SYSROOT_DIR=
|
||||
cd ${WORKDIR}/${BPN}-python-${PV} && \
|
||||
${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py build
|
||||
fi
|
||||
|
|
@ -48,6 +51,10 @@ do_compile_append() {
|
|||
|
||||
do_install_append() {
|
||||
if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then
|
||||
# we need the python bindings to look into our source dir, not
|
||||
# the syroot staged pkgconfig entries. So we clear the sysroot
|
||||
# for just this portion.
|
||||
export PKG_CONFIG_SYSROOT_DIR=
|
||||
cd ${WORKDIR}/${BPN}-python-${PV} && \
|
||||
${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py install \
|
||||
--install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${LIBVIRT_INSTALL_ARGS}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
From 4945576d6c5c7cc9a21a58aaa312829567af13db Mon Sep 17 00:00:00 2001
|
||||
From: Bruce Ashfield <bruce.ashfield@gmail.com>
|
||||
Date: Sat, 7 Mar 2020 21:36:27 -0500
|
||||
Subject: [PATCH] build: drop unnecessary libgnu.la reference
|
||||
|
||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
|
||||
---
|
||||
tools/Makefile.am | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 2a0a989..93fe283 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -168,7 +168,6 @@ virt_host_validate_LDADD = \
|
||||
|
||||
if WITH_GNUTLS
|
||||
virt_host_validate_LDADD += ../src/libvirt-net-rpc.la \
|
||||
- ../gnulib/lib/libgnu.la \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
@@ -270,7 +269,6 @@ BUILT_SOURCES =
|
||||
|
||||
if WITH_GNUTLS
|
||||
virsh_LDADD += ../src/libvirt-net-rpc.la \
|
||||
- ../gnulib/lib/libgnu.la \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From ffc71da15c3da068f85d16617b6e0c0175fc0110 Mon Sep 17 00:00:00 2001
|
||||
From 1601c21b653bf2bea2547e5efcf1f3cbb8b73f65 Mon Sep 17 00:00:00 2001
|
||||
From: He Zhe <zhe.he@windriver.com>
|
||||
Date: Tue, 23 Aug 2016 02:28:47 -0400
|
||||
Subject: [PATCH] ptest: Remove Windows-1252 check from esxutilstest
|
||||
|
|
@ -7,15 +7,16 @@ Currently we use iconv from glibc-locale and it does not support
|
|||
Windows-1252 and we don't need support windows character encoding.
|
||||
|
||||
Signed-off-by: He Zhe <zhe.he@windriver.com>
|
||||
|
||||
---
|
||||
tests/esxutilstest.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
|
||||
index 44bdc84..3223de3 100644
|
||||
index 2e20200..6c57889 100644
|
||||
--- a/tests/esxutilstest.c
|
||||
+++ b/tests/esxutilstest.c
|
||||
@@ -258,7 +258,6 @@ mymain(void)
|
||||
@@ -256,7 +256,6 @@ mymain(void)
|
||||
DO_TEST(ParseDatastorePath);
|
||||
DO_TEST(ConvertDateTimeToCalendarTime);
|
||||
DO_TEST(EscapeDatastoreItem);
|
||||
|
|
@ -23,6 +24,3 @@ index 44bdc84..3223de3 100644
|
|||
|
||||
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
||||
}
|
||||
--
|
||||
2.8.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 8353dc1e642011199c3b3ba057d51d8768e4cd54 Mon Sep 17 00:00:00 2001
|
||||
From 7cf1d66c4b01c40b45b8a38370c7ffee46dfb10a Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Fri, 31 Jul 2015 03:17:07 +0900
|
||||
Subject: [PATCH] to fix build error
|
||||
|
|
@ -17,26 +17,27 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
|
|||
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
|
||||
[MA: rebase to v4.3.0]
|
||||
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
|
||||
---
|
||||
docs/Makefile.am | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/docs/Makefile.am b/docs/Makefile.am
|
||||
index 9620587..060a82b 100644
|
||||
index 61862c4..c259535 100644
|
||||
--- a/docs/Makefile.am
|
||||
+++ b/docs/Makefile.am
|
||||
@@ -183,7 +183,7 @@ EXTRA_DIST= \
|
||||
hvsupport.pl \
|
||||
@@ -360,7 +360,7 @@ EXTRA_DIST= \
|
||||
aclperms.htmlinc \
|
||||
$(schema_DATA)
|
||||
|
||||
-acl_generated = aclperms.htmlinc
|
||||
+acl.html:: $(srcdir)/aclperms.htmlinc
|
||||
|
||||
$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
|
||||
$(srcdir)/genaclperms.pl Makefile.am
|
||||
@@ -247,8 +247,7 @@ MAINTAINERCLEANFILES += \
|
||||
%.png: %.fig
|
||||
convert -rotate 90 $< $@
|
||||
aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
|
||||
$(top_srcdir)/scripts/genaclperms.py Makefile.am
|
||||
@@ -426,8 +426,7 @@ manpages/%.html.in: manpages/%.rst
|
||||
$(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
|
||||
$(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
|
||||
|
||||
-%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
|
||||
- $(acl_generated)
|
||||
|
|
@ -44,6 +45,3 @@ index 9620587..060a82b 100644
|
|||
$(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \
|
||||
dir=`dirname $@` ; \
|
||||
if test "$$dir" = "."; \
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f10477f0fe5e4b7487a4a41faa216d10cd2bc7c3 Mon Sep 17 00:00:00 2001
|
||||
From d074f34dd0fc671ab05367eda9cc7a965708fbed Mon Sep 17 00:00:00 2001
|
||||
From: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
Date: Thu, 10 May 2018 12:05:04 -0400
|
||||
Subject: [PATCH] configure.ac: search for rpc/rpc.h in the sysroot
|
||||
|
|
@ -10,20 +10,21 @@ for libtirpc's rpc.h header.
|
|||
Upstream-Status: Inappropriate [old release]
|
||||
|
||||
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
|
||||
---
|
||||
m4/virt-xdr.m4 | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4
|
||||
index 5a6408c..6c19f6d 100644
|
||||
index 8375415..12b51f7 100644
|
||||
--- a/m4/virt-xdr.m4
|
||||
+++ b/m4/virt-xdr.m4
|
||||
@@ -33,10 +33,10 @@ if test x"$with_remote" = x"yes" || test x"$with_libvirtd" = x"yes"; then
|
||||
dnl check for cygwin's variation in xdr function names
|
||||
AC_CHECK_FUNCS([xdr_u_int64_t],[],[],[#include <rpc/xdr.h>])
|
||||
@@ -30,10 +30,10 @@ AC_DEFUN([LIBVIRT_CHECK_XDR], [
|
||||
])
|
||||
with_xdr="yes"
|
||||
|
||||
- dnl Cygwin/recent glibc requires -I/usr/include/tirpc for <rpc/rpc.h>
|
||||
+ dnl Cygwin/recent glibc requires -I=/usr/include/tirpc for <rpc/rpc.h>
|
||||
- dnl Recent glibc requires -I/usr/include/tirpc for <rpc/rpc.h>
|
||||
+ dnl Recent glibc requires -I=/usr/include/tirpc for <rpc/rpc.h>
|
||||
old_CFLAGS=$CFLAGS
|
||||
AC_CACHE_CHECK([where to find <rpc/rpc.h>], [lv_cv_xdr_cflags], [
|
||||
- for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do
|
||||
|
|
@ -31,6 +32,3 @@ index 5a6408c..6c19f6d 100644
|
|||
if test x"$add_CFLAGS" = xmissing; then
|
||||
lv_cv_xdr_cflags=missing; break
|
||||
fi
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 4aea9dbeb7f7990ac5a2227d80251570b4a5bca1 Mon Sep 17 00:00:00 2001
|
||||
From 75c974d28133ff85d299b7a53427653c47513a45 Mon Sep 17 00:00:00 2001
|
||||
From: Dengke Du <dengke.du@windriver.com>
|
||||
Date: Wed, 8 May 2019 17:24:17 +0800
|
||||
Subject: [PATCH] Install missing conf file
|
||||
|
|
@ -14,15 +14,16 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|||
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
[DDU: Update context for v5.3.0]
|
||||
Signed-off-by: Dengke Du <dengke.du@windriver.com>
|
||||
|
||||
---
|
||||
tests/Makefile.am | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 7d0387e..68c3561 100644
|
||||
index 7a0aee3..380637d 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -168,6 +168,7 @@ EXTRA_DIST = \
|
||||
@@ -172,6 +172,7 @@ EXTRA_DIST = \
|
||||
$(NULL)
|
||||
|
||||
test_helpers = commandhelper ssh
|
||||
|
|
@ -30,7 +31,7 @@ index 7d0387e..68c3561 100644
|
|||
test_programs = virshtest sockettest \
|
||||
virhostcputest virbuftest \
|
||||
commandtest seclabeltest \
|
||||
@@ -303,6 +304,7 @@ endif WITH_LXC
|
||||
@@ -310,6 +311,7 @@ endif WITH_LXC
|
||||
|
||||
if WITH_OPENVZ
|
||||
test_programs += openvzutilstest
|
||||
|
|
@ -38,7 +39,7 @@ index 7d0387e..68c3561 100644
|
|||
endif WITH_OPENVZ
|
||||
|
||||
if WITH_ESX
|
||||
@@ -1539,7 +1541,7 @@ endif ! WITH_CIL
|
||||
@@ -1553,7 +1555,7 @@ endif ! WITH_LINUX
|
||||
|
||||
buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers)
|
||||
|
||||
|
|
@ -47,6 +48,3 @@ index 7d0387e..68c3561 100644
|
|||
|
||||
install-ptest:
|
||||
list='$(TESTS) $(test_helpers) test-lib.sh virschematest'
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 3e271f6db12ffe34843428ec2f0bca7a8fe3aa65 Mon Sep 17 00:00:00 2001
|
||||
From 57b645c6db405bf2e22f4589ea5560a14975058f Mon Sep 17 00:00:00 2001
|
||||
From: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||
Date: Wed, 8 Apr 2015 13:03:03 -0400
|
||||
Subject: [PATCH] libvirt: use pkg-config to locate libcap
|
||||
|
|
@ -14,18 +14,19 @@ locate the correct libraries.
|
|||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||
[MA: Update to apply agains v4.3.0]
|
||||
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
|
||||
---
|
||||
m4/virt-libpcap.m4 | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/m4/virt-libpcap.m4 b/m4/virt-libpcap.m4
|
||||
index 8fa4889..08b2f53 100644
|
||||
index 605c2fd..e0ab018 100644
|
||||
--- a/m4/virt-libpcap.m4
|
||||
+++ b/m4/virt-libpcap.m4
|
||||
@@ -23,14 +23,14 @@ AC_DEFUN([LIBVIRT_ARG_LIBPCAP], [
|
||||
|
||||
AC_DEFUN([LIBVIRT_CHECK_LIBPCAP], [
|
||||
LIBPCAP_REQUIRED="1.0.0"
|
||||
LIBPCAP_REQUIRED="1.5.0"
|
||||
- LIBPCAP_CONFIG="pcap-config"
|
||||
+ LIBPCAP_CONFIG="pkg-config libpcap"
|
||||
LIBPCAP_CFLAGS=""
|
||||
|
|
@ -40,6 +41,3 @@ index 8fa4889..08b2f53 100644
|
|||
esac
|
||||
AS_IF([test "x$LIBPCAP_CONFIG" != "x"], [
|
||||
AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED )
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
Adding support for LIBVIRT_CFLAGS and LIBVIRT_LIBS
|
||||
|
||||
Signed-off-by: Amy Fong <amy.fong@windriver.com>
|
||||
|
||||
|
||||
Adding a support for LIBVIRT_API_PATH evironment variable, which can
|
||||
control where the script should look for the 'libvirt-api.xml' file.
|
||||
This allows building libvirt-python against different libvirt than the
|
||||
one installed in the system. This may be used for example in autotest
|
||||
or by packagers without the need to install libvirt into the system.
|
||||
|
||||
Signed-off-by: Martin Kletzander <mkletzan redhat com>
|
||||
[ywei: rebased to 1.3.2]
|
||||
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
|
||||
---
|
||||
setup.py | 35 ++++++++++++++++++++++++-----------
|
||||
1 file changed, 24 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index eff9d54..48ec4fe 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -43,13 +43,7 @@ def check_minimum_libvirt_version():
|
||||
"libvirt"])
|
||||
|
||||
def have_libvirt_lxc():
|
||||
- try:
|
||||
- spawn([get_pkgcfg(),
|
||||
- "--atleast-version=%s" % MIN_LIBVIRT_LXC,
|
||||
- "libvirt"])
|
||||
- return True
|
||||
- except DistutilsExecError:
|
||||
- return False
|
||||
+ return True
|
||||
|
||||
def have_libvirtaio():
|
||||
# This depends on asyncio, which in turn depends on "yield from" syntax.
|
||||
@@ -77,7 +71,17 @@ def get_api_xml_files():
|
||||
"""Check with pkg-config that libvirt is present and extract
|
||||
the API XML file paths we need from it"""
|
||||
|
||||
- libvirt_api = get_pkgconfig_data(["--variable", "libvirt_api"], "libvirt")
|
||||
+ libvirt_api = os.getenv("LIBVIRT_API_PATH")
|
||||
+
|
||||
+ if libvirt_api:
|
||||
+ if not libvirt_api.endswith("-api.xml"):
|
||||
+ raise ValueError("Invalid path '%s' for API XML" % libvirt_api)
|
||||
+ if not os.path.exists(libvirt_api):
|
||||
+ raise ValueError("API XML '%s' does not exist, "
|
||||
+ "have you built libvirt?" % libvirt_api)
|
||||
+ else:
|
||||
+ libvirt_api = get_pkgconfig_data(["--variable", "libvirt_api"],
|
||||
+ "libvirt")
|
||||
|
||||
offset = libvirt_api.index("-api.xml")
|
||||
libvirt_qemu_api = libvirt_api[0:offset] + "-qemu-api.xml"
|
||||
@@ -97,8 +101,17 @@ def get_module_lists():
|
||||
|
||||
c_modules = []
|
||||
py_modules = []
|
||||
- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
|
||||
- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
|
||||
+ libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
|
||||
+ if libvirt_cflags:
|
||||
+ cflags = libvirt_cflags.split()
|
||||
+ else:
|
||||
+ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
|
||||
+
|
||||
+ libvirt_libs = os.getenv("LIBVIRT_LIBS")
|
||||
+ if libvirt_libs:
|
||||
+ ldflags = libvirt_libs.split()
|
||||
+ else:
|
||||
+ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
|
||||
|
||||
module = Extension('libvirtmod',
|
||||
sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],
|
||||
@@ -144,7 +157,7 @@ def get_module_lists():
|
||||
class my_build(build):
|
||||
|
||||
def run(self):
|
||||
- check_minimum_libvirt_version()
|
||||
+# check_minimum_libvirt_version()
|
||||
apis = get_api_xml_files()
|
||||
|
||||
self.spawn([sys.executable, "generator.py", "libvirt", apis[0]])
|
||||
--
|
||||
2.17.0
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 52fc46b4f8cfd36476f59c0796f4f39686b53953 Mon Sep 17 00:00:00 2001
|
||||
From 9d6bfb4a5e9b44c080ddf3bad4c364ffb0e9d84a Mon Sep 17 00:00:00 2001
|
||||
From: Dengke Du <dengke.du@windriver.com>
|
||||
Date: Wed, 8 May 2019 10:20:47 +0800
|
||||
Subject: [PATCH] Add 'install-ptest' rule
|
||||
|
|
@ -17,15 +17,16 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
|
|||
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
[DDU: Update context for v5.3.0]
|
||||
Signed-off-by: Dengke Du <dengke.du@windriver.com>
|
||||
|
||||
---
|
||||
tests/Makefile.am | 68 ++++++++++++++++++++++++++++++++++++++++++++++++-------
|
||||
tests/Makefile.am | 68 +++++++++++++++++++++++++++++++++++++++++------
|
||||
1 file changed, 60 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 46d94d2..7d0387e 100644
|
||||
index 83326db..7a0aee3 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -29,11 +29,13 @@ AM_CPPFLAGS = \
|
||||
@@ -28,11 +28,13 @@ AM_CPPFLAGS = \
|
||||
|
||||
WARN_CFLAGS += $(RELAXED_FRAME_LIMIT_CFLAGS)
|
||||
|
||||
|
|
@ -41,9 +42,9 @@ index 46d94d2..7d0387e 100644
|
|||
+ -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \
|
||||
+ -Dabs_top_srcdir="\"$(PTEST_DIR)\"" \
|
||||
$(LIBXML_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBNL_CFLAGS) \
|
||||
$(GNUTLS_CFLAGS) \
|
||||
@@ -465,10 +467,10 @@ TESTS = $(test_programs) \
|
||||
@@ -472,10 +474,10 @@ TESTS = $(test_programs) \
|
||||
|
||||
VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT)
|
||||
TESTS_ENVIRONMENT = \
|
||||
|
|
@ -55,12 +56,12 @@ index 46d94d2..7d0387e 100644
|
|||
+ abs_top_srcdir="$(PTEST_DIR)" \
|
||||
+ abs_builddir="$(PTEST_DIR)/tests" \
|
||||
+ abs_srcdir="$(PTEST_DIR)/tests" \
|
||||
SHELL="$(SHELL)" \
|
||||
LIBVIRT_AUTOSTART=0 \
|
||||
LC_ALL=C \
|
||||
@@ -1535,5 +1537,55 @@ else ! WITH_CIL
|
||||
EXTRA_DIST += objectlocking.ml
|
||||
endif ! WITH_CIL
|
||||
VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \
|
||||
@@ -1549,4 +1551,54 @@ else ! WITH_LINUX
|
||||
EXTRA_DIST += virscsitest.c
|
||||
endif ! WITH_LINUX
|
||||
|
||||
+buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers)
|
||||
+
|
||||
|
|
@ -78,7 +79,7 @@ index 46d94d2..7d0387e 100644
|
|||
+ install ../src/libvirt_iohelper $(DEST_DIR)/src
|
||||
+ install -D ../src/libvirtd $(DEST_DIR)/src/libvirtd
|
||||
+ install -d $(DEST_DIR)/src/remote
|
||||
+ install -D $(top_srcdir)/src/remote/libvirtd.conf $(DEST_DIR)/src/remote/libvirtd.conf
|
||||
+ install -D $(top_srcdir)/../build/src/remote/libvirtd.conf $(DEST_DIR)/src/remote/libvirtd.conf
|
||||
+ install -d $(DEST_DIR)/src/remote/.libs
|
||||
+ @(if [ -d ../src/remote/.libs ] ; then cd ../src/remote/.libs; fi; \
|
||||
+ install * $(DEST_DIR)/src/remote/.libs)
|
||||
|
|
@ -112,8 +113,4 @@ index 46d94d2..7d0387e 100644
|
|||
+ sed -i -e 's|$(BUILD_DIR)|$(PTEST_DIR)|g' $(DEST_DIR)/Makefile
|
||||
+ sed -i -e 's|^\(.*\.log:\) \(.*EXEEXT.*\)|\1|g' $(DEST_DIR)/tests/Makefile
|
||||
+
|
||||
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \
|
||||
objectlocking-files.txt
|
||||
--
|
||||
2.7.4
|
||||
|
||||
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From ae4b40a1b3cb63a322716b6ad1762d53ada249e1 Mon Sep 17 00:00:00 2001
|
||||
From a1696741375c6faca0d09ae6b271a2c56fc2b6fe 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
|
||||
|
|
@ -15,16 +15,17 @@ Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
|
|||
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 @@
|
||||
---
|
||||
examples/Makefile.am | 20 ++++++++++++++++++++
|
||||
tools/Makefile.am | 12 ++++++++++++
|
||||
2 files changed, 32 insertions(+)
|
||||
|
||||
diff --git a/examples/Makefile.am b/examples/Makefile.am
|
||||
index ad635bd..a94f41d 100644
|
||||
--- a/examples/Makefile.am
|
||||
+++ b/examples/Makefile.am
|
||||
@@ -74,6 +74,10 @@ LDADD = \
|
||||
$(top_builddir)/src/libvirt-admin.la \
|
||||
$(NULL)
|
||||
|
||||
|
|
@ -35,10 +36,11 @@ Index: libvirt-5.5.0/examples/Makefile.am
|
|||
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
|
||||
@@ -111,6 +115,22 @@ c_misc_openauth_SOURCES = c/misc/openauth.c
|
||||
examplesdir = $(docdir)/examples
|
||||
|
||||
adminexamplesdir = $(examplesdir)/c/admin
|
||||
+
|
||||
+if WITH_GNUTLS
|
||||
+dominfo_info1_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
|
||||
+ $(LDADD) \
|
||||
|
|
@ -54,15 +56,15 @@ Index: libvirt-5.5.0/examples/Makefile.am
|
|||
+ $(NULL)
|
||||
+endif
|
||||
+
|
||||
if WITH_NWFILTER
|
||||
adminexamples_DATA = $(ADMIN_EXAMPLES)
|
||||
|
||||
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 \
|
||||
domainexamplesdir = $(examplesdir)/c/domain
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 53df930..2a0a989 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -166,6 +166,12 @@ virt_host_validate_LDADD = \
|
||||
$(GLIB_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
+if WITH_GNUTLS
|
||||
|
|
@ -74,7 +76,7 @@ Index: libvirt-5.5.0/tools/Makefile.am
|
|||
virt_host_validate_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
$(NULL)
|
||||
@@ -265,6 +271,12 @@
|
||||
@@ -262,6 +268,12 @@ virt_admin_CFLAGS = \
|
||||
$(READLINE_CFLAGS)
|
||||
BUILT_SOURCES =
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ SECTION = "console/tools"
|
|||
|
||||
DEPENDS = "bridge-utils gnutls libxml2 lvm2 avahi parted curl libpcap util-linux e2fsprogs pm-utils \
|
||||
iptables dnsmasq readline libtasn1 libxslt-native acl libdevmapper libtirpc \
|
||||
python3-docutils-native \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'shadow-native', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls-native', '', d)}"
|
||||
|
||||
|
|
@ -36,12 +37,13 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
|
|||
file://install-missing-file.patch \
|
||||
file://0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch \
|
||||
file://configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch \
|
||||
file://0001-build-drop-unnecessary-libgnu.la-reference.patch \
|
||||
file://hook_support.py \
|
||||
file://gnutls-helper.py \
|
||||
"
|
||||
|
||||
SRC_URI[libvirt.md5sum] = "27c5fb6c8d2d46eb9e8165aeb3b499b0"
|
||||
SRC_URI[libvirt.sha256sum] = "2306ef0947a594f91ec9da4b8b0307bdb54b897f17de19f48e8ecdca08ff35e8"
|
||||
SRC_URI[libvirt.md5sum] = "a870e63f20fac2ccf98e716d05256145"
|
||||
SRC_URI[libvirt.sha256sum] = "167c185be45560e73dd3e14ed375778b555c01455192de2dafc4d0f74fabebc0"
|
||||
|
||||
inherit autotools gettext update-rc.d pkgconfig ptest systemd useradd perlnative
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
|
|
@ -207,11 +209,9 @@ PACKAGECONFIG_remove_armeb = "numactl"
|
|||
PACKAGECONFIG[gnutls] = ",,,gnutls-bin"
|
||||
PACKAGECONFIG[qemu] = "--with-qemu --with-qemu-user=qemu --with-qemu-group=qemu,--without-qemu,qemu,"
|
||||
PACKAGECONFIG[yajl] = "--with-yajl,--without-yajl,yajl,yajl"
|
||||
PACKAGECONFIG[xenapi] = "--with-xenapi,--without-xenapi,,"
|
||||
PACKAGECONFIG[libxl] = "--with-libxl=${STAGING_DIR_TARGET}/lib,--without-libxl,xen,"
|
||||
PACKAGECONFIG[openvz] = "--with-openvz,--without-openvz,,"
|
||||
PACKAGECONFIG[vmware] = "--with-vmware,--without-vmware,,"
|
||||
PACKAGECONFIG[phyp] = "--with-phyp,--without-phyp,,"
|
||||
PACKAGECONFIG[vbox] = "--with-vbox,--without-vbox,,"
|
||||
PACKAGECONFIG[esx] = "--with-esx,--without-esx,,"
|
||||
PACKAGECONFIG[hyperv] = "--with-hyperv,--without-hyperv,,"
|
||||
|
|
@ -242,6 +242,26 @@ PACKAGECONFIG[numad] = "--with-numad, --without-numad,"
|
|||
# Enable the Python tool support
|
||||
require libvirt-python.inc
|
||||
|
||||
do_compile() {
|
||||
cd ${B}/src
|
||||
# There may be race condition, but without creating these directories
|
||||
# in the source tree, generation of files fails.
|
||||
for i in access admin logging esx locking rpc hyperv lxc \
|
||||
remote network storage interface nwfilter node_device \
|
||||
secret vbox qemu; do
|
||||
mkdir -p $i;
|
||||
done
|
||||
|
||||
cd ${B}
|
||||
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${B}/src:"
|
||||
oe_runmake all
|
||||
}
|
||||
|
||||
do_install_prepend() {
|
||||
# so the install routines can find the libvirt.pc in the source dir
|
||||
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${B}/src:"
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}/etc/init.d
|
||||
install -d ${D}/etc/libvirt
|
||||
Loading…
Reference in New Issue
Block a user