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