summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorCatalin Enache <catalin.enache@windriver.com>2016-07-27 13:32:36 +0300
committerBruce Ashfield <bruce@zedd.org>2016-07-31 22:54:17 -0400
commit917953761ca32ec871d1b411a03a95ef2e50bda0 (patch)
treee0a08c9a8add18e7f53c1551b0c17a6bc6aae630 /recipes-extended
parent1fd5a596ed72bb187fdcc1ec614e7a3482741f10 (diff)
downloadmeta-virtualization-917953761ca32ec871d1b411a03a95ef2e50bda0.tar.gz
libvirt: add missing configuration file
openvzutilstest.conf file is needed by openvzutilstest test Signed-off-by: Catalin Enache <catalin.enache@windriver.com> Signed-off-by: Bruce Ashfield <bruce@zedd.org>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/libvirt/libvirt/install-missing-file.patch44
-rw-r--r--recipes-extended/libvirt/libvirt_1.3.2.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/recipes-extended/libvirt/libvirt/install-missing-file.patch b/recipes-extended/libvirt/libvirt/install-missing-file.patch
new file mode 100644
index 00000000..f6f6e256
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt/install-missing-file.patch
@@ -0,0 +1,44 @@
1From 0780181a3285511f166487a54ebc231fc657edfe Mon Sep 17 00:00:00 2001
2From: Catalin Enache <catalin.enache@windriver.com>
3Date: Mon, 25 Jul 2016 16:38:51 +0300
4Subject: [PATCH] Install missing conf file
5
6openvzutilstest.conf file is needed by openvzutilstest test.
7
8Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
9---
10 tests/Makefile.am | 4 +++-
11 1 file changed, 3 insertions(+), 1 deletion(-)
12
13diff --git a/tests/Makefile.am b/tests/Makefile.am
14index 02e0dd8..187fbca 100644
15--- a/tests/Makefile.am
16+++ b/tests/Makefile.am
17@@ -155,6 +155,7 @@ EXTRA_DIST = \
18 xml2vmxdata
19
20 test_helpers = commandhelper ssh test_conf
21+test_misc =
22 test_programs = virshtest sockettest \
23 nodeinfotest virbuftest \
24 commandtest seclabeltest \
25@@ -259,6 +260,7 @@ endif WITH_LXC
26
27 if WITH_OPENVZ
28 test_programs += openvzutilstest
29+test_misc += openvzutilstest.conf
30 endif WITH_OPENVZ
31
32 if WITH_ESX
33@@ -1293,7 +1295,7 @@ endif ! WITH_CIL
34
35 buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers)
36
37-PTESTS = $(TESTS) $(test_helpers) test-lib.sh schematestutils.sh
38+PTESTS = $(TESTS) $(test_helpers) $(test_misc) test-lib.sh schematestutils.sh
39
40 install-ptest:
41 list='$(TESTS) $(test_helpers) test-lib.sh schematestutils.sh'
42--
432.7.4
44
diff --git a/recipes-extended/libvirt/libvirt_1.3.2.bb b/recipes-extended/libvirt/libvirt_1.3.2.bb
index be219103..b11f514a 100644
--- a/recipes-extended/libvirt/libvirt_1.3.2.bb
+++ b/recipes-extended/libvirt/libvirt_1.3.2.bb
@@ -33,6 +33,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
33 file://libvirt-use-pkg-config-to-locate-libcap.patch \ 33 file://libvirt-use-pkg-config-to-locate-libcap.patch \
34 file://0001-to-fix-build-error.patch \ 34 file://0001-to-fix-build-error.patch \
35 file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \ 35 file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \
36 file://install-missing-file.patch \
36 " 37 "
37 38
38SRC_URI[libvirt.md5sum] = "b48b06bbc7efbe9973ed0f3f223d6da2" 39SRC_URI[libvirt.md5sum] = "b48b06bbc7efbe9973ed0f3f223d6da2"