From e00229bb9eb2039edc4723807c16bd78fee4daec Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Tue, 2 May 2017 16:36:50 +0300 Subject: Use qdbd from public repository Since the repository is public, it can from now on be included in all builds, not just internal. Task-number: QTBUG-60435 Change-Id: I3a322ea6999f48271942d826fd1ff8c56ed67b4d Reviewed-by: Samuli Piippo --- classes/internal-build.bbclass | 1 - recipes-qt/b2qt-addons/qdbd.bb | 2 +- recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass index ffd38c1..ecee863 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass @@ -34,7 +34,6 @@ python enable_internal_build () { except: return - e.data.setVar('ENABLE_QDBD', "1") e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") e.data.setVar('PREMIRRORS', "\ diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb index 963d22d..5468db3 100644 --- a/recipes-qt/b2qt-addons/qdbd.bb +++ b/recipes-qt/b2qt-addons/qdbd.bb @@ -35,7 +35,7 @@ LIC_FILES_CHKSUM = "file://qdbd/main.cpp;md5=37093977d3f09e6366def8955c8c71e6;be inherit distro_features_check inherit qmake5 -SRC_URI = "git://codereview.qt-project.org/tqtc-boot2qt/qdb;branch=${BRANCH};protocol=ssh \ +SRC_URI = "git://codereview.qt-project.org/qt-apps/qdb;branch=${BRANCH};protocol=ssh \ file://b2qt-gadget-network.sh \ file://defaults \ file://qdbd.service \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb index 8008c89..1fdbcf3 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb @@ -39,5 +39,5 @@ RDEPENDS_${PN} += " \ b2qt-launcher \ b2qt-demos \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \ - ${@bb.utils.contains("ENABLE_QDBD", "1", "qdbd", "", d)} \ + qdbd \ " -- cgit v1.2.3-54-g00ecf