summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2018-06-05 10:01:48 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-06-05 12:01:01 -0400
commit343b40ba0d44caeb22013a1586ae2159e415bd4c (patch)
tree3c5fdb72c38b060aeefccff3cd85091b5a5421c3
parent1fd1ff3720140baa3680d795f6d97597e5113e90 (diff)
downloadmeta-virtualization-343b40ba0d44caeb22013a1586ae2159e415bd4c.tar.gz
libvirt: uprev to the latest release, v4.3.0
We have been using the 1.3.x release series for a long time now which has been great for stability but is slowly becoming harder and harder to track and port bug and CVE fixes. This is a big jump to the latest upstream release which gives us access to a myriad of fixes as well as puts us in a better position to contribute to the upstream project when issues are found. Several patches have been dropped as they are either no longer valid against this release or have equivalent updates already applied to the upstream project. Some patches were consolidated which should ease future uprevs of this recipe. The majority of the updates were related to ptest patches, which is not a huge surprise given this code has no upstream equivalent. The overall runtime behavior remains much the same from v1.3.5 with the only notable configuration change being for 'seccomp_sandbox' which has been disabled here but should possibly be revisited in the near future. As usual the normal runtime usecases for qemu/kvm and lxc have been run successfully along with ptest results which are by and large OK: ==================================== Testsuite summary for libvirt 4.3.0 ==================================== # TOTAL: 119 # PASS: 115 # SKIP: 0 # XFAIL: 0 # FAIL: 4 # XPASS: 0 # ERROR: 0 Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat
-rw-r--r--recipes-extended/libvirt/libvirt-1.3.5/0001-Added-configure-variable-for-placing-systemd-untis-l.patch55
-rw-r--r--recipes-extended/libvirt/libvirt-1.3.5/0001-qemu-Let-empty-default-VNC-password-work-as-document.patch81
-rw-r--r--recipes-extended/libvirt/libvirt-1.3.5/Makefiles-Add-more-XDR_CFLAGS-as-needed.patch62
-rw-r--r--recipes-extended/libvirt/libvirt-python.inc4
-rw-r--r--recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch40
-rw-r--r--recipes-extended/libvirt/libvirt/0001-ptest-add-missing-test_helper-files.patch29
-rw-r--r--recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch (renamed from recipes-extended/libvirt/libvirt-1.3.5/0001-to-fix-build-error.patch)27
-rw-r--r--recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch70
-rw-r--r--recipes-extended/libvirt/libvirt/configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch (renamed from recipes-extended/libvirt/libvirt-1.3.5/configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch)10
-rw-r--r--recipes-extended/libvirt/libvirt/install-missing-file.patch35
-rw-r--r--recipes-extended/libvirt/libvirt/libvirt-use-pkg-config-to-locate-libcap.patch48
-rw-r--r--recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch26
-rw-r--r--recipes-extended/libvirt/libvirt/runptest.patch100
-rw-r--r--recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch57
-rw-r--r--recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch34
-rw-r--r--recipes-extended/libvirt/libvirt_4.3.0.bb (renamed from recipes-extended/libvirt/libvirt_1.3.5.bb)29
16 files changed, 170 insertions, 537 deletions
diff --git a/recipes-extended/libvirt/libvirt-1.3.5/0001-Added-configure-variable-for-placing-systemd-untis-l.patch b/recipes-extended/libvirt/libvirt-1.3.5/0001-Added-configure-variable-for-placing-systemd-untis-l.patch
deleted file mode 100644
index a64739c3..00000000
--- a/recipes-extended/libvirt/libvirt-1.3.5/0001-Added-configure-variable-for-placing-systemd-untis-l.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 531178d7fbb5d4b3404766cfd0fc999398cccd58 Mon Sep 17 00:00:00 2001
2From: Amarnath Valluri <amarnath.valluri@intel.com>
3Date: Wed, 8 Feb 2017 18:39:48 +0200
4Subject: [PATCH] Added configure variable for placing systemd untis location
5
6Upstream-Status: Pending
7
8Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
9---
10 configure.ac | 3 +++
11 daemon/Makefile.am | 1 -
12 tools/Makefile.am | 1 -
13 3 files changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 0e5b8e3..5a6408c 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -2687,6 +2687,9 @@ AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash]
20 AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash])
21 AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack to avoid symbol clash])
22
23+AC_ARG_VAR(SYSTEMD_UNIT_DIR, 'location for systemd units, defautls to /lib/systemd/system')
24+AS_IF([test "x$SYSTEMD_UNIT_DIR" = "x"], [SYSTEMD_UNIT_DIR="/lib/systemd/system"])
25+
26 AC_CONFIG_FILES([run],
27 [chmod +x,-w run])
28 AC_CONFIG_FILES([\
29diff --git a/daemon/Makefile.am b/daemon/Makefile.am
30index edb75e8..2ab42a6 100644
31--- a/daemon/Makefile.am
32+++ b/daemon/Makefile.am
33@@ -449,7 +449,6 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
34
35 if LIBVIRT_INIT_SCRIPT_SYSTEMD
36
37-SYSTEMD_UNIT_DIR = /lib/systemd/system
38 BUILT_SOURCES += libvirtd.service
39
40 install-init-systemd: install-sysconfig libvirtd.service
41diff --git a/tools/Makefile.am b/tools/Makefile.am
42index 27ecbf1..8cefe1a 100644
43--- a/tools/Makefile.am
44+++ b/tools/Makefile.am
45@@ -380,7 +380,6 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
46
47
48 EXTRA_DIST += libvirt-guests.service.in
49-SYSTEMD_UNIT_DIR = /lib/systemd/system
50
51 if LIBVIRT_INIT_SCRIPT_SYSTEMD
52 install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
53--
542.7.4
55
diff --git a/recipes-extended/libvirt/libvirt-1.3.5/0001-qemu-Let-empty-default-VNC-password-work-as-document.patch b/recipes-extended/libvirt/libvirt-1.3.5/0001-qemu-Let-empty-default-VNC-password-work-as-document.patch
deleted file mode 100644
index 1d13dd36..00000000
--- a/recipes-extended/libvirt/libvirt-1.3.5/0001-qemu-Let-empty-default-VNC-password-work-as-document.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1Upstream-Status: Backport
2
3Backport patch to fix CVE-2016-5008 from:
4
5https://libvirt.org/git/?p=libvirt.git;a=commit;h=f32441c69bf450d6ac593c3acd621c37e120cdaf
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8---
9From f32441c69bf450d6ac593c3acd621c37e120cdaf Mon Sep 17 00:00:00 2001
10From: Jiri Denemark <jdenemar@redhat.com>
11Date: Tue, 28 Jun 2016 14:39:58 +0200
12Subject: [PATCH] qemu: Let empty default VNC password work as documented
13
14CVE-2016-5008
15
16Setting an empty graphics password is documented as a way to disable
17VNC/SPICE access, but QEMU does not always behaves like that. VNC would
18happily accept the empty password. Let's enforce the behavior by setting
19password expiration to "now".
20
21https://bugzilla.redhat.com/show_bug.cgi?id=1180092
22
23Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
24(cherry picked from commit bb848feec0f3f10e92dd8e5231ae7aa89b5598f3)
25---
26 src/qemu/qemu_hotplug.c | 14 +++++++-------
27 1 file changed, 7 insertions(+), 7 deletions(-)
28
29diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
30index 5f12d77..fda28b0 100644
31--- a/src/qemu/qemu_hotplug.c
32+++ b/src/qemu/qemu_hotplug.c
33@@ -3547,6 +3547,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
34 time_t now = time(NULL);
35 char expire_time [64];
36 const char *connected = NULL;
37+ const char *password;
38 int ret = -1;
39 virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
40
41@@ -3554,16 +3555,14 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
42 ret = 0;
43 goto cleanup;
44 }
45+ password = auth->passwd ? auth->passwd : defaultPasswd;
46
47 if (auth->connected)
48 connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected);
49
50 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
51 goto cleanup;
52- ret = qemuMonitorSetPassword(priv->mon,
53- type,
54- auth->passwd ? auth->passwd : defaultPasswd,
55- connected);
56+ ret = qemuMonitorSetPassword(priv->mon, type, password, connected);
57
58 if (ret == -2) {
59 if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
60@@ -3571,14 +3570,15 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
61 _("Graphics password only supported for VNC"));
62 ret = -1;
63 } else {
64- ret = qemuMonitorSetVNCPassword(priv->mon,
65- auth->passwd ? auth->passwd : defaultPasswd);
66+ ret = qemuMonitorSetVNCPassword(priv->mon, password);
67 }
68 }
69 if (ret != 0)
70 goto end_job;
71
72- if (auth->expires) {
73+ if (password[0] == '\0') {
74+ snprintf(expire_time, sizeof(expire_time), "now");
75+ } else if (auth->expires) {
76 time_t lifetime = auth->validTo - now;
77 if (lifetime <= 0)
78 snprintf(expire_time, sizeof(expire_time), "now");
79--
802.9.0
81
diff --git a/recipes-extended/libvirt/libvirt-1.3.5/Makefiles-Add-more-XDR_CFLAGS-as-needed.patch b/recipes-extended/libvirt/libvirt-1.3.5/Makefiles-Add-more-XDR_CFLAGS-as-needed.patch
deleted file mode 100644
index 826cdd0a..00000000
--- a/recipes-extended/libvirt/libvirt-1.3.5/Makefiles-Add-more-XDR_CFLAGS-as-needed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From dcfc263db9e69e5381cb511c51836271dec577a3 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Thu, 10 May 2018 13:27:47 -0400
4Subject: [PATCH] Makefiles: Add more $XDR_CFLAGS as needed
5
6When building with libtirpc instead of libc-xdr the include search
7path needs to be used. In several places this was missing and it was
8only looking in /usr/include and failing.
9
10Upstream-Status: Inappropriate [old release]
11
12Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
13---
14 src/Makefile.am | 5 +++--
15 tests/Makefile.am | 1 +
16 2 files changed, 4 insertions(+), 2 deletions(-)
17
18diff --git a/src/Makefile.am b/src/Makefile.am
19index e9ce941..38114b7 100644
20--- a/src/Makefile.am
21+++ b/src/Makefile.am
22@@ -1157,7 +1157,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver.la
23 libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
24
25 libvirt_driver_la_CFLAGS = \
26- $(GNUTLS_CFLAGS) $(CURL_CFLAGS) \
27+ $(GNUTLS_CFLAGS) $(CURL_CFLAGS) $(XDR_CFLAGS) \
28 -I$(srcdir)/conf $(AM_CFLAGS)
29 libvirt_driver_la_LIBADD = \
30 $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS)
31@@ -1348,6 +1348,7 @@ endif ! WITH_DRIVER_MODULES
32
33 libvirt_driver_qemu_impl_la_CFLAGS = \
34 $(GNUTLS_CFLAGS) \
35+ $(XDR_CFLAGS) \
36 $(LIBNL_CFLAGS) \
37 -I$(srcdir)/access \
38 -I$(srcdir)/conf \
39@@ -2306,7 +2307,7 @@ libvirt_lxc_la_LDFLAGS = \
40 $(CYGWIN_EXTRA_LDFLAGS) \
41 $(MINGW_EXTRA_LDFLAGS) \
42 $(NULL)
43-libvirt_lxc_la_CFLAGS = $(AM_CFLAGS)
44+libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) $(XDR_CFLAGS)
45 libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
46
47 # Since virt-login-shell will be setuid, we must do everything
48diff --git a/tests/Makefile.am b/tests/Makefile.am
49index 2f8b9eb..aec9a3e 100644
50--- a/tests/Makefile.am
51+++ b/tests/Makefile.am
52@@ -48,6 +48,7 @@ AM_CFLAGS = \
53 $(APPARMOR_CFLAGS) \
54 $(YAJL_CFLAGS) \
55 $(COVERAGE_CFLAGS) \
56+ $(XDR_CFLAGS) \
57 $(WARN_CFLAGS)
58
59 AM_LDFLAGS = \
60--
612.7.4
62
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 15aa8044..79beb95a 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -18,8 +18,8 @@ FILES_${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
18SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python" 18SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"
19SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}" 19SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
20 20
21SRC_URI[libvirt_python.md5sum] = "4dbd7ef9ee9c4dea5887b5b31eb04529" 21SRC_URI[libvirt_python.md5sum] = "2ea5f1871358e6a5788b52c2e1a0b809"
22SRC_URI[libvirt_python.sha256sum] = "a0508a57637fd18a3584fb9d2322fb172f65708c9db16e0438a70eb0f36fa5c2" 22SRC_URI[libvirt_python.sha256sum] = "efe384479a0bf74b1b83bba208887b263cc0061fd4f87759cf3067a403618ea9"
23 23
24export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml" 24export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
25export LIBVIRT_CFLAGS = "-I${S}/include" 25export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git a/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch b/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch
deleted file mode 100644
index 6ab1c4e5..00000000
--- a/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Upstream-Status: Submitted [http://www.redhat.com/archives/libvir-list/2016-August/msg00389.html]
2
3When build for architecture that don't use gcc atomic ops but pthread,
4it fails to build for arm:
5
6| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virClassNew':
7| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:153: undefined reference to `virAtomicLock'
8| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectNew':
9| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:205: undefined reference to `virAtomicLock'
10| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectUnref':
11| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:277: undefined reference to `virAtomicLock'
12| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectRef':
13| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:298: undefined reference to `virAtomicLock'
14| collect2: error: ld returned 1 exit status
15
16It is similar with:
17
18http://libvirt.org/git/?p=libvirt.git;a=commit;h=12dc729
19
20Signed-off-by: Kai Kang <kai.kang@windriver.com>
21---
22 src/Makefile.am | 2 ++
23 1 file changed, 2 insertions(+)
24
25diff --git a/src/Makefile.am b/src/Makefile.am
26index 12b66c2..6e55972 100644
27--- a/src/Makefile.am
28+++ b/src/Makefile.am
29@@ -2989,6 +2989,8 @@ noinst_LTLIBRARIES += libvirt-nss.la
30 libvirt_nss_la_SOURCES = \
31 util/viralloc.c \
32 util/viralloc.h \
33+ util/viratomic.c \
34+ util/viratomic.h \
35 util/virbitmap.c \
36 util/virbitmap.h \
37 util/virbuffer.c \
38--
392.9.0
40
diff --git a/recipes-extended/libvirt/libvirt/0001-ptest-add-missing-test_helper-files.patch b/recipes-extended/libvirt/libvirt/0001-ptest-add-missing-test_helper-files.patch
deleted file mode 100644
index b4f1e273..00000000
--- a/recipes-extended/libvirt/libvirt/0001-ptest-add-missing-test_helper-files.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From e625a42caca492fe7d52b70bbbf83ae4d99cb15e Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com>
3Date: Tue, 23 Aug 2016 02:16:20 -0400
4Subject: [PATCH] ptest: add missing test_helper files
5
6Signed-off-by: He Zhe <zhe.he@windriver.com>
7---
8 tests/Makefile.am | 4 +++-
9 1 file changed, 3 insertions(+), 1 deletion(-)
10
11diff --git a/tests/Makefile.am b/tests/Makefile.am
12index 1c85656..2f8b9eb 100644
13--- a/tests/Makefile.am
14+++ b/tests/Makefile.am
15@@ -1422,8 +1422,10 @@ install-ptest:
16 @(for file in $(PTESTS); do \
17 if [ -f .libs/$$file ]; then \
18 install .libs/$$file $(DEST_DIR)/tests; \
19- else \
20+ elif [ -f $(srcdir)/$$file ]; then \
21 install $(srcdir)/$$file $(DEST_DIR)/tests; \
22+ else \
23+ install $(builddir)/$$file $(DEST_DIR)/tests; \
24 fi; \
25 done;)
26 @(if [ -d .libs ]; then install .libs/*.so $(DEST_DIR)/tests/.libs; fi;)
27--
282.8.1
29
diff --git a/recipes-extended/libvirt/libvirt-1.3.5/0001-to-fix-build-error.patch b/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
index 089ee330..c920139e 100644
--- a/recipes-extended/libvirt/libvirt-1.3.5/0001-to-fix-build-error.patch
+++ b/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
@@ -15,16 +15,18 @@ The error likes as following
15Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> 15Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
16[ywei: rebased to libvirt-1.3.2] 16[ywei: rebased to libvirt-1.3.2]
17Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com> 17Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
18[MA: rebase to v4.3.0]
19Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
18--- 20---
19 docs/Makefile.am | 4 ++-- 21 docs/Makefile.am | 5 ++---
20 1 file changed, 2 insertions(+), 2 deletions(-) 22 1 file changed, 2 insertions(+), 3 deletions(-)
21 23
22diff --git a/docs/Makefile.am b/docs/Makefile.am 24diff --git a/docs/Makefile.am b/docs/Makefile.am
23index 1b4353b..c199551 100644 25index 9620587..060a82b 100644
24--- a/docs/Makefile.am 26--- a/docs/Makefile.am
25+++ b/docs/Makefile.am 27+++ b/docs/Makefile.am
26@@ -164,7 +164,7 @@ EXTRA_DIST= \ 28@@ -183,7 +183,7 @@ EXTRA_DIST= \
27 todo.pl hvsupport.pl todo.cfg-example \ 29 hvsupport.pl \
28 $(schema_DATA) 30 $(schema_DATA)
29 31
30-acl_generated = aclperms.htmlinc 32-acl_generated = aclperms.htmlinc
@@ -32,15 +34,16 @@ index 1b4353b..c199551 100644
32 34
33 $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ 35 $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
34 $(srcdir)/genaclperms.pl Makefile.am 36 $(srcdir)/genaclperms.pl Makefile.am
35@@ -221,7 +221,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ 37@@ -247,8 +247,7 @@ MAINTAINERCLEANFILES += \
38 %.png: %.fig
36 convert -rotate 90 $< $@ 39 convert -rotate 90 $< $@
37 40
38 %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ 41-%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
39- sitemap.html.in $(acl_generated) 42- $(acl_generated)
40+ sitemap.html.in 43+%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl
41 @if [ -x $(XSLTPROC) ] ; then \ 44 $(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \
42 echo "Generating $@"; \ 45 dir=`dirname $@` ; \
43 name=`echo $@ | sed -e 's/.tmp//'`; \ 46 if test "$$dir" = "."; \
44-- 47--
451.9.1 481.9.1
46 49
diff --git a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
deleted file mode 100644
index 02ddf68e..00000000
--- a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Update context for version 1.3.5.
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6---
7From dd915e7f70e676aea93f750c75d16ce646e71e4b Mon Sep 17 00:00:00 2001
8From: Mark Asselstine <mark.asselstine@windriver.com>
9Date: Wed, 9 Sep 2015 11:52:44 -0400
10Subject: [PATCH] Revert "build: add $(prefix) to SYSTEMD_UNIT_DIR"
11
12This reverts upstream commit 00e9d6071b2450659ce01bc984f64ecb5d7ba62d
13with minor context changes to allow it to apply.
14
15Yocto based builds use /lib/systemd/system for systemd unit files and
16since upstream has chosen to use a mechanism for setting
17SYSTEMD_UNIT_DIR which is not flexible we have to resort to reverting
18this upstream commit to avoid having ${prefix} added to the path.
19
20Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
21[ywei: rebased to libvirt-1.3.2]
22Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
23---
24 daemon/Makefile.am | 2 +-
25 src/Makefile.am | 2 +-
26 tools/Makefile.am | 2 +-
27 3 files changed, 3 insertions(+), 3 deletions(-)
28
29diff --git a/daemon/Makefile.am b/daemon/Makefile.am
30index 2dbe81b..41ea2db 100644
31--- a/daemon/Makefile.am
32+++ b/daemon/Makefile.am
33@@ -449,7 +449,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
34
35 if LIBVIRT_INIT_SCRIPT_SYSTEMD
36
37-SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
38+SYSTEMD_UNIT_DIR = /lib/systemd/system
39 BUILT_SOURCES += libvirtd.service
40
41 install-init-systemd: install-sysconfig libvirtd.service
42diff --git a/src/Makefile.am b/src/Makefile.am
43index a316b4d..d271291 100644
44--- a/src/Makefile.am
45+++ b/src/Makefile.am
46@@ -2633,7 +2633,7 @@ EXTRA_DIST += \
47 if WITH_LIBVIRTD
48 if LIBVIRT_INIT_SCRIPT_SYSTEMD
49
50-SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
51+SYSTEMD_UNIT_DIR = /lib/systemd/system
52
53 BUILT_SOURCES += virtlockd.service virtlockd.socket \
54 virtlogd.service virtlogd.socket
55diff --git a/tools/Makefile.am b/tools/Makefile.am
56index b3227a7..0e58f73 100644
57--- a/tools/Makefile.am
58+++ b/tools/Makefile.am
59@@ -380,7 +380,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
60
61
62 EXTRA_DIST += libvirt-guests.service.in
63-SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
64+SYSTEMD_UNIT_DIR = /lib/systemd/system
65
66 if LIBVIRT_INIT_SCRIPT_SYSTEMD
67 install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
68--
691.9.1
70
diff --git a/recipes-extended/libvirt/libvirt-1.3.5/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 edbadb63..0a9d5f48 100644
--- a/recipes-extended/libvirt/libvirt-1.3.5/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
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [old release]
11 11
12Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> 12Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
13--- 13---
14 configure.ac | 4 ++-- 14 m4/virt-xdr.m4 | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/configure.ac b/configure.ac 17diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4
18index 5a6408c..6c19f6d 100644 18index 5a6408c..6c19f6d 100644
19--- a/configure.ac 19--- a/m4/virt-xdr.m4
20+++ b/configure.ac 20+++ b/m4/virt-xdr.m4
21@@ -705,10 +705,10 @@ if test x"$with_remote" = x"yes" || test x"$with_libvirtd" = x"yes"; then 21@@ -33,10 +33,10 @@ if test x"$with_remote" = x"yes" || test x"$with_libvirtd" = x"yes"; then
22 dnl check for cygwin's variation in xdr function names 22 dnl check for cygwin's variation in xdr function names
23 AC_CHECK_FUNCS([xdr_u_int64_t],[],[],[#include <rpc/xdr.h>]) 23 AC_CHECK_FUNCS([xdr_u_int64_t],[],[],[#include <rpc/xdr.h>])
24 24
diff --git a/recipes-extended/libvirt/libvirt/install-missing-file.patch b/recipes-extended/libvirt/libvirt/install-missing-file.patch
index ecd4a87b..cb5a20e3 100644
--- a/recipes-extended/libvirt/libvirt/install-missing-file.patch
+++ b/recipes-extended/libvirt/libvirt/install-missing-file.patch
@@ -1,11 +1,3 @@
1Upstream-Status: Inapproriate
2
3This patch is for ptest, so it is inapproriate to send to upstream.
4
5Update context for 1.3.5.
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8---
9From 0780181a3285511f166487a54ebc231fc657edfe Mon Sep 17 00:00:00 2001 1From 0780181a3285511f166487a54ebc231fc657edfe Mon Sep 17 00:00:00 2001
10From: Catalin Enache <catalin.enache@windriver.com> 2From: Catalin Enache <catalin.enache@windriver.com>
11Date: Mon, 25 Jul 2016 16:38:51 +0300 3Date: Mon, 25 Jul 2016 16:38:51 +0300
@@ -13,24 +5,30 @@ Subject: [PATCH] Install missing conf file
13 5
14openvzutilstest.conf file is needed by openvzutilstest test. 6openvzutilstest.conf file is needed by openvzutilstest test.
15 7
8Upstream-Status: Inapproriate
9
16Signed-off-by: Catalin Enache <catalin.enache@windriver.com> 10Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
11[KK: Update context for 1.3.5.]
12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13[MA: Update context for v4.3.0]
14Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
17--- 15---
18 tests/Makefile.am | 4 +++- 16 tests/Makefile.am | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-) 17 1 file changed, 3 insertions(+), 1 deletion(-)
20 18
21diff --git a/tests/Makefile.am b/tests/Makefile.am 19diff --git a/tests/Makefile.am b/tests/Makefile.am
22index 02e0dd8..187fbca 100644 20index 65f776e..8a6fd44 100644
23--- a/tests/Makefile.am 21--- a/tests/Makefile.am
24+++ b/tests/Makefile.am 22+++ b/tests/Makefile.am
25@@ -170,6 +170,7 @@ EXTRA_DIST = \ 23@@ -173,6 +173,7 @@ EXTRA_DIST = \
26 xml2vmxdata 24 $(NULL)
27 25
28 test_helpers = commandhelper ssh virconftest 26 test_helpers = commandhelper ssh
29+test_misc = 27+test_misc =
30 test_programs = virshtest sockettest \ 28 test_programs = virshtest sockettest \
31 nodeinfotest virbuftest \ 29 virhostcputest virbuftest \
32 commandtest seclabeltest \ 30 commandtest seclabeltest \
33@@ -259,6 +260,7 @@ endif WITH_LXC 31@@ -305,6 +306,7 @@ endif WITH_LXC
34 32
35 if WITH_OPENVZ 33 if WITH_OPENVZ
36 test_programs += openvzutilstest 34 test_programs += openvzutilstest
@@ -38,15 +36,16 @@ index 02e0dd8..187fbca 100644
38 endif WITH_OPENVZ 36 endif WITH_OPENVZ
39 37
40 if WITH_ESX 38 if WITH_ESX
41@@ -1293,7 +1295,7 @@ endif ! WITH_CIL 39@@ -1488,7 +1490,7 @@ endif ! WITH_CIL
42 40
43 buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers) 41 buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers)
44 42
45-PTESTS = $(TESTS) $(test_helpers) test-lib.sh schematestutils.sh 43-PTESTS = $(TESTS) $(test_helpers) test-lib.sh virschematest
46+PTESTS = $(TESTS) $(test_helpers) $(test_misc) test-lib.sh schematestutils.sh 44+PTESTS = $(TESTS) $(test_helpers) $(test_misc) test-lib.sh virschematest
47 45
48 install-ptest: 46 install-ptest:
49 list='$(TESTS) $(test_helpers) test-lib.sh schematestutils.sh' 47 list='$(TESTS) $(test_helpers) test-lib.sh virschematest'
48
50-- 49--
512.7.4 502.7.4
52 51
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 65b046ee..635d1e81 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
@@ -12,34 +12,34 @@ To fix this issue, we patch configure to use 'pkg-config libcap' to
12locate the correct libraries. 12locate the correct libraries.
13 13
14Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> 14Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
15[MA: Update to apply agains v4.3.0]
16Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
15--- 17---
16 configure.ac | 6 +++--- 18 m4/virt-libpcap.m4 | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-) 19 1 file changed, 3 insertions(+), 3 deletions(-)
18 20
19diff --git a/configure.ac b/configure.ac 21diff --git a/m4/virt-libpcap.m4 b/m4/virt-libpcap.m4
20index f37047599b76..5f9b84363b96 100644 22index 8fa4889..08b2f53 100644
21--- a/configure.ac 23--- a/m4/virt-libpcap.m4
22+++ b/configure.ac 24+++ b/m4/virt-libpcap.m4
23@@ -1553,7 +1553,7 @@ fi 25@@ -23,14 +23,14 @@ AC_DEFUN([LIBVIRT_ARG_LIBPCAP], [
24 AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" != "no"])
25 26
26 dnl pcap lib 27 AC_DEFUN([LIBVIRT_CHECK_LIBPCAP], [
27-LIBPCAP_CONFIG="pcap-config" 28 LIBPCAP_REQUIRED="1.0.0"
28+LIBPCAP_CONFIG="pkg-config libpcap" 29- LIBPCAP_CONFIG="pcap-config"
29 LIBPCAP_CFLAGS="" 30+ LIBPCAP_CONFIG="pkg-config libpcap"
30 LIBPCAP_LIBS="" 31 LIBPCAP_CFLAGS=""
31 LIBPCAP_FOUND="no" 32 LIBPCAP_LIBS=""
32@@ -1563,8 +1563,8 @@ AC_ARG_WITH([libpcap], [AS_HELP_STRING([--with-libpcap=@<:@PFX@:>@], 33
33 if test "$with_qemu" = "yes"; then 34 if test "x$with_libpcap" != "xno"; then
34 case $with_libpcap in 35 case $with_libpcap in
35 no) LIBPCAP_CONFIG= ;; 36- ''|yes|check) LIBPCAP_CONFIG="pcap-config" ;;
36- ''|yes) LIBPCAP_CONFIG="pcap-config" ;; 37- *) LIBPCAP_CONFIG="$with_libpcap/bin/pcap-config" ;;
37- *) LIBPCAP_CONFIG="$with_libpcap/bin/pcap-config" ;; 38+ ''|yes|check) LIBPCAP_CONFIG="pkg-config libpcap" ;;
38+ ''|yes) LIBPCAP_CONFIG="pkg-config libpcap" ;; 39+ *) LIBPCAP_CONFIG="$with_libpcap/bin/pkg-config libpcap" ;;
39+ *) LIBPCAP_CONFIG="$with_libpcap/bin/pkg-config libpcap" ;; 40 esac
40 esac 41 AS_IF([test "x$LIBPCAP_CONFIG" != "x"], [
41 AS_IF([test "x$LIBPCAP_CONFIG" != "x"], [ 42 AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED )
42 AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED )
43-- 43--
442.1.0 442.1.0
45 45
diff --git a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
index 3c2622c7..30c30e88 100644
--- a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
+++ b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
@@ -13,14 +13,14 @@ Signed-off-by: Martin Kletzander <mkletzan redhat com>
13[ywei: rebased to 1.3.2] 13[ywei: rebased to 1.3.2]
14Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com> 14Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
15--- 15---
16 setup.py | 25 ++++++++++++++++++++++--- 16 setup.py | 35 ++++++++++++++++++++++++-----------
17 1 file changed, 22 insertions(+), 3 deletions(-) 17 1 file changed, 24 insertions(+), 11 deletions(-)
18 18
19Index: libvirt-python-1.2.4/setup.py 19diff --git a/setup.py b/setup.py
20=================================================================== 20index eff9d54..48ec4fe 100755
21--- libvirt-python-1.2.4.orig/setup.py 21--- a/setup.py
22+++ libvirt-python-1.2.4/setup.py 22+++ b/setup.py
23@@ -40,13 +40,7 @@ 23@@ -43,13 +43,7 @@ def check_minimum_libvirt_version():
24 "libvirt"]) 24 "libvirt"])
25 25
26 def have_libvirt_lxc(): 26 def have_libvirt_lxc():
@@ -33,9 +33,9 @@ Index: libvirt-python-1.2.4/setup.py
33- return False 33- return False
34+ return True 34+ return True
35 35
36 def get_pkgconfig_data(args, mod, required=True): 36 def have_libvirtaio():
37 """Run pkg-config to and return content associated with it""" 37 # This depends on asyncio, which in turn depends on "yield from" syntax.
38@@ -68,7 +62,17 @@ 38@@ -77,7 +71,17 @@ def get_api_xml_files():
39 """Check with pkg-config that libvirt is present and extract 39 """Check with pkg-config that libvirt is present and extract
40 the API XML file paths we need from it""" 40 the API XML file paths we need from it"""
41 41
@@ -54,7 +54,7 @@ Index: libvirt-python-1.2.4/setup.py
54 54
55 offset = libvirt_api.index("-api.xml") 55 offset = libvirt_api.index("-api.xml")
56 libvirt_qemu_api = libvirt_api[0:offset] + "-qemu-api.xml" 56 libvirt_qemu_api = libvirt_api[0:offset] + "-qemu-api.xml"
57@@ -88,8 +92,17 @@ 57@@ -97,8 +101,17 @@ def get_module_lists():
58 58
59 c_modules = [] 59 c_modules = []
60 py_modules = [] 60 py_modules = []
@@ -74,7 +74,7 @@ Index: libvirt-python-1.2.4/setup.py
74 74
75 module = Extension('libvirtmod', 75 module = Extension('libvirtmod',
76 sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'], 76 sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],
77@@ -138,7 +151,7 @@ 77@@ -144,7 +157,7 @@ def get_module_lists():
78 class my_build(build): 78 class my_build(build):
79 79
80 def run(self): 80 def run(self):
@@ -83,3 +83,5 @@ Index: libvirt-python-1.2.4/setup.py
83 apis = get_api_xml_files() 83 apis = get_api_xml_files()
84 84
85 self.spawn([sys.executable, "generator.py", "libvirt", apis[0]]) 85 self.spawn([sys.executable, "generator.py", "libvirt", apis[0]])
86--
872.17.0
diff --git a/recipes-extended/libvirt/libvirt/runptest.patch b/recipes-extended/libvirt/libvirt/runptest.patch
index b7609a81..b900c015 100644
--- a/recipes-extended/libvirt/libvirt/runptest.patch
+++ b/recipes-extended/libvirt/libvirt/runptest.patch
@@ -1,20 +1,31 @@
1Update context for 1.3.5. 1From 94478517c4f9950b28be3a348387db6ede3db812 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Mon, 4 Jun 2018 11:55:37 -0400
4Subject: [PATCH] Add 'install-ptest' rule.
2 5
3Signed-off-by: Kai Kang <kai.kang@windriver.com>
4---
5Add 'install-ptest' rule.
6Change TESTS_ENVIRONMENT to allow running outside build dir. 6Change TESTS_ENVIRONMENT to allow running outside build dir.
7 7
8Signed-off-by: Mihaela Sendrea <mihaela.sendrea@enea.com>
9Upstream-status: Pending 8Upstream-status: Pending
9Signed-off-by: Mihaela Sendrea <mihaela.sendrea@enea.com>
10[KK: Update context for 1.3.5.]
11Signed-off-by: Kai Kang <kai.kang@windriver.com>
12[MA: Allow separate source and build dirs]
13Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
14[ZH: add missing test_helper files]
15Signed-off-by: He Zhe <zhe.he@windriver.com>
16[MA: Update context for v4.3.0]
17Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
10--- 18---
19 tests/Makefile.am | 74 +++++++++++++++++++++++++++++++++++++++++++++----------
20 1 file changed, 61 insertions(+), 13 deletions(-)
21
11diff --git a/tests/Makefile.am b/tests/Makefile.am 22diff --git a/tests/Makefile.am b/tests/Makefile.am
12index 0c4ad3c..bb4e31a 100644 23index 7b93fbd..edc1eb9 100644
13--- a/tests/Makefile.am 24--- a/tests/Makefile.am
14+++ b/tests/Makefile.am 25+++ b/tests/Makefile.am
15@@ -33,11 +33,13 @@ INCLUDES = \ 26@@ -35,11 +35,13 @@ INCLUDES = \
16 -I$(top_srcdir)/src/conf \ 27
17 $(GETTEXT_CPPFLAGS) 28 WARN_CFLAGS += $(RELAXED_FRAME_LIMIT_CFLAGS)
18 29
19+PTEST_DIR ?= $(libdir)/libvirt/ptest 30+PTEST_DIR ?= $(libdir)/libvirt/ptest
20+ 31+
@@ -30,77 +41,81 @@ index 0c4ad3c..bb4e31a 100644
30 $(LIBXML_CFLAGS) \ 41 $(LIBXML_CFLAGS) \
31 $(LIBNL_CFLAGS) \ 42 $(LIBNL_CFLAGS) \
32 $(GNUTLS_CFLAGS) \ 43 $(GNUTLS_CFLAGS) \
33@@ -62,7 +64,7 @@ QEMULIB_LDFLAGS = \ 44@@ -64,7 +66,7 @@ QEMULIB_LDFLAGS = \
45 $(MINGW_EXTRA_LDFLAGS)
34 46
35 if WITH_DRIVER_MODULES
36 INCLUDES += \ 47 INCLUDES += \
37- -DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\" 48- -DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\"
38+ -DTEST_DRIVER_DIR=\"$(PTEST_DIR)/src/.libs\" 49+ -DTEST_DRIVER_DIR=\"$(PTEST_DIR)/src/.libs\"
39 endif WITH_DRIVER_MODULES
40 50
41 PROBES_O = 51 PROBES_O =
42@@ -483,17 +485,15 @@ TESTS = $(test_programs) \ 52 if WITH_DTRACE_PROBES
53@@ -466,17 +468,15 @@ TESTS = $(test_programs) \
43 # Also, BSD sh doesn't like 'a=b b=$$a', so we can't use an 54 # Also, BSD sh doesn't like 'a=b b=$$a', so we can't use an
44 # intermediate shell variable, but must do all the expansion in make 55 # intermediate shell variable, but must do all the expansion in make
45 56
46-lv_abs_top_builddir=$(shell cd '$(top_builddir)' && pwd) 57-lv_abs_top_builddir=$(shell cd '$(top_builddir)' && pwd)
47- 58-
48 VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT) 59 VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT)
49 TESTS_ENVIRONMENT = \ 60 TESTS_ENVIRONMENT = \
50- abs_top_builddir=$(lv_abs_top_builddir) \ 61- abs_top_builddir=$(lv_abs_top_builddir) \
51- abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \ 62- abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \
52- abs_builddir=$(abs_builddir) \ 63- abs_builddir=$(abs_builddir) \
53- abs_srcdir=$(abs_srcdir) \ 64- abs_srcdir=$(abs_srcdir) \
54- CONFIG_HEADER="$(lv_abs_top_builddir)/config.h" \ 65- CONFIG_HEADER="$(lv_abs_top_builddir)/config.h" \
55+ abs_top_builddir="$(PTEST_DIR)" \ 66+ abs_top_builddir="$(PTEST_DIR)" \
56+ abs_top_srcdir="$(PTEST_DIR)" \ 67+ abs_top_srcdir="$(PTEST_DIR)" \
57+ abs_builddir="$(PTEST_DIR)/tests" \ 68+ abs_builddir="$(PTEST_DIR)/tests" \
58+ abs_srcdir="$(PTEST_DIR)/tests" \ 69+ abs_srcdir="$(PTEST_DIR)/tests" \
59+ CONFIG_HEADER="$(PTEST_DIR)/config.h" \ 70+ CONFIG_HEADER="$(PTEST_DIR)/config.h" \
60 SHELL="$(SHELL)" \ 71 SHELL="$(SHELL)" \
61- LIBVIRT_DRIVER_DIR="$(lv_abs_top_builddir)/src/.libs" \ 72- LIBVIRT_DRIVER_DIR="$(lv_abs_top_builddir)/src/.libs" \
62+ LIBVIRT_DRIVER_DIR="$(PTEST_DIR)/src/.libs" \ 73+ LIBVIRT_DRIVER_DIR="$(PTEST_DIR)/src/.libs" \
63 LIBVIRT_AUTOSTART=0 \ 74 LIBVIRT_AUTOSTART=0 \
64 LC_ALL=C \ 75 LC_ALL=C \
65 VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \ 76 VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \
66@@ -1388,5 +1388,51 @@ else ! WITH_CIL 77@@ -1486,5 +1486,55 @@ else ! WITH_CIL
67 EXTRA_DIST += objectlocking.ml 78 EXTRA_DIST += objectlocking.ml
68 endif ! WITH_CIL 79 endif ! WITH_CIL
69 80
70+buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers) 81+buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers)
71+ 82+
72+PTESTS = $(TESTS) $(test_helpers) test-lib.sh schematestutils.sh 83+PTESTS = $(TESTS) $(test_helpers) test-lib.sh virschematest
73+ 84+
74+install-ptest: 85+install-ptest:
75+ list='$(TESTS) $(test_helpers) test-lib.sh schematestutils.sh' 86+ list='$(TESTS) $(test_helpers) test-lib.sh virschematest'
76+ install -d $(DEST_DIR)/tools 87+ install -d $(DEST_DIR)/tools
77+ @(if [ -d ../tools/.libs ] ; then cd ../tools/.libs; fi; \ 88+ @(if [ -d ../tools/.libs ] ; then cd ../tools/.libs; fi; \
78+ install * $(DEST_DIR)/tools) 89+ install * $(DEST_DIR)/tools)
79+ install -d $(DEST_DIR)/src/network 90+ install -d $(DEST_DIR)/src/network
80+ cp ../src/network/*.xml $(DEST_DIR)/src/network 91+ cp $(top_srcdir)/src/network/*.xml $(DEST_DIR)/src/network
81+ install -d $(DEST_DIR)/src/cpu 92+ install -d $(DEST_DIR)/src/cpu
82+ cp ../src/cpu/*.xml $(DEST_DIR)/src/cpu 93+ cp $(top_srcdir)/src/cpu/*.xml $(DEST_DIR)/src/cpu
83+ install ../src/libvirt_iohelper $(DEST_DIR)/src 94+ install ../src/libvirt_iohelper $(DEST_DIR)/src
84+ install -D ../daemon/libvirtd $(DEST_DIR)/daemon/libvirtd 95+ install -D ../src/libvirtd $(DEST_DIR)/src/libvirtd
85+ install -D ../daemon/libvirtd.conf $(DEST_DIR)/daemon/libvirtd.conf 96+ install -d $(DEST_DIR)/src/remote
86+ @(if [ -d ../daemon/.libs ] ; then cd ../daemon/.libs; fi; \ 97+ install -D $(top_srcdir)/src/remote/libvirtd.conf $(DEST_DIR)/src/remote/libvirtd.conf
87+ install * $(DEST_DIR)/daemon) 98+ install -d $(DEST_DIR)/src/remote/.libs
99+ @(if [ -d ../src/remote/.libs ] ; then cd ../src/remote/.libs; fi; \
100+ install * $(DEST_DIR)/src/remote/.libs)
88+ install -d $(DEST_DIR)/src/.libs 101+ install -d $(DEST_DIR)/src/.libs
89+ @(if [ -d ../src/.libs ] ; then cd ../src/.libs; fi; \ 102+ @(if [ -d ../src/.libs ] ; then cd ../src/.libs; fi; \
90+ install * $(DEST_DIR)/src/.libs) 103+ install * $(DEST_DIR)/src/.libs)
91+ install -d $(DEST_DIR)/docs/schemas 104+ install -d $(DEST_DIR)/docs/schemas
92+ cp ../docs/schemas/*.rng $(DEST_DIR)/docs/schemas 105+ cp $(top_srcdir)/docs/schemas/*.rng $(DEST_DIR)/docs/schemas
93+ cp -r ../build-aux $(DEST_DIR) 106+ cp -r $(top_srcdir)/build-aux $(DEST_DIR)
94+ install -d $(DEST_DIR)/examples/xml 107+ install -d $(DEST_DIR)/examples/xml
95+ cp -r ../examples/xml/test $(DEST_DIR)/examples/xml 108+ cp -r $(top_srcdir)/examples/xml/test $(DEST_DIR)/examples/xml
96+ install -d $(DEST_DIR)/tests/.libs 109+ install -d $(DEST_DIR)/tests/.libs
97+ find . -type d -name "*xml2xml*" -exec cp -r {} $(DEST_DIR)/tests \; 110+ find . -type d -name "*xml2xml*" -exec cp -r {} $(DEST_DIR)/tests \;
98+ find . -type d -name "*data" -exec cp -r {} $(DEST_DIR)/tests \; 111+ find . -type d -name "*data" -exec cp -r {} $(DEST_DIR)/tests \;
99+ @(for file in $(PTESTS); do \ 112+ @(for file in $(PTESTS); do \
100+ if [ -f .libs/$$file ]; then \ 113+ if [ -f .libs/$$file ]; then \
101+ install .libs/$$file $(DEST_DIR)/tests; \ 114+ install .libs/$$file $(DEST_DIR)/tests; \
115+ elif [ -f $(srcdir)/$$file ]; then \
116+ install $(srcdir)/$$file $(DEST_DIR)/tests; \
102+ else \ 117+ else \
103+ install $$file $(DEST_DIR)/tests; \ 118+ install $(builddir)/$$file $(DEST_DIR)/tests; \
104+ fi; \ 119+ fi; \
105+ done;) 120+ done;)
106+ @(if [ -d .libs ]; then install .libs/*.so $(DEST_DIR)/tests/.libs; fi;) 121+ @(if [ -d .libs ]; then install .libs/*.so $(DEST_DIR)/tests/.libs; fi;)
@@ -115,3 +130,6 @@ index 0c4ad3c..bb4e31a 100644
115+ 130+
116 CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \ 131 CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \
117 objectlocking-files.txt 132 objectlocking-files.txt
133--
1342.7.4
135
diff --git a/recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch b/recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch
deleted file mode 100644
index 3964865b..00000000
--- a/recipes-extended/libvirt/libvirt/tests-allow-separated-src-and-build-dirs.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 884b6e3724b75cd92766d5386455983e3557a286 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Fri, 2 May 2014 13:45:05 -0400
4Subject: [PATCH] tests: allow separated src and build dirs
5
6Fixup Makefile.am to search for static files back in srcdir.
7
8Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
9---
10 tests/Makefile.am | 14 +++++++-------
11 1 file changed, 7 insertions(+), 7 deletions(-)
12
13diff --git a/tests/Makefile.am b/tests/Makefile.am
14index 0da514b..b8d7c19 100644
15--- a/tests/Makefile.am
16+++ b/tests/Makefile.am
17@@ -1006,22 +1006,22 @@ install-ptest:
18 @(if [ -d ../tools/.libs ] ; then cd ../tools/.libs; fi; \
19 install * $(DEST_DIR)/tools)
20 install -d $(DEST_DIR)/src/network
21- cp ../src/network/*.xml $(DEST_DIR)/src/network
22+ cp $(top_srcdir)/src/network/*.xml $(DEST_DIR)/src/network
23 install -d $(DEST_DIR)/src/cpu
24- cp ../src/cpu/*.xml $(DEST_DIR)/src/cpu
25+ cp $(top_srcdir)/src/cpu/*.xml $(DEST_DIR)/src/cpu
26 install ../src/libvirt_iohelper $(DEST_DIR)/src
27 install -D ../daemon/libvirtd $(DEST_DIR)/daemon/libvirtd
28- install -D ../daemon/libvirtd.conf $(DEST_DIR)/daemon/libvirtd.conf
29+ install -D $(top_srcdir)/daemon/libvirtd.conf $(DEST_DIR)/daemon/libvirtd.conf
30 @(if [ -d ../daemon/.libs ] ; then cd ../daemon/.libs; fi; \
31 install * $(DEST_DIR)/daemon)
32 install -d $(DEST_DIR)/src/.libs
33 @(if [ -d ../src/.libs ] ; then cd ../src/.libs; fi; \
34 install * $(DEST_DIR)/src/.libs)
35 install -d $(DEST_DIR)/docs/schemas
36- cp ../docs/schemas/*.rng $(DEST_DIR)/docs/schemas
37- cp -r ../build-aux $(DEST_DIR)
38+ cp $(top_srcdir)/docs/schemas/*.rng $(DEST_DIR)/docs/schemas
39+ cp -r $(top_srcdir)/build-aux $(DEST_DIR)
40 install -d $(DEST_DIR)/examples/xml
41- cp -r ../examples/xml/test $(DEST_DIR)/examples/xml
42+ cp -r $(top_srcdir)/examples/xml/test $(DEST_DIR)/examples/xml
43 install -d $(DEST_DIR)/tests/.libs
44 find . -type d -name "*xml2xml*" -exec cp -r {} $(DEST_DIR)/tests \;
45 find . -type d -name "*data" -exec cp -r {} $(DEST_DIR)/tests \;
46@@ -1029,7 +1029,7 @@ install-ptest:
47 if [ -f .libs/$$file ]; then \
48 install .libs/$$file $(DEST_DIR)/tests; \
49 else \
50- install $$file $(DEST_DIR)/tests; \
51+ install $(srcdir)/$$file $(DEST_DIR)/tests; \
52 fi; \
53 done;)
54 @(if [ -d .libs ]; then install .libs/*.so $(DEST_DIR)/tests/.libs; fi;)
55--
561.8.3.2
57
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 a7fc727b..5f6f9502 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 @@
1From a790bfe8fa7b24b68cb6f9a1b7205fda2c6d558e Mon Sep 17 00:00:00 2001 1From f73c5c61c921bf773dcba5e4234e23afce5dbe7f Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com> 2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Fri, 2 Aug 2013 11:38:43 -0400 3Date: Fri, 2 Aug 2013 11:38:43 -0400
4Subject: [PATCH] tools: add libvirt-net-rpc to virt-host-validate when TLS is 4Subject: [PATCH] tools: add libvirt-net-rpc to virt-host-validate when TLS is
@@ -11,18 +11,20 @@ link against libvirt-net-rpc which provides the implementation.
11Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> 11Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
12[ywei: rebased to libvirt-1.3.2] 12[ywei: rebased to libvirt-1.3.2]
13Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com> 13Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
14[MA: rebase to v4.3.0]
15Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
14--- 16---
15 examples/Makefile.am | 19 +++++++++++++++++++ 17 examples/Makefile.am | 19 +++++++++++++++++++
16 tools/Makefile.am | 13 +++++++++++++ 18 tools/Makefile.am | 13 +++++++++++++
17 2 files changed, 32 insertions(+) 19 2 files changed, 32 insertions(+)
18 20
19diff --git a/examples/Makefile.am b/examples/Makefile.am 21diff --git a/examples/Makefile.am b/examples/Makefile.am
20index 2adcefb..fff49d4 100644 22index 7069d74..c8893e3 100644
21--- a/examples/Makefile.am 23--- a/examples/Makefile.am
22+++ b/examples/Makefile.am 24+++ b/examples/Makefile.am
23@@ -39,6 +39,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \ 25@@ -39,6 +39,10 @@ LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \
24 LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \ 26 $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la \
25 $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la 27 $(top_builddir)/src/libvirt-admin.la
26 28
27+if WITH_GNUTLS 29+if WITH_GNUTLS
28+LDADD += $(top_builddir)/src/libvirt-net-rpc.la 30+LDADD += $(top_builddir)/src/libvirt-net-rpc.la
@@ -30,10 +32,10 @@ index 2adcefb..fff49d4 100644
30+ 32+
31 noinst_PROGRAMS=dominfo/info1 dommigrate/dommigrate domsuspend/suspend \ 33 noinst_PROGRAMS=dominfo/info1 dommigrate/dommigrate domsuspend/suspend \
32 domtop/domtop hellolibvirt/hellolibvirt object-events/event-test \ 34 domtop/domtop hellolibvirt/hellolibvirt object-events/event-test \
33 openauth/openauth rename/rename 35 openauth/openauth rename/rename admin/list_servers admin/list_clients \
34@@ -52,6 +56,21 @@ object_events_event_test_SOURCES = object-events/event-test.c 36@@ -70,6 +74,21 @@ admin_logging_SOURCES = admin/logging.c
35 openauth_openauth_SOURCES = openauth/openauth.c 37 INSTALL_DATA_LOCAL =
36 rename_rename_SOURCES = rename/rename.c 38 UNINSTALL_LOCAL =
37 39
38+if WITH_GNUTLS 40+if WITH_GNUTLS
39+dominfo_info1_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \ 41+dominfo_info1_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
@@ -54,11 +56,11 @@ index 2adcefb..fff49d4 100644
54 apparmordir = $(sysconfdir)/apparmor.d/ 56 apparmordir = $(sysconfdir)/apparmor.d/
55 apparmor_DATA = \ 57 apparmor_DATA = \
56diff --git a/tools/Makefile.am b/tools/Makefile.am 58diff --git a/tools/Makefile.am b/tools/Makefile.am
57index 0be3567..b3227a7 100644 59index 1452d98..204e772 100644
58--- a/tools/Makefile.am 60--- a/tools/Makefile.am
59+++ b/tools/Makefile.am 61+++ b/tools/Makefile.am
60@@ -169,6 +169,13 @@ virt_host_validate_LDADD = \ 62@@ -188,6 +188,13 @@ virt_host_validate_LDADD = \
61 ../gnulib/lib/libgnu.la \ 63 ../gnulib/lib/libgnu.la \
62 $(NULL) 64 $(NULL)
63 65
64+if WITH_GNUTLS 66+if WITH_GNUTLS
@@ -69,9 +71,9 @@ index 0be3567..b3227a7 100644
69+ 71+
70+ 72+
71 virt_host_validate_CFLAGS = \ 73 virt_host_validate_CFLAGS = \
72 $(LIBXML_CFLAGS) \ 74 $(AM_CFLAGS) \
73 $(WARN_CFLAGS) \ 75 $(NULL)
74@@ -256,6 +263,12 @@ virt_admin_CFLAGS = \ 76@@ -268,6 +275,12 @@ virt_admin_CFLAGS = \
75 $(READLINE_CFLAGS) 77 $(READLINE_CFLAGS)
76 BUILT_SOURCES = 78 BUILT_SOURCES =
77 79
@@ -85,5 +87,5 @@ index 0be3567..b3227a7 100644
85 virsh_LDADD += virsh_win_icon.$(OBJEXT) 87 virsh_LDADD += virsh_win_icon.$(OBJEXT)
86 88
87-- 89--
881.9.1 902.7.4
89 91
diff --git a/recipes-extended/libvirt/libvirt_1.3.5.bb b/recipes-extended/libvirt/libvirt_4.3.0.bb
index 35fd577e..a9cc0112 100644
--- a/recipes-extended/libvirt/libvirt_1.3.5.bb
+++ b/recipes-extended/libvirt/libvirt_4.3.0.bb
@@ -14,7 +14,7 @@ DEPENDS = "bridge-utils gnutls libxml2 lvm2 avahi parted curl libpcap util-linux
14# 14#
15RDEPENDS_${PN} = "gettext-runtime" 15RDEPENDS_${PN} = "gettext-runtime"
16 16
17RDEPENDS_${PN}-ptest += "make gawk perl" 17RDEPENDS_${PN}-ptest += "make gawk perl bash"
18 18
19RDEPENDS_libvirt-libvirtd += "bridge-utils iptables pm-utils dnsmasq netcat-openbsd" 19RDEPENDS_libvirt-libvirtd += "bridge-utils iptables pm-utils dnsmasq netcat-openbsd"
20RDEPENDS_libvirt-libvirtd_append_x86-64 = " dmidecode" 20RDEPENDS_libvirt-libvirtd_append_x86-64 = " dmidecode"
@@ -23,29 +23,22 @@ RDEPENDS_libvirt-libvirtd_append_x86 = " dmidecode"
23#connman blocks the 53 port and libvirtd can't start its DNS service 23#connman blocks the 53 port and libvirtd can't start its DNS service
24RCONFLICTS_${PN}_libvirtd = "connman" 24RCONFLICTS_${PN}_libvirtd = "connman"
25 25
26SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \ 26SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
27 file://tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch \ 27 file://tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch \
28 file://libvirtd.sh \ 28 file://libvirtd.sh \
29 file://libvirtd.conf \ 29 file://libvirtd.conf \
30 file://dnsmasq.conf \ 30 file://dnsmasq.conf \
31 file://runptest.patch \ 31 file://runptest.patch \
32 file://run-ptest \ 32 file://run-ptest \
33 file://tests-allow-separated-src-and-build-dirs.patch \
34 file://libvirt-use-pkg-config-to-locate-libcap.patch \ 33 file://libvirt-use-pkg-config-to-locate-libcap.patch \
35 file://0001-to-fix-build-error.patch \ 34 file://0001-to-fix-build-error.patch \
36 file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \
37 file://install-missing-file.patch \ 35 file://install-missing-file.patch \
38 file://0001-nsslinktest-also-build-virAtomic.h.patch \
39 file://0001-qemu-Let-empty-default-VNC-password-work-as-document.patch \
40 file://0001-ptest-add-missing-test_helper-files.patch \
41 file://0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch \ 36 file://0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch \
42 file://0001-Added-configure-variable-for-placing-systemd-untis-l.patch \ 37 file://configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch \
43 file://configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch \
44 file://Makefiles-Add-more-XDR_CFLAGS-as-needed.patch \
45 " 38 "
46 39
47SRC_URI[libvirt.md5sum] = "f9dc1e63d559eca50ae0ee798a4c6c6d" 40SRC_URI[libvirt.md5sum] = "946cfa2558401612c4fcbc934ef9077b"
48SRC_URI[libvirt.sha256sum] = "93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8" 41SRC_URI[libvirt.sha256sum] = "a531e22c8b985ecb2d1223b913fd6ec0f1800e3ebe02351924274885db20c2b7"
49 42
50inherit autotools gettext update-rc.d pkgconfig ptest systemd 43inherit autotools gettext update-rc.d pkgconfig ptest systemd
51 44
@@ -119,10 +112,16 @@ FILES_${PN}-libvirtd = " \
119 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \ 112 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
120 " 113 "
121 114
122FILES_${PN}-virsh = "${bindir}/virsh" 115FILES_${PN}-virsh = " \
116 ${bindir}/virsh \
117 ${datadir}/bash-completion/completions/virsh \
118"
119
123FILES_${PN} += "${libdir}/libvirt/connection-driver \ 120FILES_${PN} += "${libdir}/libvirt/connection-driver \
124 ${datadir}/augeas \ 121 ${datadir}/augeas \
125 ${@bb.utils.contains('PACKAGECONFIG', 'polkit', '${datadir}/polkit-1', '', d)} \ 122 ${@bb.utils.contains('PACKAGECONFIG', 'polkit', '${datadir}/polkit-1', '', d)} \
123 ${datadir}/bash-completion/completions/vsh \
124 ${datadir}/bash-completion/completions/virt-admin \
126 " 125 "
127 126
128FILES_${PN}-dbg += "${libdir}/libvirt/connection-driver/.debug ${libdir}/libvirt/lock-driver/.debug" 127FILES_${PN}-dbg += "${libdir}/libvirt/connection-driver/.debug ${libdir}/libvirt/lock-driver/.debug"
@@ -267,6 +266,10 @@ do_install_append() {
267 rm -rf ${D}/${datadir}/polkit-1 266 rm -rf ${D}/${datadir}/polkit-1
268 fi 267 fi
269 268
269 # disable seccomp_sandbox
270 sed -i '/^#seccomp_sandbox = 1/aseccomp_sandbox = 0' \
271 ${D}${sysconfdir}/libvirt/qemu.conf
272
270 # Add hook support for libvirt 273 # Add hook support for libvirt
271 mkdir -p ${D}/etc/libvirt/hooks 274 mkdir -p ${D}/etc/libvirt/hooks
272 275
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-07 13:29:13 +0000