From 61581ec2efba25904877b5b65257d4de5b75a22f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 6 Apr 2018 12:23:46 +0000 Subject: layer.conf: add LAYERSERIES_COMPAT Signed-off-by: Martin Jansa --- conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/layer.conf') diff --git a/conf/layer.conf b/conf/layer.conf index 7751ce2f..98000c65 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -29,6 +29,8 @@ LAYERVERSION_qt5-layer = "1" LAYERDEPENDS_qt5-layer = "core" +LAYERSERIES_COMPAT_qt5-layer = "sumo" + LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" -- cgit v1.2.3-54-g00ecf From d5f472661eded1aa26b19e1e8d10149cb7ace59f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 2 Mar 2018 12:45:24 +0200 Subject: Change default SRC_URI from github.com to code.qt.io There have been issues in the past with github qt mirror being out of sync with code.qt.io for certain module repos. Right now there's been a several days long break in update cycle for seemingly all the qt modules where content has not been pushed to the github mirror. Change the default SRC_URI to the more reliable code.qt.io. Change-Id: Ic7d3b9a82ef0ae502e99a8516ef78ca09250fd1e Signed-off-by: Mikko Gronoff Reviewed-by: Samuli Piippo Signed-off-by: Martin Jansa --- conf/layer.conf | 4 ++-- recipes-qt/examples/qt5everywheredemo_1.0.bb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'conf/layer.conf') diff --git a/conf/layer.conf b/conf/layer.conf index 98000c65..df696c76 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -35,7 +35,7 @@ LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" -QT_GIT ?= "git://github.com/qt" -QT_LABS_GIT ?= "git://github.com/qt-labs" +QT_GIT_PROJECT ?= "qt" +QT_GIT ?= "git://code.qt.io/${QT_GIT_PROJECT}" QT_GIT_PROTOCOL ?= "git" QT_EDITION ?= "opensource" diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index ee947991..493344f7 100644 --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffc DEPENDS = "qtdeclarative qtgraphicaleffects qtsvg qtmultimedia" SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac" -SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo" +QT_GIT_PROJECT = "qt-labs" +SRC_URI = "${QT_GIT}/qt5-everywhere-demo" S = "${WORKDIR}/git/QtDemo" -- cgit v1.2.3-54-g00ecf