diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-05-02 16:36:50 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-05-03 11:50:46 +0000 |
commit | e00229bb9eb2039edc4723807c16bd78fee4daec (patch) | |
tree | 94e9db5c7ce0b9f646420fc294f85d09a6dacddb | |
parent | ec950a3c0f19031bb706e5af1c235d03d17e6720 (diff) | |
download | meta-boot2qt-e00229bb9eb2039edc4723807c16bd78fee4daec.tar.gz |
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 <samuli.piippo@qt.io>
-rw-r--r-- | classes/internal-build.bbclass | 1 | ||||
-rw-r--r-- | recipes-qt/b2qt-addons/qdbd.bb | 2 | ||||
-rw-r--r-- | 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 () { | |||
34 | except: | 34 | except: |
35 | return | 35 | return |
36 | 36 | ||
37 | e.data.setVar('ENABLE_QDBD', "1") | ||
38 | e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") | 37 | e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") |
39 | e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") | 38 | e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") |
40 | e.data.setVar('PREMIRRORS', "\ | 39 | 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 | |||
35 | inherit distro_features_check | 35 | inherit distro_features_check |
36 | inherit qmake5 | 36 | inherit qmake5 |
37 | 37 | ||
38 | SRC_URI = "git://codereview.qt-project.org/tqtc-boot2qt/qdb;branch=${BRANCH};protocol=ssh \ | 38 | SRC_URI = "git://codereview.qt-project.org/qt-apps/qdb;branch=${BRANCH};protocol=ssh \ |
39 | file://b2qt-gadget-network.sh \ | 39 | file://b2qt-gadget-network.sh \ |
40 | file://defaults \ | 40 | file://defaults \ |
41 | file://qdbd.service \ | 41 | 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} += " \ | |||
39 | b2qt-launcher \ | 39 | b2qt-launcher \ |
40 | b2qt-demos \ | 40 | b2qt-demos \ |
41 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \ | 41 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \ |
42 | ${@bb.utils.contains("ENABLE_QDBD", "1", "qdbd", "", d)} \ | 42 | qdbd \ |
43 | " | 43 | " |