From 9a57170b9e6da09406b59c1d699b84092c6dcac5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 12 Dec 2018 10:47:28 +0200 Subject: automotive: update revisions Change-Id: I0ff0b257e2d260fe12c2fea3494a5b715423f5fb Reviewed-by: Mikko Gronoff --- meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | 2 +- meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index da0f658..afc3360 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb @@ -45,7 +45,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "c80d9aba17b1b50618ae6311d48f35ec726a4007" +SRCREV = "dfcd035e7d28d24a2652a6f084d167962051ac22" QMAKE_PROFILES = "${S}/neptune3-ui.pro" diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index c267e3f..2934028 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -35,7 +35,7 @@ inherit qt5-module require recipes-qt/qt5/qt5-git.inc QT_MODULE_BRANCH = "dev" -SRCREV = "adb57812ee1cf89f3311f8a27ef97abf5d424bde" +SRCREV = "adb23a6ea8ba07c648bfc436c355a56db5cc7e2e" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" -- cgit v1.2.3-54-g00ecf From 8fcf3a16d9aaf12e81f8666840f01ba533130b06 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 14 Dec 2018 10:56:02 +0200 Subject: meta-qt5: update revision pull in Qt3D Studio runtime 2.2 Change-Id: I4cd44d3c4d04b7cefcc81f6df1f1a11a880483e8 Reviewed-by: Mikko Gronoff --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index d2685d5..1e42086 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -26,7 +26,7 @@ path="sources/meta-openembedded"/> Date: Mon, 17 Dec 2018 16:33:58 +0200 Subject: QBSP: add correct cmake generator for windows toolchain Change-Id: I7589e2d503052861cceabd8bc7094d9a992f2ff7 Reviewed-by: Mikko Gronoff --- meta-boot2qt/files/qbsp/toolchain_installscript.qs | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index 4d25bf7..8de238b 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -73,6 +73,7 @@ Component.prototype.createOperations = function() executableExt = ".exe"; hostSysroot = "i686-pokysdk-mingw32"; toolchainId = "ProjectExplorer.ToolChain.Mingw:" + component.name; + cmakeGenerator = "MinGW Makefiles"; } component.addOperation("Execute", -- cgit v1.2.3-54-g00ecf From a143fbcac5a77cf03ca9f11eea9cbb95132b35cd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 17 Dec 2018 16:35:55 +0200 Subject: Use ABI flavor with QtCreator QtCreator 4.8 allows adding new ABI flavors that can be used to differentiate otherwise identical tools. Using our own abi flavor prevents QtCreator from mixing incompatible tools with one from yocto toolchain. Task-number: QTAUTO-793 Change-Id: Ibba6e42b25e404aff2a20a021fe7833455f0de9b Reviewed-by: Mikko Gronoff --- meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | 2 +- meta-boot2qt/classes/qbsp.bbclass | 3 ++- meta-boot2qt/files/configure-qtcreator.sh | 6 +++++- meta-boot2qt/files/qbsp/toolchain_installscript.qs | 8 +++++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass index f35ebfe..6278d11 100644 --- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass @@ -91,7 +91,7 @@ create_qtcreator_configure_script () { # add qtcreator configuration script install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh - sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh + sed -i -e '/^ABI=/c\ABI="${ABI}-linux-poky-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh } create_qtcreator_configure_script_sdkmingw32 () { diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index fbfd266..d61e12b 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass @@ -27,7 +27,7 @@ ## ############################################################################ -inherit meta nopackages abi-arch +inherit meta nopackages abi-arch siteinfo FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:" @@ -87,6 +87,7 @@ patch_installer_files() { -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \ -e "s#@TARGET_SYS@#${TARGET_SYS}#" \ -e "s#@ABI@#${ABI}#" \ + -e "s#@BITS@#${SITEINFO_BITS}#" \ -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \ -e "s#@SDKPATH@#${SDKPATH}#" \ -e "s#@SDKFILE@#${SDK_NAME}#" \ diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh index a7ea288..6899fc3 100755 --- a/meta-boot2qt/files/configure-qtcreator.sh +++ b/meta-boot2qt/files/configure-qtcreator.sh @@ -30,7 +30,7 @@ set -e -ABI="arm-linux-generic-elf-32bit" +ABI="arm-linux-poky-elf-32bit" CONFIG="" printUsage () @@ -107,6 +107,10 @@ if [ -n "${REMOVEONLY}" ]; then exit 0 fi +${SDKTOOL} addAbiFlavor \ + --flavor poky \ + --oses linux || true + ${SDKTOOL} addTC \ --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \ --name "GCC (${NAME})" \ diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index 8de238b..32c14e0 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -40,7 +40,7 @@ Component.prototype.createOperations = function() var sysroot = "@SYSROOT@" var target_sys = "@TARGET_SYS@" var target = "@TARGET@" - var abi = "@ABI@" + var abi = "@ABI@-linux-poky-elf-@BITS@bit" var installPath = "@INSTALLPATH@/toolchain" var sdkPath = "@SDKPATH@" var sdkFile = "@SDKFILE@" @@ -76,6 +76,11 @@ Component.prototype.createOperations = function() cmakeGenerator = "MinGW Makefiles"; } + component.addOperation("Execute", "{0,2}", + ["@SDKToolBinary@", "addAbiFlavor", + "--flavor", "poky", + "--oses", "linux"]); + component.addOperation("Execute", ["@SDKToolBinary@", "addTC", "--id", toolchainId + ".gcc", @@ -112,6 +117,7 @@ Component.prototype.createOperations = function() "--name", platform + " " + target, "--type", "Qdb.EmbeddedLinuxQt", "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt, + "--abis", abi, "UNDOEXECUTE", "@SDKToolBinary@", "rmQt", "--id", qtId]); -- cgit v1.2.3-54-g00ecf From b344daf64b7990e27aba0809aa7e8d7ab7edd774 Mon Sep 17 00:00:00 2001 From: Bramastyo Harimukti Date: Mon, 17 Dec 2018 16:57:47 +0100 Subject: automotive: update neptune 3 revision Change-Id: Ia94bb08ba08c2baaa50baf46407e9e8e16722d68 Reviewed-by: Samuli Piippo --- meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index afc3360..ab5dc7f 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb @@ -45,7 +45,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "dfcd035e7d28d24a2652a6f084d167962051ac22" +SRCREV = "438ed13a0043efb7beefa46c47f9fb3f80dd9eef" QMAKE_PROFILES = "${S}/neptune3-ui.pro" -- cgit v1.2.3-54-g00ecf From 4281e5b02e37efa51d11e2b3c91183bb6f43987c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 19 Dec 2018 08:21:30 +0200 Subject: automotive: update revisions ... and fix neptune license checksum. Change-Id: Idae89099ad310321b5127fd6b5f64a276217cb44 Reviewed-by: Bramastyo Harimukti Santoso --- meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | 4 ++-- meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | 4 ++-- meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index ab5dc7f..aaeb0e3 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb @@ -31,7 +31,7 @@ DESCRIPTION = "Neptune 3 IVI UI" LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = "\ - file://LICENSE.GPL3;md5=0d02f21f8e2533ecc519e2ed96bc94a2 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://imports_shared/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " @@ -45,7 +45,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "438ed13a0043efb7beefa46c47f9fb3f80dd9eef" +SRCREV = "792d987cc5797e6dae2d111de068a685513b6f63" QMAKE_PROFILES = "${S}/neptune3-ui.pro" diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index 52cfcff..5489d7b 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb @@ -30,14 +30,14 @@ DESCRIPTION = "QML Live target runtime" LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit qmake5 require recipes-qt/qt5/qt5-git.inc QT_GIT_PROJECT = "qt-apps" -SRCREV = "329a996f6a52494ef677107593a0146c71a2880a" +SRCREV = "c1c8e038cd7a8fd698b8c594d80201dfef5583bc" DEPENDS = "qtbase qtdeclarative" diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index 2934028..10fe7ae 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -35,7 +35,7 @@ inherit qt5-module require recipes-qt/qt5/qt5-git.inc QT_MODULE_BRANCH = "dev" -SRCREV = "adb23a6ea8ba07c648bfc436c355a56db5cc7e2e" +SRCREV = "a1c67d415fda4fcfef423cd0a0f55f72ab5a8532" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb index 4b122c2..8fa95a0 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb @@ -51,7 +51,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "15a6672b304fe91a928911e810f5e83f233c790e" +SRCREV_qtivi = "221675b94f51600a7931360f0d9e59ee9f3c643d" SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From b97117dfe83a5b73e8d27c6818902e0d1cfca7ba Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 21 Dec 2018 08:13:57 +0200 Subject: automotive: update revisions Change-Id: I7018446af539fea2699617382bf7fdc3727a79dc Reviewed-by: Mikko Gronoff --- meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | 2 +- meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | 2 +- meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | 4 ++-- meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index aaeb0e3..ee26f08 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb @@ -45,7 +45,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "792d987cc5797e6dae2d111de068a685513b6f63" +SRCREV = "be372dec5a64cdfc2b2ba66ea240d9fa1cdbe3eb" QMAKE_PROFILES = "${S}/neptune3-ui.pro" diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index 5489d7b..a0b49f6 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb @@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT_PROJECT = "qt-apps" -SRCREV = "c1c8e038cd7a8fd698b8c594d80201dfef5583bc" +SRCREV = "dc83ea3bcbcfece8a0c5caeafcdd9f0854ffae6f" DEPENDS = "qtbase qtdeclarative" diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index 10fe7ae..7c81fc5 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -29,13 +29,13 @@ DESCRIPTION = "Qt component for application lifecycle management" LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit qt5-module require recipes-qt/qt5/qt5-git.inc QT_MODULE_BRANCH = "dev" -SRCREV = "a1c67d415fda4fcfef423cd0a0f55f72ab5a8532" +SRCREV = "9c4ff31161c2ea09c790ab143a23b3fe997ed4a3" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb index 8fa95a0..cb3f6a3 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb @@ -51,7 +51,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "221675b94f51600a7931360f0d9e59ee9f3c643d" +SRCREV_qtivi = "b18956edd578f49f369f7b3863881d0fadb035df" SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf