From c3f5d0d537a0a79adbf3771e550f83e341cb5897 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 9 Apr 2018 16:17:11 +0300 Subject: Update all automotive components Latest revisions from 5.11 branch for all automotive components and changing the recipe to for neptune3, which replaces both neptune-ui and multiscreen-demo. Neptune3 uses git-lfs, which needs to be enabled in the host system. Task-number: QTAUTO-928 Change-Id: I8494f31267f5362655493155929264698a96d7b5 Reviewed-by: Dominik Holland --- meta-boot2qt/conf/layer.conf | 2 + meta-boot2qt/recipes-qt/automotive/gammaray_git.bb | 4 +- .../recipes-qt/automotive/multiscreen-demo_git.bb | 67 ---------------- .../automotive/neptune-ui/neptune.service | 11 --- .../recipes-qt/automotive/neptune-ui_git.bb | 73 ----------------- .../automotive/neptune3-ui/neptune.service | 11 +++ .../recipes-qt/automotive/neptune3-ui_git.bb | 93 ++++++++++++++++++++++ .../automotive/qmllive/qmllive-target.patch | 19 ----- meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | 13 ++- .../automotive/qtapplicationmanager_git.bb | 4 +- meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | 10 ++- 11 files changed, 121 insertions(+), 186 deletions(-) delete mode 100644 meta-boot2qt/recipes-qt/automotive/multiscreen-demo_git.bb delete mode 100644 meta-boot2qt/recipes-qt/automotive/neptune-ui/neptune.service delete mode 100644 meta-boot2qt/recipes-qt/automotive/neptune-ui_git.bb create mode 100644 meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service create mode 100644 meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb delete mode 100644 meta-boot2qt/recipes-qt/automotive/qmllive/qmllive-target.patch (limited to 'meta-boot2qt') diff --git a/meta-boot2qt/conf/layer.conf b/meta-boot2qt/conf/layer.conf index de3f836..43c8441 100644 --- a/meta-boot2qt/conf/layer.conf +++ b/meta-boot2qt/conf/layer.conf @@ -41,3 +41,5 @@ BBFILE_PRIORITY_b2qt = "20" LICENSE_PATH += "${LAYERDIR}/licenses" QT_LICENSE = "${LAYERDIR}/licenses/The-Qt-Company-DCLA-2.1" B2QTBASE = "${LAYERDIR}" + +HOSTTOOLS += "git-lfs" diff --git a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb index 7466822..7676b2d 100644 --- a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb @@ -8,8 +8,8 @@ inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" -BRANCH = "5.9" -SRCREV = "87656b9c344077d84682b53ba3e4676e18b57f9e" +BRANCH = "5.11" +SRCREV = "3b701f3ce0ffb23762271cba9c531775bae941df" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ diff --git a/meta-boot2qt/recipes-qt/automotive/multiscreen-demo_git.bb b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo_git.bb deleted file mode 100644 index c81adee..0000000 --- a/meta-boot2qt/recipes-qt/automotive/multiscreen-demo_git.bb +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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 = "Multiscreen Demo" -LICENSE = "GPLv3 | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073" - -inherit qt5-module systemd -require recipes-qt/qt5/qt5-git.inc - -QT_GIT_PROJECT = "qt-apps" -QT_MODULE_BRANCH = "master" - -SRC_URI += "\ - git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets \ - file://automotivedemo.service \ - " - -SRCREV_multiscreen-demo = "6d02e36c4280cee5b0c31323016ae666c73afef4" -SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" - -SRCREV_FORMAT = "multiscreen-demo_assets" - -DEPENDS = "qtbase qtdeclarative qt3d" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard" - -EXTRA_QMAKEVARS_PRE += "INSTALL_PREFIX=/opt" - -do_install_append() { - rm ${D}/opt/automotivedemo/start.sh - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/automotivedemo.service ${D}${systemd_system_unitdir}/ -} - -FILES_${PN} += "\ - /opt/automotivedemo \ - " - -SYSTEMD_SERVICE_${PN} = "automotivedemo.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-boot2qt/recipes-qt/automotive/neptune-ui/neptune.service b/meta-boot2qt/recipes-qt/automotive/neptune-ui/neptune.service deleted file mode 100644 index 16b6a1f..0000000 --- a/meta-boot2qt/recipes-qt/automotive/neptune-ui/neptune.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -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 -Restart=on-failure -WorkingDirectory=/usr/neptune-ui - -[Install] -WantedBy=multi-user.target diff --git a/meta-boot2qt/recipes-qt/automotive/neptune-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune-ui_git.bb deleted file mode 100644 index 5898424..0000000 --- a/meta-boot2qt/recipes-qt/automotive/neptune-ui_git.bb +++ /dev/null @@ -1,73 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Copyright (C) 2018 Pelagicore AG. -## 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 = "Neptune IVI UI" -LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "\ - file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82 \ - file://imports/assets/fonts/OFL.txt;md5=a729250f3548d9d2deab9bfeb8a7ad51 \ -" - -inherit qt5-module systemd -require recipes-qt/qt5/qt5-git.inc - -QT_GIT_PROJECT = "qt-apps" - -SRC_URI += " \ - file://neptune.service \ - " - -SRCREV = "7b64754e5d1aa3ea3b63347bc5637bae9795e193" - -DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager" -RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \ - qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ - ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" - -do_install_append() { - install -m 0755 -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ - - # Move the fonts to the system-wide font location - install -m 0755 -d ${D}${datadir}/fonts/ttf/ - mv ${D}/usr/neptune-ui/imports/assets/fonts/*.ttf ${D}${datadir}/fonts/ttf/ - rm -rf ${D}/usr/neptune-ui/imports/assets/fonts/ -} - -PACKAGES =+ "${PN}-apps" -RRECOMMENDS_${PN} += "${PN}-apps" - -FILES_${PN}-apps += "/usr/neptune-ui/apps" -FILES_${PN} += "\ - /usr/neptune-ui \ - ${datadir}/fonts/ttf \ - " - -SYSTEMD_SERVICE_${PN} = "neptune.service" diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service new file mode 100644 index 0000000..d64a119 --- /dev/null +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service @@ -0,0 +1,11 @@ +[Unit] +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 +Restart=on-failure +WorkingDirectory=/opt/neptune3 + +[Install] +WantedBy=multi-user.target diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb new file mode 100644 index 0000000..f6be9cb --- /dev/null +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb @@ -0,0 +1,93 @@ +############################################################################ +## +## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2018 Pelagicore AG. +## 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 = "Neptune 3 IVI UI" +LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-DCLA-2.1 )" +LIC_FILES_CHKSUM = "\ + file://LICENSE.GPL3;md5=0d02f21f8e2533ecc519e2ed96bc94a2 \ + file://imports/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" + +inherit qt5-module systemd +require recipes-qt/qt5/qt5-git.inc + +QT_GIT_PROJECT = "qt-apps" + +SRC_URI += " \ + file://neptune.service \ + " + +SRCREV = "716aadcbd88fbaa8f2b7bbf399cde1a4754e0def" + +DEPENDS = "\ + qtbase \ + qtdeclarative \ + qttools-native \ + qtquickcontrols2 \ + qtapplicationmanager \ + qtivi qtivi-native \ + qtremoteobjects qtremoteobjects-native \ + " +RDEPENDS_${PN} = "\ + dbus \ + otf-noto ttf-opensans \ + qtapplicationmanager qtapplicationmanager-tools \ + qtvirtualkeyboard \ + qtquickcontrols2-qmlplugins \ + qtgraphicaleffects-qmlplugins \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ + " + +do_install_append() { + install -m 0755 -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ + + # Move the fonts to the system-wide font location + install -m 0755 -d ${D}${datadir}/fonts/ttf/ + mv ${D}/opt/neptune3/imports/assets/fonts/*.ttf ${D}${datadir}/fonts/ttf/ + rm -rf ${D}/opt/neptune3/imports/assets/fonts/ + + # Don't package tests + rm -rf ${D}/usr/share/tests +} + +PACKAGES =+ "${PN}-apps" +RRECOMMENDS_${PN} += "${PN}-apps" + +FILES_${PN}-apps += "/opt/neptune3/apps" +FILES_${PN} += "\ + /opt/neptune3 \ + ${datadir}/fonts/ttf \ + " +FILES_${PN}-dev += "\ + /opt/neptune3/lib/*.so \ + " + +SYSTEMD_SERVICE_${PN} = "neptune.service" diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive/qmllive-target.patch b/meta-boot2qt/recipes-qt/automotive/qmllive/qmllive-target.patch deleted file mode 100644 index e3f81fa..0000000 --- a/meta-boot2qt/recipes-qt/automotive/qmllive/qmllive-target.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/runtime.pro b/runtime.pro -index 73dd6d7..e569b23 100644 ---- a/runtime.pro -+++ b/runtime.pro -@@ -1,5 +1,4 @@ - TARGET = qmlliveruntime --DESTDIR = ../../bin - - QT *= widgets quick - osx: CONFIG -= app_bundle -@@ -14,6 +13,6 @@ include(../src.pri) - RESOURCES += \ - qml.qrc - -- -- -+target.path += /usr/bin -+INSTALLS += target - diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index ce1bb82..1b6e02e 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb @@ -30,7 +30,7 @@ DESCRIPTION = "QML Live target runtime" LICENSE = "GPL-3.0" -LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c" inherit qmake5 require recipes-qt/qt5/qt5-git.inc @@ -38,12 +38,9 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT_PROJECT = "qt-apps" QT_MODULE_BRANCH = "master" -SRC_URI += " \ - file://qmllive-target.patch \ - " - -SRCREV = "d0d41c71c4691a5f3e2b72e22917f314b4190ffc" - -S = "${WORKDIR}/git/src/runtime" +SRCREV = "4d360892c7a21b4b2aad0ec47ef3f60fb0b0b381" DEPENDS = "qtbase qtdeclarative" + +EXTRA_QMAKEVARS_PRE += "CONFIG+=skip-tests CONFIG+=skip-examples" +EXTRA_QMAKEVARS_POST += "QMAKE_RPATHDIR=" diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index ae66e8a..8c41333 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -34,10 +34,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "5581e400c95a1ff736c55c9d93bd451302970c11" +SRCREV = "6aa3295386b0a0f0b8c7ae1b0f827dd28b6323ca" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" + ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" RDEPENDS_${PN} = "libcrypto ${PN}-tools" RDEPENDS_${PN}_remove_mingw32 = "libcrypto" diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb index 5cbf131..5c17935 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb @@ -37,7 +37,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ DEPENDS = "qtbase qtdeclarative qtmultimedia qtivi-native" DEPENDS_class-native = "qtbase" -DEPENDS_class-nativesdk = "qtbase" +DEPENDS_class-nativesdk = "qtbase qtivi-native" inherit qt5-module inherit python3native @@ -50,12 +50,12 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "8d482b27c6c0c2b664104fd777ddee92652ab65c" +SRCREV_qtivi = "8658258f2f8d8dac3327a870573dc046029b74bc" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -PACKAGECONFIG ?= "taglib ivigenerator" +PACKAGECONFIG ?= "taglib ivigenerator remoteobjects" PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib" PACKAGECONFIG[dlt] = "QMAKE_EXTRA_ARGS+=-feature-dlt,QMAKE_EXTRA_ARGS+=-no-feature-dlt,dlt-daemon" PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only" @@ -65,8 +65,10 @@ PACKAGECONFIG[ivigenerator-native] = "QMAKE_EXTRA_ARGS+=-qt-ivigenerator,,python 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[remoteobjects] = "QMAKE_EXTRA_ARGS+=-feature-remoteobjects,QMAKE_EXTRA_ARGS+=-no-feature-simulator,qtremoteobjects" +PACKAGECONFIG[remoteobjects-native] = "QMAKE_EXTRA_ARGS+=-feature-remoteobjects QMAKE_EXTRA_ARGS+=--force-ivigenerator-qtremoteobjects" -PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native" +PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native remoteobjects-native" PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}" PACKAGECONFIG_class-nativesdk_mingw32 ??= "host-tools-only" -- cgit v1.2.3-54-g00ecf