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/qt5-git.inc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'meta/recipes-qt/qt5/qt5-git.inc') diff --git a/meta/recipes-qt/qt5/qt5-git.inc b/meta/recipes-qt/qt5/qt5-git.inc index beba913547..a17ec24763 100644 --- a/meta/recipes-qt/qt5/qt5-git.inc +++ b/meta/recipes-qt/qt5/qt5-git.inc @@ -1,17 +1,14 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. -# Copyright (C) 2013-2018 Martin Jansa +# Copyright (C) 2013-2014 Martin Jansa QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.10.1" -QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" +QT_MODULE_BRANCH ?= "5.6" # each module needs to define valid SRCREV SRC_URI = " \ - ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \ + ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL} \ " -CVE_PRODUCT = "qt" - S = "${WORKDIR}/git" -PV = "5.10.1+git${SRCPV}" +PV = "5.6.3+git${SRCPV}" -- cgit 1.2.3-korg