diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-extended/libvirt')
10 files changed, 281 insertions, 36 deletions
diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-1.3.5/0001-qemu-Let-empty-default-VNC-password-work-as-document.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-1.3.5/0001-qemu-Let-empty-default-VNC-password-work-as-document.patch new file mode 100644 index 000000000..1d13dd36b --- /dev/null +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-1.3.5/0001-qemu-Let-empty-default-VNC-password-work-as-document.patch @@ -0,0 +1,81 @@ +Upstream-Status: Backport + +Backport patch to fix CVE-2016-5008 from: + +https://libvirt.org/git/?p=libvirt.git;a=commit;h=f32441c69bf450d6ac593c3acd621c37e120cdaf + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +From f32441c69bf450d6ac593c3acd621c37e120cdaf Mon Sep 17 00:00:00 2001 +From: Jiri Denemark <jdenemar@redhat.com> +Date: Tue, 28 Jun 2016 14:39:58 +0200 +Subject: [PATCH] qemu: Let empty default VNC password work as documented + +CVE-2016-5008 + +Setting an empty graphics password is documented as a way to disable +VNC/SPICE access, but QEMU does not always behaves like that. VNC would +happily accept the empty password. Let's enforce the behavior by setting +password expiration to "now". + +https://bugzilla.redhat.com/show_bug.cgi?id=1180092 + +Signed-off-by: Jiri Denemark <jdenemar@redhat.com> +(cherry picked from commit bb848feec0f3f10e92dd8e5231ae7aa89b5598f3) +--- + src/qemu/qemu_hotplug.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c +index 5f12d77..fda28b0 100644 +--- a/src/qemu/qemu_hotplug.c ++++ b/src/qemu/qemu_hotplug.c +@@ -3547,6 +3547,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, + time_t now = time(NULL); + char expire_time [64]; + const char *connected = NULL; ++ const char *password; + int ret = -1; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + +@@ -3554,16 +3555,14 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, + ret = 0; + goto cleanup; + } ++ password = auth->passwd ? auth->passwd : defaultPasswd; + + if (auth->connected) + connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected); + + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + goto cleanup; +- ret = qemuMonitorSetPassword(priv->mon, +- type, +- auth->passwd ? auth->passwd : defaultPasswd, +- connected); ++ ret = qemuMonitorSetPassword(priv->mon, type, password, connected); + + if (ret == -2) { + if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { +@@ -3571,14 +3570,15 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, + _("Graphics password only supported for VNC")); + ret = -1; + } else { +- ret = qemuMonitorSetVNCPassword(priv->mon, +- auth->passwd ? auth->passwd : defaultPasswd); ++ ret = qemuMonitorSetVNCPassword(priv->mon, password); + } + } + if (ret != 0) + goto end_job; + +- if (auth->expires) { ++ if (password[0] == '\0') { ++ snprintf(expire_time, sizeof(expire_time), "now"); ++ } else if (auth->expires) { + time_t lifetime = auth->validTo - now; + if (lifetime <= 0) + snprintf(expire_time, sizeof(expire_time), "now"); +-- +2.9.0 + diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-1.3.5/0001-to-fix-build-error.patch index 089ee330e..089ee330e 100644 --- a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-1.3.5/0001-to-fix-build-error.patch diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-python.inc b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-python.inc index c1dafe9dc..bc2f1de29 100644 --- a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-python.inc +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt-python.inc @@ -18,8 +18,8 @@ FILES_${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python" SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}" -SRC_URI[libvirt_python.md5sum] = "ed018c714d7ddbe93221c796dff283ed" -SRC_URI[libvirt_python.sha256sum] = "6d35ae9e7801573393b9c92471f39e6700d479f10b641df81d041b469f160bf8" +SRC_URI[libvirt_python.md5sum] = "4dbd7ef9ee9c4dea5887b5b31eb04529" +SRC_URI[libvirt_python.sha256sum] = "a0508a57637fd18a3584fb9d2322fb172f65708c9db16e0438a70eb0f36fa5c2" export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml" export LIBVIRT_CFLAGS = "-I${S}/include" @@ -41,14 +41,14 @@ python __anonymous () { do_compile_append() { if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then - cd ${WORKDIR}/libvirt-python-${PV} && \ + cd ${WORKDIR}/${BPN}-python-${PV} && \ ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build fi } do_install_append() { if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then - cd ${WORKDIR}/${PN}-python-${PV} && \ + cd ${WORKDIR}/${BPN}-python-${PV} && \ ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install \ --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${LIBVIRT_INSTALL_ARGS} fi diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch new file mode 100644 index 000000000..6ab1c4e5c --- /dev/null +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch @@ -0,0 +1,40 @@ +Upstream-Status: Submitted [http://www.redhat.com/archives/libvir-list/2016-August/msg00389.html] + +When build for architecture that don't use gcc atomic ops but pthread, +it fails to build for arm: + +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virClassNew': +| /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' +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectNew': +| /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' +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectUnref': +| /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' +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectRef': +| /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' +| collect2: error: ld returned 1 exit status + +It is similar with: + +http://libvirt.org/git/?p=libvirt.git;a=commit;h=12dc729 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 12b66c2..6e55972 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2989,6 +2989,8 @@ noinst_LTLIBRARIES += libvirt-nss.la + libvirt_nss_la_SOURCES = \ + util/viralloc.c \ + util/viralloc.h \ ++ util/viratomic.c \ ++ util/viratomic.h \ + util/virbitmap.c \ + util/virbitmap.h \ + util/virbuffer.c \ +-- +2.9.0 + diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch new file mode 100644 index 000000000..217bdbc5b --- /dev/null +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch @@ -0,0 +1,28 @@ +From ffc71da15c3da068f85d16617b6e0c0175fc0110 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Tue, 23 Aug 2016 02:28:47 -0400 +Subject: [PATCH] ptest: Remove Windows-1252 check from esxutilstest + +Currently we use iconv from glibc-locale and it does not support +Windows-1252 and we don't need support windows character encoding. + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + tests/esxutilstest.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c +index 44bdc84..3223de3 100644 +--- a/tests/esxutilstest.c ++++ b/tests/esxutilstest.c +@@ -258,7 +258,6 @@ mymain(void) + DO_TEST(ParseDatastorePath); + DO_TEST(ConvertDateTimeToCalendarTime); + DO_TEST(EscapeDatastoreItem); +- DO_TEST(ConvertWindows1252ToUTF8); + + return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; + } +-- +2.8.1 + diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-ptest-add-missing-test_helper-files.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-ptest-add-missing-test_helper-files.patch new file mode 100644 index 000000000..b4f1e2730 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/0001-ptest-add-missing-test_helper-files.patch @@ -0,0 +1,29 @@ +From e625a42caca492fe7d52b70bbbf83ae4d99cb15e Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Tue, 23 Aug 2016 02:16:20 -0400 +Subject: [PATCH] ptest: add missing test_helper files + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + tests/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 1c85656..2f8b9eb 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1422,8 +1422,10 @@ install-ptest: + @(for file in $(PTESTS); do \ + if [ -f .libs/$$file ]; then \ + install .libs/$$file $(DEST_DIR)/tests; \ +- else \ ++ elif [ -f $(srcdir)/$$file ]; then \ + install $(srcdir)/$$file $(DEST_DIR)/tests; \ ++ else \ ++ install $(builddir)/$$file $(DEST_DIR)/tests; \ + fi; \ + done;) + @(if [ -d .libs ]; then install .libs/*.so $(DEST_DIR)/tests/.libs; fi;) +-- +2.8.1 + diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch index 16c3a16bc..02ddf68eb 100644 --- a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch @@ -1,3 +1,9 @@ +Upstream-Status: Inappropriate [configuration] + +Update context for version 1.3.5. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- From dd915e7f70e676aea93f750c75d16ce646e71e4b Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> Date: Wed, 9 Sep 2015 11:52:44 -0400 @@ -24,20 +30,20 @@ diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2dbe81b..41ea2db 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am -@@ -445,7 +445,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART +@@ -449,7 +449,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system +SYSTEMD_UNIT_DIR = /lib/systemd/system - BUILT_SOURCES += libvirtd.service libvirtd.socket + BUILT_SOURCES += libvirtd.service - install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket + install-init-systemd: install-sysconfig libvirtd.service diff --git a/src/Makefile.am b/src/Makefile.am index a316b4d..d271291 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -2594,7 +2594,7 @@ EXTRA_DIST += \ +@@ -2633,7 +2633,7 @@ EXTRA_DIST += \ if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD @@ -50,7 +56,7 @@ diff --git a/tools/Makefile.am b/tools/Makefile.am index b3227a7..0e58f73 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am -@@ -356,7 +356,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh +@@ -380,7 +380,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh EXTRA_DIST += libvirt-guests.service.in diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/install-missing-file.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/install-missing-file.patch new file mode 100644 index 000000000..ecd4a87ba --- /dev/null +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/install-missing-file.patch @@ -0,0 +1,52 @@ +Upstream-Status: Inapproriate + +This patch is for ptest, so it is inapproriate to send to upstream. + +Update context for 1.3.5. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +From 0780181a3285511f166487a54ebc231fc657edfe Mon Sep 17 00:00:00 2001 +From: Catalin Enache <catalin.enache@windriver.com> +Date: Mon, 25 Jul 2016 16:38:51 +0300 +Subject: [PATCH] Install missing conf file + +openvzutilstest.conf file is needed by openvzutilstest test. + +Signed-off-by: Catalin Enache <catalin.enache@windriver.com> +--- + tests/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 02e0dd8..187fbca 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -170,6 +170,7 @@ EXTRA_DIST = \ + xml2vmxdata + + test_helpers = commandhelper ssh virconftest ++test_misc = + test_programs = virshtest sockettest \ + nodeinfotest virbuftest \ + commandtest seclabeltest \ +@@ -259,6 +260,7 @@ endif WITH_LXC + + if WITH_OPENVZ + test_programs += openvzutilstest ++test_misc += openvzutilstest.conf + endif WITH_OPENVZ + + if WITH_ESX +@@ -1293,7 +1295,7 @@ endif ! WITH_CIL + + buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers) + +-PTESTS = $(TESTS) $(test_helpers) test-lib.sh schematestutils.sh ++PTESTS = $(TESTS) $(test_helpers) $(test_misc) test-lib.sh schematestutils.sh + + install-ptest: + list='$(TESTS) $(test_helpers) test-lib.sh schematestutils.sh' +-- +2.7.4 + diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch index a33f56950..b7609a81a 100644 --- a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch @@ -1,14 +1,18 @@ +Update context for 1.3.5. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- Add 'install-ptest' rule. Change TESTS_ENVIRONMENT to allow running outside build dir. Signed-off-by: Mihaela Sendrea <mihaela.sendrea@enea.com> Upstream-status: Pending - -Index: libvirt-1.2.4/tests/Makefile.am -=================================================================== ---- libvirt-1.2.4.orig/tests/Makefile.am -+++ libvirt-1.2.4/tests/Makefile.am -@@ -31,9 +31,11 @@ +--- +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 0c4ad3c..bb4e31a 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -33,11 +33,13 @@ INCLUDES = \ -I$(top_srcdir)/src/conf \ $(GETTEXT_CPPFLAGS) @@ -16,13 +20,17 @@ Index: libvirt-1.2.4/tests/Makefile.am + AM_CFLAGS = \ - -Dabs_builddir="\"$(abs_builddir)\"" \ +- -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ - -Dabs_srcdir="\"$(abs_srcdir)\"" \ +- -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ + -Dabs_builddir="\"$(PTEST_DIR)/tests\"" \ ++ -Dabs_topbuilddir="\"$(PTEST_DIR)\"" \ + -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \ ++ -Dabs_topsrcdir="\"$(PTEST_DIR)\"" \ $(LIBXML_CFLAGS) \ - $(LIBNL_CFLAGS) \ + $(LIBNL_CFLAGS) \ $(GNUTLS_CFLAGS) \ -@@ -48,7 +50,7 @@ +@@ -62,7 +64,7 @@ QEMULIB_LDFLAGS = \ if WITH_DRIVER_MODULES INCLUDES += \ @@ -31,15 +39,12 @@ Index: libvirt-1.2.4/tests/Makefile.am endif WITH_DRIVER_MODULES PROBES_O = -@@ -409,20 +411,19 @@ +@@ -483,17 +485,15 @@ TESTS = $(test_programs) \ # Also, BSD sh doesn't like 'a=b b=$$a', so we can't use an # intermediate shell variable, but must do all the expansion in make -lv_abs_top_builddir=$(shell cd '$(top_builddir)' && pwd) - path_add = $(subst :,$(PATH_SEPARATOR),\ -- $(subst !,$(lv_abs_top_builddir)/,!daemon:!tools:!tests)) -+ $(subst !,$(PTEST_DIR)/,!daemon:!tools:!tests)) - +- VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT) TESTS_ENVIRONMENT = \ - abs_top_builddir=$(lv_abs_top_builddir) \ @@ -52,14 +57,13 @@ Index: libvirt-1.2.4/tests/Makefile.am + abs_builddir="$(PTEST_DIR)/tests" \ + abs_srcdir="$(PTEST_DIR)/tests" \ + CONFIG_HEADER="$(PTEST_DIR)/config.h" \ - PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \ SHELL="$(SHELL)" \ - LIBVIRT_DRIVER_DIR="$(lv_abs_top_builddir)/src/.libs" \ + LIBVIRT_DRIVER_DIR="$(PTEST_DIR)/src/.libs" \ LIBVIRT_AUTOSTART=0 \ LC_ALL=C \ VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \ -@@ -1137,5 +1138,51 @@ +@@ -1388,5 +1388,51 @@ else ! WITH_CIL EXTRA_DIST += objectlocking.ml endif ! WITH_CIL diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt_1.3.2.bb b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt_1.3.5.bb index 42066c1fe..fad563233 100644 --- a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt_1.3.2.bb +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt_1.3.5.bb @@ -1,11 +1,10 @@ DESCRIPTION = "A toolkit to interact with the virtualization capabilities of recent versions of Linux." HOMEPAGE = "http://libvirt.org" -LICENSE = "LGPLv2.1+" -LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1" +LICENSE = "LGPLv2.1+ & GPLv2+" +LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LESSER;md5=4b54a1fd55a448865a0b32d41598759d" SECTION = "console/tools" -PR = "r1" DEPENDS = "bridge-utils gnutls libxml2 lvm2 avahi parted curl libpcap util-linux e2fsprogs pm-utils \ iptables dnsmasq readline libtasn1 libxslt-native" @@ -33,10 +32,15 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \ file://libvirt-use-pkg-config-to-locate-libcap.patch \ file://0001-to-fix-build-error.patch \ file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \ + file://install-missing-file.patch \ + file://0001-nsslinktest-also-build-virAtomic.h.patch \ + file://0001-qemu-Let-empty-default-VNC-password-work-as-document.patch \ + file://0001-ptest-add-missing-test_helper-files.patch \ + file://0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch \ " -SRC_URI[libvirt.md5sum] = "b48b06bbc7efbe9973ed0f3f223d6da2" -SRC_URI[libvirt.sha256sum] = "e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05" +SRC_URI[libvirt.md5sum] = "f9dc1e63d559eca50ae0ee798a4c6c6d" +SRC_URI[libvirt.sha256sum] = "93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8" inherit autotools gettext update-rc.d pkgconfig ptest systemd @@ -107,7 +111,7 @@ FILES_${PN}-libvirtd = " \ /usr/lib/sysctl.d/60-libvirtd.conf \ ${sbindir}/libvirtd \ ${systemd_unitdir}/system/* \ - ${@base_contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \ " FILES_${PN}-virsh = "${bindir}/virsh" @@ -136,7 +140,6 @@ INITSCRIPT_PARAMS_${PN}-libvirtd = "defaults 72" SYSTEMD_PACKAGES = "${PN}-libvirtd" SYSTEMD_SERVICE_${PN}-libvirtd = " \ - libvirtd.socket \ libvirtd.service \ virtlockd.service \ libvirt-guests.service \ @@ -167,9 +170,9 @@ PRIVATE_LIBS_${PN}-ptest = " \ # full config PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test \ remote macvtap libvirtd netcf udev python ebtables \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ " # enable,disable,depends,rdepends @@ -248,7 +251,7 @@ do_install_append() { >> ${D}${sysconfdir}/default/volatiles/99_libvirt # Add hook support for libvirt - mkdir -p ${D}/etc/libvirt/hooks + mkdir -p ${D}/etc/libvirt/hooks # remove .la references to our working diretory for i in `find ${D}${libdir} -type f -name *.la`; do @@ -269,8 +272,10 @@ do_compile_ptest() { do_install_ptest() { oe_runmake -C tests install-ptest + find ${S}/tests -maxdepth 1 -type d -exec cp -r {} ${D}${PTEST_PATH}/tests/ \; + # remove .la files for ptest, they aren't required and can trigger QA errors - for i in `find ${D}${PTEST_PATH} -type f -name *.la`; do + for i in `find ${D}${PTEST_PATH} -type f \( -name *.la -o -name *.o \)`; do rm -f $i done } |
