From 211695b46a2e1b86f01f3d150e1502c3e473aaab Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 23 Oct 2017 12:09:02 +0300 Subject: emulator: update recipes & configs for emulator3 * Remove emulator helperlib recipes as those are now included in qtsimulator * Move emulator proxy daemon launcher scripts under qtsimulator recipe * Update qtsimulator, qtsystems & qtglesstream to match with emulator3 * Remove qtsimulator dependencies from qtsensors and qtlocation as the the modules do not build against more recent refactored qtsimulator. Task-number: QTBUG-64006 Change-Id: Ib2374e702f2862b168ac2f1f2d6190f84823137c Reviewed-by: Samuli Piippo --- conf/distro/include/emulator.conf | 4 +- recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 63 ---------------------- .../b2qt-emulator-proxy/emulatorproxy.service | 10 ---- .../b2qt-emulator-proxy/emulatorproxyd.sh | 49 ----------------- recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb | 48 ----------------- recipes-qt/qt5-addons/qtglesstream.bb | 2 +- .../qt5-addons/qtsimulator/emulatorproxy.service | 10 ++++ .../qt5-addons/qtsimulator/emulatorproxyd.sh | 49 +++++++++++++++++ recipes-qt/qt5-addons/qtsimulator_1.0.bb | 24 +++++++-- ...n-disable-simulator-content-under-plugins.patch | 23 ++++++++ recipes-qt/qt5/qtlocation_git.bbappend | 6 ++- recipes-qt/qt5/qtsensors_git.bbappend | 31 ----------- recipes-qt/qt5/qtsystems_git.bbappend | 2 - 13 files changed, 109 insertions(+), 212 deletions(-) delete mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb delete mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service delete mode 100755 recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh delete mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb create mode 100644 recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service create mode 100755 recipes-qt/qt5-addons/qtsimulator/emulatorproxyd.sh create mode 100644 recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch delete mode 100644 recipes-qt/qt5/qtsensors_git.bbappend diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index a749086..b6125ae 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -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. @@ -49,6 +49,4 @@ MACHINE_EXTRA_INSTALL += "\ mount-vboxsf \ qtsystems \ qtglesstream \ - b2qt-emulator-proxy \ - b2qt-emulator-vinput \ " diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb deleted file mode 100644 index 0692fc0..0000000 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb +++ /dev/null @@ -1,63 +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 = "Proxy daemon for QtSimulator" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://proxy.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17" - -inherit qmake5 - -SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ - file://emulatorproxyd.sh \ - file://emulatorproxy.service \ - " - -SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe" -BRANCH = "master" -PV = "1.0+git${SRCPV}" - -S = "${WORKDIR}/git/src/helperlibs/proxy" - -DEPENDS = "qtbase qtsimulator" - -do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ - - install -m 0755 -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/emulatorproxy.service ${D}${systemd_unitdir}/system/ -} - -INITSCRIPT_NAME = "emulatorproxyd.sh" -INITSCRIPT_PARAMS = "defaults 97 10" - -SYSTEMD_SERVICE_${PN} = "emulatorproxy.service" - -inherit update-rc.d systemd diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service deleted file mode 100644 index 7a709fd..0000000 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=QtSimulator Proxy Daemon -After=systemd-user-sessions.service - -[Service] -Type=forking -ExecStart=/usr/bin/emulatorproxyd - -[Install] -WantedBy=multi-user.target diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh deleted file mode 100755 index d73f1e7..0000000 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -############################################################################ -## -## 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$ -## -############################################################################ - -DAEMON=/usr/bin/emulatorproxyd - -case "$1" in -start) - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -stop) - start-stop-daemon --stop --quiet --exec $DAEMON - ;; -restart) - start-stop-daemon --stop --quiet --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -*) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac -exit 0 diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb deleted file mode 100644 index 2fb3f8c..0000000 --- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.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 = "Virtual input plugin for QtSimulator" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://qvinput.h;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17" - -inherit qt5-module - -SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ - " - -SRCREV = "011e1c40716c8323f247e927de6640653d6811c4" -BRANCH = "master" -PV = "1.0+git${SRCPV}" - -EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent" - -S = "${WORKDIR}/git/src/helperlibs/vinput" - -DEPENDS = "qtbase qtsimulator" diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 7443724..0f942e7 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -38,7 +38,7 @@ SRC_URI = " \ " PV = "1.0.0" -SRCREV = "17f5dc862f6669261cd08e948b2083bb7dca2b28" +SRCREV = "37f98d4b7123378d1ade7beedf5c5150cd26e178" BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service b/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service new file mode 100644 index 0000000..7a709fd --- /dev/null +++ b/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service @@ -0,0 +1,10 @@ +[Unit] +Description=QtSimulator Proxy Daemon +After=systemd-user-sessions.service + +[Service] +Type=forking +ExecStart=/usr/bin/emulatorproxyd + +[Install] +WantedBy=multi-user.target diff --git a/recipes-qt/qt5-addons/qtsimulator/emulatorproxyd.sh b/recipes-qt/qt5-addons/qtsimulator/emulatorproxyd.sh new file mode 100755 index 0000000..d73f1e7 --- /dev/null +++ b/recipes-qt/qt5-addons/qtsimulator/emulatorproxyd.sh @@ -0,0 +1,49 @@ +#!/bin/sh +############################################################################ +## +## 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$ +## +############################################################################ + +DAEMON=/usr/bin/emulatorproxyd + +case "$1" in +start) + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +stop) + start-stop-daemon --stop --quiet --exec $DAEMON + ;; +restart) + start-stop-daemon --stop --quiet --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac +exit 0 diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb index 4d46679..1dc3a70 100644 --- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb +++ b/recipes-qt/qt5-addons/qtsimulator_1.0.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. @@ -29,17 +29,35 @@ DESCRIPTION = "QtSimulator" LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=eb588a9fa3a2a45f725e9eb9f864e74b;beginline=1;endline=17" +LIC_FILES_CHKSUM = "file://src/simulator/simulatorglobal.h;md5=3daa1a609195439d0292259a74c7d615;beginline=1;endline=20" inherit qt5-module SRC_URI = " \ git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \ + file://emulatorproxyd.sh \ + file://emulatorproxy.service \ " -SRCREV = "0307e85a8d3a8b83a346aa3910e88aabb7b7b2ac" +SRCREV = "f98633ebee7dbce79c00fbfec86537c6330e2b5f" BRANCH = "master" S = "${WORKDIR}/git" DEPENDS = "qtbase" + +# Proxy daemon for QtSimulator +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ + + install -m 0755 -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/emulatorproxy.service ${D}${systemd_unitdir}/system/ +} + +INITSCRIPT_NAME = "emulatorproxyd.sh" +INITSCRIPT_PARAMS = "defaults 97 10" + +SYSTEMD_SERVICE_${PN} = "emulatorproxy.service" + +inherit update-rc.d systemd diff --git a/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch new file mode 100644 index 0000000..ad4c7b8 --- /dev/null +++ b/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch @@ -0,0 +1,23 @@ +From a7af02fe34bd8e067c7654ac366e19783b89e990 Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff +Date: Wed, 25 Oct 2017 13:22:16 +0300 +Subject: [PATCH] location: disable simulator content under plugins + +Does not build against more recent simulator +--- + src/plugins/position/position.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro +index 1687a9d..347963f 100644 +--- a/src/plugins/position/position.pro ++++ b/src/plugins/position/position.pro +@@ -5,7 +5,7 @@ QT_FOR_CONFIG += positioning-private + qtHaveModule(dbus):SUBDIRS += geoclue + qtConfig(gypsy):SUBDIRS += gypsy + qtConfig(winrt_geolocation):SUBDIRS += winrt +-qtHaveModule(simulator):SUBDIRS += simulator ++#qtHaveModule(simulator):SUBDIRS += simulator + osx|ios|tvos:SUBDIRS += corelocation + android:SUBDIRS += android + win32:qtHaveModule(serialport):SUBDIRS += serialnmea diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index a81e16c..d6ee6a1 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -28,5 +28,7 @@ ############################################################################ PACKAGECONFIG += "geoservices_mapboxgl" -EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" -DEPENDS_append_emulator = " qtsimulator" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-location-disable-simulator-content-under-plugins.patch" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend deleted file mode 100644 index 655364b..0000000 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ /dev/null @@ -1,31 +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$ -## -############################################################################ - -EXTRA_QMAKEVARS_PRE_append_emulator = " SENSORS_PLUGINS=simulator" -DEPENDS_append_emulator = " qtsimulator" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 57c8285..83bead3 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -29,5 +29,3 @@ EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" DEPENDS_append_emulator = " qtsimulator" - -SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" -- cgit v1.2.3-54-g00ecf