From 40f1b73c92731f4e18751d3a499f269c65c21a96 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 27 Apr 2018 13:37:25 +0000 Subject: qt5: downgrade to 5.6 * webosose isn't compatible with newer Qt export COMP=qml-webos-framework; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c compile ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra tmp-glibc/work/qemux86-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done in local.conf I have only this to reproduce the failures: PRSERV_HOST = "localhost:0" BB_NUMBER_THREADS = "8" PARALLEL_MAKE = "-j 32" DISTRO_FEATURES_append = " wayland opengl" ERROR_QA_append = " host-user-contaminated" Signed-off-by: Martin Jansa --- meta/recipes-qt/qt5/qtwebkit-examples_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-qt/qt5/qtwebkit-examples_git.bb') diff --git a/meta/recipes-qt/qt5/qtwebkit-examples_git.bb b/meta/recipes-qt/qt5/qtwebkit-examples_git.bb index 114fab7a7d..65a8196e3f 100644 --- a/meta/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/meta/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -1,7 +1,9 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" +# There are no LGPLv3-only licensed files in this component. +# There are no GPLv2 licensed files in this component. +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ @@ -17,6 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -QT_MODULE_BRANCH = "5.9" - -SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" +SRCREV = "0c623fab420102c54fa533da3b8ca774290d6d13" -- cgit 1.2.3-korg