boot2qt-addons: update launcher & demos

- Updated boot2qt-demos to latest version
- Updated launcher version
- e-bike demo added to launcher

Task-number: QTBUG-67917
Change-Id: Id8f53f0aae39de71d28884338fb882ca7b201dc3
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>

3 files changed, 16 insertions, 4 deletions

diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index 0c1f142..b410927 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -42,12 +42,12 @@ SRC_URI = " \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
     "
 
-PV = "5.11.0+git${SRCPV}"
+PV = "5.11.1+git${SRCPV}"
 
 BRANCH = "5.11"
 BROWSER_BRANCH = "dev"
 
-SRCREV_demos = "6ed3d300c256a0b75c5cca1f57263f064bf31e42"
+SRCREV_demos = "054a2eabcae4a3eb6f7036b0706a96ed0c1f9a00"
 SRCREV_qtwebbrowser = "09d629199fa153ea7954321d81f647d5eb52fb6c"
 SRCREV_FORMAT = "demos_qtwebbrowser"
 
@@ -58,7 +58,7 @@ SRC_URI[video2.sha256sum] = "651e0b4d2b3272dc10bfc9edba4f0c1a7084cd087c75e8a098f
 
 S = "${WORKDIR}/git/basicsuite"
 
-DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols2 qtgraphicaleffects qtmultimedia \
+DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols2 qtgraphicaleffects qtmultimedia qtcharts \
            ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 
 do_install_append() {
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/ebikedata.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/ebikedata.service
new file mode 100644
index 0000000..47c97c4
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/ebikedata.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=B2Qt ebike demo data collector daemon
+ConditionPathExists=!/usr/bin/b2qt
+
+[Service]
+ExecStart=/data/user/qt/datacollector/datacollector
+KillSignal=SIGKILL
+
+[Install]
+WantedBy=qtlauncher.service
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
index 60abb71..eaf0fbc 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -40,6 +40,7 @@ SRC_URI += " \
     file://b2qt-startup.sh \
     file://qtlauncher.service \
     file://b2qt.service \
+    file://ebikedata.service \
     "
 
 SRCREV = "b97aefc4961afd953ae698ac3cdd35f842c44b91"
@@ -54,11 +55,12 @@ do_install_append() {
     install -m 0755 -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/qtlauncher.service ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/b2qt.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/ebikedata.service ${D}${systemd_unitdir}/system/
 }
 
 INITSCRIPT_NAME = "b2qt-startup.sh"
 INITSCRIPT_PARAMS = "defaults 30"
 
-SYSTEMD_SERVICE_${PN} = "qtlauncher.service b2qt.service"
+SYSTEMD_SERVICE_${PN} = "qtlauncher.service b2qt.service ebikedata.service"
 
 inherit update-rc.d systemd