From df17ffab8615d5de8659ec8f285e2a92b28cd671 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Oct 2017 10:49:02 +0200 Subject: automotive: update revisions Update all automotive components. Merge changes done in pyro branch. Change-Id: I9a084b69ff7399c244098a336f0a3a112859fa17 Reviewed-by: Dominik Holland --- recipes-qt/automotive/gammaray_git.bb | 6 ++--- recipes-qt/automotive/neptune-ui/neptune.service | 4 +-- recipes-qt/automotive/neptune-ui_git.bb | 14 ++++++----- recipes-qt/automotive/qtapplicationmanager_git.bb | 6 ++--- ...QT_HOST_BINS-get-for-getting-correct-path.patch | 29 ++++++++++++++++++++++ recipes-qt/automotive/qtivi_git.bb | 5 ++-- 6 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 6317040..1de4c09 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -8,11 +8,11 @@ inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" -BRANCH = "2.7" -SRCREV = "a22da6d63cab08f3ef8588611fdbda3f96731efe" +BRANCH = "5.9" +SRCREV = "ff53d7328d6db17dcb6486bb98b02a2f107b4066" PV = "${BRANCH}+git${SRCPV}" -DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \ +DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" S = "${WORKDIR}/git" diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service index 7793d0b..ef73324 100644 --- a/recipes-qt/automotive/neptune-ui/neptune.service +++ b/recipes-qt/automotive/neptune-ui/neptune.service @@ -3,9 +3,9 @@ Description=Neptune After=dbus.service dbus-session.service systemd-user-sessions.service [Service] -ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml +ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Restart=on-failure -WorkingDirectory=/opt/neptune +WorkingDirectory=/opt/neptune-ui [Install] WantedBy=multi-user.target diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index b7ca95d..e8d01f2 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -29,7 +29,7 @@ DESCRIPTION = "Neptune IVI UI" LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82" inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc @@ -41,13 +41,15 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "6ddea70fd06d78ca7672f18221b91b3e8990aee8" +SRCREV = "2a242aa65f267d010d8c10b8c5da5a1e728d0551" -DEPENDS = "qtbase qtdeclarative qttools-native" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \ +DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager" +RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" +EXTRA_QMAKEVARS_PRE += "INSTALL_PREFIX=/opt" + do_install_append() { install -m 0755 -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ @@ -56,9 +58,9 @@ do_install_append() { PACKAGES =+ "${PN}-apps" RRECOMMENDS_${PN} += "${PN}-apps" -FILES_${PN}-apps += "/opt/neptune/apps" +FILES_${PN}-apps += "/opt/neptune-ui/apps" FILES_${PN} += "\ - /opt/neptune \ + /opt/neptune-ui \ " SYSTEMD_SERVICE_${PN} = "neptune.service" diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 52ee20e..5b112b5 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 = "f472ef3662cf0a9bc2bf727c7cef18fd884df5a2" +SRCREV = "57ff870b0790e1e1feb3421cdfb46dff82878825" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" @@ -60,8 +60,8 @@ FILES_${PN} += "\ BBCLASSEXTEND += "nativesdk" -DEPENDS_class-nativesdk = "qtbase nativesdk-glibc-locale" -DEPENDS_class-nativesdk_remove_mingw32 += "nativesdk-glibc-locale" +DEPENDS_class-nativesdk = "qtbase nativesdk-glibc-locale nativesdk-libarchive" +DEPENDS_class-nativesdk_remove_mingw32 += "nativesdk-glibc-locale nativesdk-libarchive" EXTRA_QMAKEVARS_PRE_class-nativesdk += "\ -config tools-only \ diff --git a/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch b/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch new file mode 100644 index 0000000..9f6c0c0 --- /dev/null +++ b/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch @@ -0,0 +1,29 @@ +From b4ed8c9d4a391771cba485bfa685147126260dc2 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 7 Sep 2017 10:24:11 +0300 +Subject: [PATCH] Use QT_HOST_BINS/get for getting correct path + +Patch QT_HOST_BINS same way as is done it qtbase for getting +the EffectivePath instead of installation path. + +Change-Id: I3e9c04019c432e182dcb5c0898275173f20de1e2 +--- + mkspecs/features/ivigenerator.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf +index 65c497e..7634355 100644 +--- a/mkspecs/features/ivigenerator.prf ++++ b/mkspecs/features/ivigenerator.prf +@@ -31,9 +31,9 @@ QFACE_YAML = $$QFACE_ABS_PWD/$${QFACE_BASE_NAME}.yaml + OTHER_FILES += $$QFACE_FILE + + # Detect whether we are using the feature inside the qtivi repository +-VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv ++VIRTUALENV_PATH = $$[QT_HOST_BINS/get]/ivigenerator/qtivi_qface_virtualenv + INTERNAL_VIRTUALENV_PATH = $$QTIVI_BUILD_ROOT/src/tools/ivigenerator/qtivi_qface_virtualenv +-IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator ++IVI_GENERATOR_PATH = $$[QT_HOST_BINS/get]/ivigenerator + QTEST_ENVIRONMENT = $$upper($$(QTEST_ENVIRONMENT)) + + # Try to use the internal virtualenv when building qtivi diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 0f49d5d..3eb48e5 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -47,10 +47,11 @@ QT_MODULE_BRANCH_QFACE = "upstream/develop" SRC_URI += " \ ${QT_GIT}/qtivi-qface.git;name=qface;branch=${QT_MODULE_BRANCH_QFACE};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/qface \ + file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "3205b6e8f57273096ae60d8f6fcdbe597c350393" -SRCREV_qface = "b1d96d85a7c43ac74335b9a1a99a68507047f5bc" +SRCREV_qtivi = "705acb8d595d772778dd4985b762ed6a604473d9" +SRCREV_qface = "295824c8df7f74af8f3d1f368ec15942e6622f22" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From 5ae8d7631ae790d79b4e61a728e1a745f4624966 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 13 Nov 2017 10:27:02 +0200 Subject: meta-qt5: update meta layer - Update submodules to Qt 5.9.3 (snapshot 2) - Remove unused qtwebengine patches Task-number: QTBUG-64216 Change-Id: I2bcb9902091a39159d8b829e00396925d35b8db5 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 93c03a5..6dc6a58 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 15 Nov 2017 13:16:25 +0200 Subject: meta-qt5: update meta layer - Update Qt submodules to 5.9.3 RC - Update QuickCompiler Task-number: QTBUG-64216 Change-Id: Ibfd62c60e64dd6d988fa10bb531ad9628046266f 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 be10a78..11e103e 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 = "dd96b1d76162d719f9ba572d2c4659f7bcd47710" +SRCREV = "3eee8b042877c9e03cb4ccf154518d0f9a32335a" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 6dc6a58..85cd195 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Thu, 16 Nov 2017 10:18:59 +0200 Subject: meta-qt5: update meta layer Update submodules to Qt 5.9.3 RC2 Task-number: QTBUG-64216 Change-Id: I63ea4caed7df4b2afe03916357af0d6f630b7c91 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 85cd195..f84d769 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 15 Nov 2017 15:49:52 +0200 Subject: qbsp: update installer-framework Use latest release from publicly available server. Search files for QBSP_IMAGE_CONTENT from alternative locations. Task-number: QTBUG-64522 Change-Id: I64fd9f28640db996d908dc74b48cf0f462d74b52 Reviewed-by: Mikko Gronoff --- classes/qbsp-image.bbclass | 9 +++- recipes-qt/qt5-addons/installer-framework_2.0.3.bb | 48 --------------------- recipes-qt/qt5-addons/installer-framework_3.0.1.bb | 50 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 49 deletions(-) delete mode 100644 recipes-qt/qt5-addons/installer-framework_2.0.3.bb create mode 100644 recipes-qt/qt5-addons/installer-framework_3.0.1.bb diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass index b8da767..71d1d45 100644 --- a/classes/qbsp-image.bbclass +++ b/classes/qbsp-image.bbclass @@ -42,7 +42,14 @@ fakeroot do_qbsp_image () { src=`echo $item | awk -F':' '{ print $1 }'` dst=`echo $item | awk -F':' '{ print $2 }'` - install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst + if [ -e "${IMGDEPLOYDIR}/$src" ]; then + install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst + elif [ -e "${DEPLOY_DIR_IMAGE}/$src" ]; then + install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/qbsp/$dst + else + echo "Could not copy file $src" + exit 1 + fi done cd ${S}/qbsp diff --git a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb deleted file mode 100644 index 0ea0ec4..0000000 --- a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 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$ -## -############################################################################ - -DESCRIPTION = "Qt Installer Framework" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" - -inherit bin_package native - -SRC_URI = "http://ci-files02-hki.intra.qt.io/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z" - -SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d" -SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6" - -S = "${WORKDIR}/ifw-pkg" - -do_install() { - install -d ${D}${bindir} - install -m 0755 -t ${D}${bindir} ${S}/bin/* -} - -INSANE_SKIP_${PN} += "already-stripped" diff --git a/recipes-qt/qt5-addons/installer-framework_3.0.1.bb b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb new file mode 100644 index 0000000..5bc09c0 --- /dev/null +++ b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb @@ -0,0 +1,50 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +DESCRIPTION = "Qt Installer Framework" +LICENSE = "The-Qt-Company-DCLA-2.1" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" + +inherit bin_package native + +do_unpack[depends] += "p7zip-native:do_populate_sysroot" + +SRC_URI = "http://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-build-stripped-${PV}-linux-x64.7z" + +SRC_URI[md5sum] = "68b7c1f761ca0dba18f1d165d66005d6" +SRC_URI[sha256sum] = "c2eb769351025e0c7df2882116390fffaf958368f873a2abab99e37caee0a498" + +S = "${WORKDIR}/ifw-pkg" + +do_install() { + install -d ${D}${bindir} + install -m 0755 -t ${D}${bindir} ${S}/bin/* +} + +INSANE_SKIP_${PN} += "already-stripped" -- cgit v1.2.3-54-g00ecf From 86e061a015a75185d9e5cef8d20c3e230c3c7424 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Nov 2017 13:38:14 +0200 Subject: qbsp: various improvements to qbsp creation Now using the same component name and installation paths as are done with components from online installer. Modify the component description from recipe, so it's different for boot2qt and automotive qbsps. Change-Id: Ie43fa00e438b9ec2e219eda052f728e7c0754644 Reviewed-by: Mikko Gronoff --- classes/qbsp.bbclass | 3 ++- files/qbsp/base_package.xml | 2 +- files/qbsp/image_package.xml | 4 ++-- files/qbsp/toolchain_package.xml | 4 ++-- recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 7 ++++--- recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 5 +++-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index 8beb55f..57aa7ca 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass @@ -78,7 +78,8 @@ patch_installer_files() { LICENSE_DEPENDENCY="${QBSP_INSTALLER_COMPONENT}.license" fi - sed -e "s#@NAME@#${DEPLOY_CONF_NAME}#" \ + sed -e "s#@NAME@#${QBSP_NAME}#" \ + -e "s#@TARGET@#${DEPLOY_CONF_NAME}#" \ -e "s#@VERSION@#${QBSP_VERSION}#" \ -e "s#@RELEASEDATE@#${RELEASEDATE}#" \ -e "s#@MACHINE@#${MACHINE}#" \ diff --git a/files/qbsp/base_package.xml b/files/qbsp/base_package.xml index 28261d5..80a02e8 100644 --- a/files/qbsp/base_package.xml +++ b/files/qbsp/base_package.xml @@ -3,6 +3,6 @@ @VERSION@ @RELEASEDATE@ @NAME@ - Boot to Qt for @NAME@ with Embedded Linux baselayer + @NAME@ for @TARGET@ @LICENSEDEPENDENCY@ diff --git a/files/qbsp/image_package.xml b/files/qbsp/image_package.xml index 1eaf69c..a3fe0cc 100644 --- a/files/qbsp/image_package.xml +++ b/files/qbsp/image_package.xml @@ -2,7 +2,7 @@ @VERSION@ @RELEASEDATE@ - @NAME@ Linux System - SD-Card image for @NAME@ hardware with Embedded Linux baselayer + @MACHINE@ Linux System + System image for @TARGET@ hardware image.7z diff --git a/files/qbsp/toolchain_package.xml b/files/qbsp/toolchain_package.xml index 85a2c67..b578fc9 100644 --- a/files/qbsp/toolchain_package.xml +++ b/files/qbsp/toolchain_package.xml @@ -2,8 +2,8 @@ @VERSION@ @RELEASEDATE@ - @NAME@ Linux Toolchain - Toolchain and system root for @NAME@ with Embedded Linux baselayer + @MACHINE@ 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 3f86016..a9da456 100644 --- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb +++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb @@ -38,11 +38,12 @@ S = "${WORKDIR}" inherit qbsp -PV = "1.1" +PV := "${@d.getVar('PV', True)[0:5]}" +QBSP_NAME = "Qt Automotive" QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" -QBSP_INSTALLER_COMPONENT = "qt.automotive.10.yocto.${QBSP_MACHINE}" -QBSP_INSTALL_PATH = "/${QT_MODULE_BRANCH}/Automotive/${MACHINE}" +QBSP_INSTALLER_COMPONENT = "automotive.10.yocto.${QBSP_MACHINE}" +QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}" QBSP_SDK_TASK = "meta-toolchain-b2qt-automotive-qt5-sdk" QBSP_IMAGE_TASK = "b2qt-automotive-qt5-image" diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb index 6fe8bf1..d6def0f 100644 --- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb +++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb @@ -40,10 +40,11 @@ inherit qbsp PV := "${@d.getVar('PV', True)[0:5]}" -VERSION_SHORT = "${@d.getVar('QT_MODULE_BRANCH', True).replace('.','')}" +VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" +QBSP_NAME = "Boot to Qt" QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" QBSP_INSTALLER_COMPONENT = "qt.embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" -QBSP_INSTALL_PATH = "/${QT_MODULE_BRANCH}/Boot2Qt/${MACHINE}" +QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}" QBSP_SDK_TASK = "meta-toolchain-b2qt-embedded-qt5-sdk" QBSP_IMAGE_TASK = "b2qt-embedded-qt5-image" -- cgit v1.2.3-54-g00ecf From a9e35b7be8144b7a470f0274abd820e1ad041eed Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Sun, 19 Nov 2017 14:53:23 +0200 Subject: meta-qt5: update meta layer Update submodules to Qt 5.9.3 RC3 Task-number: QTBUG-64216 Change-Id: I3dba209e7fbd26407fa17912ea013fd65d52a6bc 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 f84d769..fa728d9 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/>