From ee80f15fba2672ec4c3dd05890e14abe224deff6 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 28 Nov 2017 16:28:50 +0100 Subject: qtivi: Update to the latest version and add PACKAGECONFIG options for qtsimulator Change-Id: I39c3e41d5d1ca1ba4466fec4abd6bd49aa19cc10 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtivi_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 3eb48e5..de12d54 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "705acb8d595d772778dd4985b762ed6a604473d9" +SRCREV_qtivi = "da3d3770f1ba310e0879b1767cf436c5bea67da4" SRCREV_qface = "295824c8df7f74af8f3d1f368ec15942e6622f22" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" @@ -63,6 +63,8 @@ PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only" PACKAGECONFIG[ivigenerator] = "QMAKE_EXTRA_ARGS+=-system-ivigenerator" PACKAGECONFIG[ivigenerator-native] = "QMAKE_EXTRA_ARGS+=-qt-ivigenerator,,python3 python3-virtualenv" PACKAGECONFIG[host-tools-only] = "QMAKE_EXTRA_ARGS+=-host-tools-only" +PACKAGECONFIG[simulator] = "QMAKE_EXTRA_ARGS+=-feature-simulator,QMAKE_EXTRA_ARGS+=-no-feature-simulator,qtsimulator" +PACKAGECONFIG[simulator-native] = "QMAKE_EXTRA_ARGS+=-feature-simulator QMAKE_EXTRA_ARGS+=--force-ivigenerator-qtsimulator" PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native" PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}" -- cgit v1.2.3-54-g00ecf From 8c4bb0c7e508ba7cf1268021af8c29ef6c57d9bc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Nov 2017 13:41:14 +0200 Subject: appman: add dependency to nativesdk-qtdeclarative ... and remove += where that does not work as expected. Change-Id: Ib50f61f2609761d927e163c9fe23dac1a98a2ccb Reviewed-by: Robert Griebl --- recipes-qt/automotive/qtapplicationmanager_git.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 5b112b5..47d9eb1 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -60,9 +60,11 @@ FILES_${PN} += "\ BBCLASSEXTEND += "nativesdk" -DEPENDS_class-nativesdk = "qtbase nativesdk-glibc-locale nativesdk-libarchive" -DEPENDS_class-nativesdk_remove_mingw32 += "nativesdk-glibc-locale nativesdk-libarchive" +# nativesdk-qtdeclarative is added only to make build deterministic, can be removed once +# there is a configure option to disable its usage. +DEPENDS_class-nativesdk = "qtbase nativesdk-qtdeclarative nativesdk-glibc-locale nativesdk-libarchive" +DEPENDS_class-nativesdk_remove_mingw32 = "nativesdk-glibc-locale nativesdk-libarchive" -EXTRA_QMAKEVARS_PRE_class-nativesdk += "\ +EXTRA_QMAKEVARS_PRE_class-nativesdk = "\ -config tools-only \ " -- cgit v1.2.3-54-g00ecf From 588579f69161a2e0774486cc685072f1bdcd1397 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 7 Dec 2017 13:57:41 +0200 Subject: poky: update revision Update poky to latest in morty branch, updating version 2.2.2 -> 2.2.3. Task-number: QTBUG-65028 Change-Id: I8c9b5ff73ddd3b3b03b87e34906f36799b6a2b7f Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index fa728d9..d660e54 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,7 +16,7 @@ Date: Mon, 11 Dec 2017 08:36:27 +0200 Subject: meta-qt5: update meta layer Update to first snapshot of 5.9.4 branch Task-number: QTBUG-65028 Change-Id: I89bcbfd6e4f1e6e924d00ba4cca6a9212d53cdaf Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index d660e54..d6582f3 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Fri, 15 Dec 2017 12:57:15 +0200 Subject: qtdeviceutilities: update revision Task-number: QTBUG-65028 Change-Id: I443a1530351191a8dab77a01c40ddc5b6dcbcfe5 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtdeviceutilities.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index c22024d..e671414 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -43,6 +43,6 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \ " -SRCREV = "03b3e6fd62ff9e9a80212a313340e0a0c2f0135f" +SRCREV = "9421f40d1eb977889fb6cd2fc8e554efd41d5453" DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf From 9fd509397d955ab32fa37d85cd42d8ac3d007ad7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 22 Nov 2017 10:05:44 +0200 Subject: internal-build: prepend mirror variables This lets us use other mirrors in addition to the internal ones. Change-Id: I0ef1de6c4eab72dedb9bbce6a3fcadfaa79d3404 Reviewed-by: Mikko Gronoff --- classes/internal-build.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass index 0f12a78..64c07bf 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass @@ -35,8 +35,8 @@ python enable_internal_build () { return e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") - e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH") - e.data.setVar('PREMIRRORS', "\ + e.data.prependVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH") + e.data.prependVar('PREMIRRORS', "\ ftp://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ http://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ https://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ -- cgit v1.2.3-54-g00ecf From d42593edfb649b07f426db6c82972eb1a5615058 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 18 Dec 2017 15:59:51 +0200 Subject: qtivi: enable ivigenerator for toolchain Fix yocto build issues with nativesdk-qtivi and include the ivigenerator to the toolchain. ivigenerator is disabled for mingw build since it is using the prebuild python binaries and doesn't work with virtualenv. Task-number: AUTOSUITE-176 Change-Id: I4765652919649f4aafeb723127b0e75194325f92 Reviewed-by: Dominik Holland --- recipes-qt/automotive/qtivi_git.bb | 5 +++++ .../nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb | 1 + 2 files changed, 6 insertions(+) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index de12d54..f422b15 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -68,6 +68,9 @@ PACKAGECONFIG[simulator-native] = "QMAKE_EXTRA_ARGS+=-feature-simulator QMAKE_EX PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native" PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}" +PACKAGECONFIG_class-nativesdk_mingw32 ??= "host-tools-only" + +ALLOW_EMPTY_${PN}-tools = "1" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS} ${@bb.utils.contains_any('PACKAGECONFIG', 'ivigenerator ivigenerator-native', '', 'QMAKE_EXTRA_ARGS+=-no-ivigenerator', d)}" @@ -90,3 +93,5 @@ do_install_prepend() { BBCLASSEXTEND += "native nativesdk" INSANE_SKIP_${PN}_class-native = "already-stripped" +INSANE_SKIP_${PN}_class-nativesdk = "already-stripped" +INSANE_SKIP_${PN}-tools_class-nativesdk = "staticdev" diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb index acae372..1ba6d97 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb @@ -36,4 +36,5 @@ inherit nativesdk packagegroup qtquickcompiler RDEPENDS_${PN} += "\ nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host \ nativesdk-qtapplicationmanager-tools \ + nativesdk-qtivi-tools \ " -- cgit v1.2.3-54-g00ecf From 486a9f5f06f4a69bc130718b8c28238e37baa0f8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 19 Dec 2017 11:55:23 +0200 Subject: sdk: add qtapplicationmanger staticdev package qtapplicationmanager only provides static libs. Change-Id: Ib06133448a7310961369e7cc9124f390af84836d Reviewed-by: Dominik Holland --- .../packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb index ba99059..6ae1ef4 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb @@ -39,4 +39,5 @@ RDEPENDS_${PN} += " \ qtivi-dev \ libarchive-dev \ qtapplicationmanager-dev \ + qtapplicationmanager-staticdev \ " -- cgit v1.2.3-54-g00ecf From e17fe673b470d692ebd9b70f07ac06cf2f6a79bd Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 18 Dec 2017 19:21:56 +0200 Subject: meta-qt5: update meta layer Updates submodules to the latest Qt 5.9 branch. Change-Id: Ifc76a80af814e031d90db0ea9b655eb4a50e48c9 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index d6582f3..95d4fbb 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Thu, 21 Dec 2017 13:23:57 +0200 Subject: ppp: remove obsolete patch Available via poky (commit 97d7e4ca751e6010da97e7f082dd13230fe3ef10 in morty branch) since latest poky revision update. Change-Id: I30818f49622037fc96d3af144eb94f78caf32494 Reviewed-by: Samuli Piippo --- .../files/ppp-fix-building-with-linux-4.8.patch | 23 ----------------- recipes/ppp/ppp_2.%.bbappend | 30 ---------------------- 2 files changed, 53 deletions(-) delete mode 100644 recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch delete mode 100644 recipes/ppp/ppp_2.%.bbappend diff --git a/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch b/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch deleted file mode 100644 index 17e7975..0000000 --- a/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..96d2794 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -47,6 +47,10 @@ - #include - #endif - -+/* This has to be included before Linux 4.8's linux/in.h -+ * gets dragged in. */ -+#include -+ - /* Ugly header files on some Linux boxes... */ - #if defined(HAVE_LINUX_IF_H) - #include -@@ -84,7 +88,6 @@ typedef unsigned long UINT32_t; - #include - #endif - --#include - - #ifdef HAVE_NETINET_IF_ETHER_H - #include diff --git a/recipes/ppp/ppp_2.%.bbappend b/recipes/ppp/ppp_2.%.bbappend deleted file mode 100644 index d687518..0000000 --- a/recipes/ppp/ppp_2.%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -- cgit v1.2.3-54-g00ecf From 9233e67180028dde787a5a8c1f3bb8f2bed55205 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 21 Dec 2017 13:53:39 +0200 Subject: poky: update revision Update to latest morty branch revision Task-number: QTBUG-65028 Change-Id: Iaba57bfbe523dafba34fadc472df31b0c2568e0e Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 95d4fbb..39015f9 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,7 +16,7 @@ Date: Wed, 3 Jan 2018 14:30:56 +0200 Subject: meta-qt5: update meta layer - Update qt submodules to latest in 5.9.4 branch - Update qtquickcompiler due changes in qtdeclarative Task-number: QTBUG-65028 Change-Id: Ifb8f82d54bb377229e5fd909227ba08386f010af Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 11e103e..22b7e71 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "3eee8b042877c9e03cb4ccf154518d0f9a32335a" +SRCREV = "a93c32346217dd0fa69418c3566f5a712afa1ab9" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 39015f9..497e0dc 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Thu, 11 Jan 2018 09:11:27 +0200 Subject: meta-qt5: update to Qt 5.9.4 snapshot Change-Id: Ie652ed0e313c5559aa14f00088eb935fbb755c8a Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 497e0dc..f3b68c7 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Mon, 15 Jan 2018 21:16:34 +0200 Subject: meta-qt5: update to Qt 5.9.4 RC - Update submodules to 5.9.4 RC - Update QuickCompiler to 5.9.4 release version Task-number: QTBUG-65028 Change-Id: I44091bcaf355a7d6bfcdb7e27c70a31c94b7e778 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 22b7e71..57c2dc4 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "a93c32346217dd0fa69418c3566f5a712afa1ab9" +SRCREV = "124e8692a77c471515f249ddc9229c5f7d8d80ca" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index f3b68c7..21d611c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 17 Jan 2018 12:55:28 +0200 Subject: automotive: update revisions Update to latest revisions. Change-Id: Iedf41066504d7b573773c08ae0eaa80203262f60 Reviewed-by: Dominik Holland --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- recipes-qt/automotive/qtivi_git.bb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index e8d01f2..250cc73 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -41,7 +41,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "2a242aa65f267d010d8c10b8c5da5a1e728d0551" +SRCREV = "644c1e15abebe0e2cc71bfc2f36253c0cb0f4b61" DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager" RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \ diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 47d9eb1..73d8809 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=43a31c6abffdd61c938811959b3c1b71" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "57ff870b0790e1e1feb3421cdfb46dff82878825" +SRCREV = "b956d8ff205eaaf2e8f83446e2023fd491562669" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index f422b15..40cfbf1 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -50,8 +50,8 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "da3d3770f1ba310e0879b1767cf436c5bea67da4" -SRCREV_qface = "295824c8df7f74af8f3d1f368ec15942e6622f22" +SRCREV_qtivi = "30cda3fdc858b0bc53fd018c77f79b80a1d312aa" +SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From d075186a68fc5fb55944e47dc9359064cac131be Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 22 Jan 2018 15:11:40 +0200 Subject: quickcompiler: update to 5.9.4 release revision Change-Id: Iac79b3ecaa5ae653a66cedc7ddd030f0dcd05cbf Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 57c2dc4..677d0d2 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "124e8692a77c471515f249ddc9229c5f7d8d80ca" +SRCREV = "a9196dd301edca8c1198b24154d9e4b5faefb3a3" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From b6695b047a17ed878f94501b7c326322be2f77bf Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 19 Jan 2018 11:10:35 +0200 Subject: multiscreen-demo: update revision and fix startup Update to latest revision. Don't use the provided start.sh script as it's hardcoded for NVIDIA HW. Task-number: AUTOSUITE-182 Change-Id: I1a7498da31ae49bec34426bee3af8517b7333fb4 Reviewed-by: Mikko Gronoff --- .../automotive/multiscreen-demo/automotivedemo.service | 12 ++++++++++++ .../multiscreen-demo/tegra-t18x/automotivedemo.service | 13 +++++++++++++ recipes-qt/automotive/multiscreen-demo_git.bb | 14 ++++++++------ 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 recipes-qt/automotive/multiscreen-demo/automotivedemo.service create mode 100644 recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service diff --git a/recipes-qt/automotive/multiscreen-demo/automotivedemo.service b/recipes-qt/automotive/multiscreen-demo/automotivedemo.service new file mode 100644 index 0000000..af23213 --- /dev/null +++ b/recipes-qt/automotive/multiscreen-demo/automotivedemo.service @@ -0,0 +1,12 @@ +[Unit] +Description=AutomotiveDemo +After=dbus.service dbus-session.service systemd-user-sessions.service +Conflicts=neptune.service + +[Service] +ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml +Restart=on-failure +WorkingDirectory=/opt/automotivedemo + +[Install] +WantedBy=multi-user.target diff --git a/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service b/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service new file mode 100644 index 0000000..1025cc1 --- /dev/null +++ b/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service @@ -0,0 +1,13 @@ +[Unit] +Description=AutomotiveDemo +After=dbus.service dbus-session.service systemd-user-sessions.service +Conflicts=neptune.service + +[Service] +ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml +Restart=on-failure +WorkingDirectory=/opt/automotivedemo +Environment=QT_QPA_EGLFS_KMS_CONFIG=kms_config.json + +[Install] +WantedBy=multi-user.target diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 0c9a2bb..7ce28b0 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -37,13 +37,15 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT = "git://code.qt.io/qt-apps" QT_MODULE_BRANCH = "master" -SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets" +SRC_URI += "\ + git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets \ + file://automotivedemo.service \ + " -SRCREV_multiscreen = "f4cd6b9667b4649b4ef8b4bb645850b05aceebde" +SRCREV_multiscreen-demo = "e7126b85bacab4571da6d8b5ba8517f3bb0abd47" SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" -SRCREV_FORMAT = "multiscreen_assets" -SRCREV = "${SRCREV_multiscreen}" +SRCREV_FORMAT = "multiscreen-demo_assets" DEPENDS = "qtbase qtdeclarative qt3d" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard" @@ -51,10 +53,10 @@ RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard" EXTRA_QMAKEVARS_PRE += "INSTALL_PREFIX=/opt" do_install_append() { - install -m 0755 ${S}/start.sh ${D}/opt/automotivedemo/ + rm ${D}/opt/automotivedemo/start.sh install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/scripts/automotivedemo.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/automotivedemo.service ${D}${systemd_system_unitdir}/ } FILES_${PN} += "\ -- cgit v1.2.3-54-g00ecf From cf3ef66dec3892bfecccbf049bcafea506ba947e Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 23 Jan 2018 11:39:32 +0100 Subject: Update GammaRay revision Change-Id: Ie6cbc79bc2297c32f59af4a0512bb96a31c03e07 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/gammaray_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 1de4c09..6f9d602 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -9,7 +9,7 @@ inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" BRANCH = "5.9" -SRCREV = "ff53d7328d6db17dcb6486bb98b02a2f107b4066" +SRCREV = "6b6edf6fec523ab2c61694e045de5ece272fa4b0" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ -- cgit v1.2.3-54-g00ecf From d98bd0735bbf4969154ed219d2827fd6e34c8c30 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Thu, 25 Jan 2018 08:50:20 +0100 Subject: Fix license checksum due to incremented year number Change-Id: I7933dd63a6dcef23c87719c66e4405c31ac28a27 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/gammaray_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 6f9d602..67dbfb7 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -2,7 +2,7 @@ SUMMARY = "GammaRay Qt introspection probe" HOMEPAGE = "http://www.kdab.com/gammaray" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=560b8b2e529f7a17ee5dde6e5d0c0d69" +LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=a5b28ec9718d4516f7a621cd0232afc1" inherit cmake_qt5 -- cgit v1.2.3-54-g00ecf From 6aca07601e166ab0654e4179c4d80b8e17b6cc0a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 25 Jan 2018 15:20:23 +0200 Subject: qbsp: fix replace tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @TARGET@ was used twice for different things and other tags were used with wrong content. Installer content now follows closer to the online content. Task-number: QTBUG-66010 Change-Id: I6a10f765fa582da2025134f268c6ee35b74ac8c6 Reviewed-by: Ilari Ängeslevä --- classes/qbsp.bbclass | 4 ++-- files/qbsp/base_package.xml | 2 +- files/qbsp/image_package.xml | 2 +- files/qbsp/toolchain_installscript.qs | 17 +++++++++-------- files/qbsp/toolchain_package.xml | 2 +- recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 2 +- recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index 57aa7ca..8b8aa7f 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass @@ -57,7 +57,7 @@ QBSP_LICENSE_NAME ?= "" QBSP_LICENSE_FILE_imx = "NXP-EULA" QBSP_LICENSE_NAME_imx = "NXP Semiconductors Software License Agreement" -VERSION_AUTO_INCREMENT = "-0-${DATETIME}" +VERSION_AUTO_INCREMENT = "-${DATETIME}" VERSION_AUTO_INCREMENT[vardepsexclude] = "DATETIME" DEPLOY_CONF_NAME ?= "${MACHINE}" @@ -84,7 +84,7 @@ patch_installer_files() { -e "s#@RELEASEDATE@#${RELEASEDATE}#" \ -e "s#@MACHINE@#${MACHINE}#" \ -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \ - -e "s#@TARGET@#${TARGET_SYS}#" \ + -e "s#@TARGET_SYS@#${TARGET_SYS}#" \ -e "s#@ABI@#${ABI}#" \ -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \ -e "s#@SDKPATH@#${SDKPATH}#" \ diff --git a/files/qbsp/base_package.xml b/files/qbsp/base_package.xml index 80a02e8..5f16dfa 100644 --- a/files/qbsp/base_package.xml +++ b/files/qbsp/base_package.xml @@ -2,7 +2,7 @@ @VERSION@ @RELEASEDATE@ - @NAME@ + @TARGET@ @NAME@ for @TARGET@ @LICENSEDEPENDENCY@ diff --git a/files/qbsp/image_package.xml b/files/qbsp/image_package.xml index a3fe0cc..27e5f2e 100644 --- a/files/qbsp/image_package.xml +++ b/files/qbsp/image_package.xml @@ -2,7 +2,7 @@ @VERSION@ @RELEASEDATE@ - @MACHINE@ Linux System + @TARGET@ Linux System System image for @TARGET@ hardware image.7z diff --git a/files/qbsp/toolchain_installscript.qs b/files/qbsp/toolchain_installscript.qs index 15e9570..4afab71 100644 --- a/files/qbsp/toolchain_installscript.qs +++ b/files/qbsp/toolchain_installscript.qs @@ -38,6 +38,7 @@ Component.prototype.createOperations = function() var device = "@MACHINE@" var platform = "@NAME@" var sysroot = "@SYSROOT@" + var target_sys = "@TARGET_SYS@" var target = "@TARGET@" var abi = "@ABI@" var installPath = "@INSTALLPATH@/toolchain" @@ -71,8 +72,8 @@ Component.prototype.createOperations = function() component.addOperation("Execute", ["@SDKToolBinary@", "addTC", "--id", toolchainId + ".gcc", - "--name", "GCC (Boot2Qt " + platform + ")", - "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gcc" + executableExt, + "--name", "GCC (" + platform + " " + target + ")", + "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt, "--abi", abi, "--language", "1", "UNDOEXECUTE", @@ -81,8 +82,8 @@ Component.prototype.createOperations = function() component.addOperation("Execute", ["@SDKToolBinary@", "addTC", "--id", toolchainId + ".g++", - "--name", "G++ (Boot2Qt " + platform + ")", - "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-g++" + executableExt, + "--name", "G++ (" + platform + " " + target + ")", + "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt, "--abi", abi, "--language", "2", "UNDOEXECUTE", @@ -91,9 +92,9 @@ Component.prototype.createOperations = function() component.addOperation("Execute", ["@SDKToolBinary@", "addDebugger", "--id", debuggerId, - "--name", "GDB (Boot2Qt " + platform + ")", + "--name", "GDB (" + platform + " " + target + ")", "--engine", "1", - "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gdb" + executableExt, + "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gdb" + executableExt, "--abis", abi, "UNDOEXECUTE", "@SDKToolBinary@", "rmDebugger", "--id", debuggerId]); @@ -101,7 +102,7 @@ Component.prototype.createOperations = function() component.addOperation("Execute", ["@SDKToolBinary@", "addQt", "--id", qtId, - "--name", "Boot2Qt %{Qt:Version} " + platform, + "--name", platform + " " + target, "--type", "Qdb.EmbeddedLinuxQt", "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt, "UNDOEXECUTE", @@ -110,7 +111,7 @@ Component.prototype.createOperations = function() component.addOperation("Execute", ["@SDKToolBinary@", "addKit", "--id", basecomponent, - "--name", "Boot2Qt %{Qt:Version} " + platform, + "--name", platform + " " + target, "--mkspec", "devices/linux-oe-generic-g++", "--qt", qtId, "--debuggerid", debuggerId, diff --git a/files/qbsp/toolchain_package.xml b/files/qbsp/toolchain_package.xml index b578fc9..166e09b 100644 --- a/files/qbsp/toolchain_package.xml +++ b/files/qbsp/toolchain_package.xml @@ -2,7 +2,7 @@ @VERSION@ @RELEASEDATE@ - @MACHINE@ Linux Toolchain + @TARGET@ Linux Toolchain Toolchain and system root for @TARGET@ toolchain.7z qt.tools.qtcreator diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb index a9da456..3752fc0 100644 --- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb +++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb @@ -40,7 +40,7 @@ inherit qbsp PV := "${@d.getVar('PV', True)[0:5]}" -QBSP_NAME = "Qt Automotive" +QBSP_NAME = "Automotive ${PV}" QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" QBSP_INSTALLER_COMPONENT = "automotive.10.yocto.${QBSP_MACHINE}" QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}" diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb index d6def0f..1d0b018 100644 --- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb +++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb @@ -41,7 +41,7 @@ inherit qbsp PV := "${@d.getVar('PV', True)[0:5]}" VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" -QBSP_NAME = "Boot to Qt" +QBSP_NAME = "Boot2Qt ${PV}" QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" QBSP_INSTALLER_COMPONENT = "qt.embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}" -- cgit v1.2.3-54-g00ecf From 07b4960e438f4eb772dde4d1ccac153785cf151e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 Jan 2018 13:47:22 +0200 Subject: qt5: don't build tests by default We don't use the tests and building them always takes time. Change-Id: I68c95442772479f9dd30e322e48a0cfdef420924 Reviewed-by: Sami Nurmenniemi --- recipes-qt/qt5/qtbase_git.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index af38d2c..7685c5a 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -49,6 +49,8 @@ PACKAGECONFIG += " \ xkbcommon-evdev \ " +PACKAGECONFIG_remove = "tests" + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ -- cgit v1.2.3-54-g00ecf