Merge remote-tracking branch 'origin/sumo' into thudv5.13.0-beta3

* origin/sumo:
  1811250 remove left over files
  8ec6675 meta-qt5: update layer
  d3a2c68 Make boot2qt demos excludable
  92296c4 meta-qt5: update layer
  8d9c655 poky: update sumo branch to v2.5.3
  3919904 Add sizelimit for the mount script
  0946684 meta-qt5: update layer

Conflicts:
  meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-mediaplayer_git.bb
  meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
  scripts/manifest.xml

Change-Id: I658b3e8cd3faee142fdb249c10c91d7e01dcf3a3

23 files changed, 379 insertions, 90 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
index 4719b4c7..d0e6ee62 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -44,6 +44,8 @@ PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
index 7bfb388c..7ab090aa 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
@@ -44,5 +44,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index c7aa169f..f3f59ec5 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -44,5 +44,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
index ecd01dab..dab6b814 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
@@ -41,3 +41,5 @@ PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
+
+BOOT2QT_DEMOS_remove = "boot2qt-demo-qtgraphicaleffects boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
index bcd4f7f8..eeba4a50 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
@@ -38,4 +38,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-warp7"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 KERNEL_DEVICETREE = "imx7d-warp.dtb"
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
index 0d225fa1..f8e2b128 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
@@ -36,3 +36,4 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
index 4429fa98..558efe87 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
@@ -33,5 +33,7 @@ DEPLOY_CONF_NAME = "Raspberry Pi"
 
 DISTRO_FEATURES_remove = "webengine"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser"
+
 # additional memory for GPU
 GPU_MEM = "128"
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
index 647e5973..4adb9958 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
@@ -33,5 +33,7 @@ DEPLOY_CONF_NAME = "Raspberry Pi Zero"
 
 DISTRO_FEATURES_remove = "webengine"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser"
+
 # additional memory for GPU
 GPU_MEM = "128"
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 2e46a323..33cb22b7 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -34,10 +34,20 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+BOOT2QT_DEMOS ?= "\
+    boot2qt-demo-ebike \
+    boot2qt-demo-mediaplayer \
+    boot2qt-demo-qtcharts \
+    boot2qt-demo-qtgraphicaleffects \
+    boot2qt-demo-qtquickcontrols2 \
+    boot2qt-demo-qtvirtualkeyboard \
+    ${@bb.utils.contains("DISTRO_FEATURES", "webengine", "boot2qt-demo-qtwebbrowser", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
+    "
+
 RDEPENDS_${PN} += " \
     boot2qt-appcontroller \
     boot2qt-launcher \
-    boot2qt-demos \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
+    ${BOOT2QT_DEMOS} \
     qdb \
     "
diff --git a/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/automotivedemo.service b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
deleted file mode 100644
index af232136..00000000
--- a/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=AutomotiveDemo
-After=dbus.service dbus-session.service systemd-user-sessions.service
-Conflicts=neptune.service
-
-[Service]
-ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml
-Restart=on-failure
-WorkingDirectory=/opt/automotivedemo
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
deleted file mode 100644
index 1025cc17..00000000
--- a/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=AutomotiveDemo
-After=dbus.service dbus-session.service systemd-user-sessions.service
-Conflicts=neptune.service
-
-[Service]
-ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml
-Restart=on-failure
-WorkingDirectory=/opt/automotivedemo
-Environment=QT_QPA_EGLFS_KMS_CONFIG=kms_config.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-ebike-datacollector_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-ebike-datacollector_git.bb
new file mode 100644
index 00000000..7c232aeb
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-ebike-datacollector_git.bb
@@ -0,0 +1,51 @@
+############################################################################
+##
+## Copyright (C) 2019 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 = "Boot to Qt Demo - E-Bike DataCollector"
+LICENSE = "(LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+require boot2qt-demo.inc
+
+S = "${WORKDIR}/git/basicsuite/datacollector"
+
+DEPENDS += "qtbase"
+
+SRC_URI += " \
+    file://ebikedata.service \
+    "
+
+do_install_append() {
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/ebikedata.service ${D}${systemd_unitdir}/system
+}
+
+SYSTEMD_SERVICE_${PN} = "ebikedata.service"
+
+inherit systemd
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-ebike_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-ebike_git.bb
new file mode 100644
index 00000000..384c96b1
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-ebike_git.bb
@@ -0,0 +1,39 @@
+############################################################################
+##
+## Copyright (C) 2019 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 = "Boot to Qt Demo - E-Bike"
+LICENSE = "(LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+require boot2qt-demo.inc
+
+S = "${WORKDIR}/git/basicsuite/ebike-ui"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2 qtlocation qtcharts"
+RDEPENDS_${PN} = "boot2qt-demo-ebike-datacollector"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-mediaplayer_git.bb
index 8c0237b6..ef8d2ec6 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-mediaplayer_git.bb
@@ -27,27 +27,20 @@
 ##
 ############################################################################
 
-DESCRIPTION = "Boot to Qt Demos"
+DESCRIPTION = "Boot to Qt Demo - Mediaplayer"
 LICENSE = "BSD | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
-inherit qmake5
+require boot2qt-demo.inc
 
-QT_GIT_PROJECT=""
+S = "${WORKDIR}/git/basicsuite/mediaplayer"
 
-SRC_URI = " \
-    ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \
+SRC_URI += " \
     https://qt-files.s3.amazonaws.com/examples/Videos/Qt+for+Designers+and+Developers.mp4;name=video1 \
     https://qt-files.s3.amazonaws.com/examples/Videos/Qt+for+Device+Creation.mp4;name=video2 \
     https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \
     "
 
-PV = "5.13.0+git${SRCPV}"
-
-BRANCH = "5.13"
-
-SRCREV = "0ea39397893edb54454bfceabde4b83fc5b60a2e"
-
 SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da"
 SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a"
 SRC_URI[video2.md5sum] = "828f4babda370b5d73688ff833e95583"
@@ -55,51 +48,11 @@ SRC_URI[video2.sha256sum] = "eba7d3322e63ce47c3433e920f423febfc3533ab05d13ca2f09
 SRC_URI[video3.md5sum] = "00966663950a8e7ddcfd6def2a87d57a"
 SRC_URI[video3.sha256sum] = "b20ba98464e85cb979f1c505387b0407c4fbec2eaa2170d1360a77ec4c1c2700"
 
-S = "${WORKDIR}/git/basicsuite"
-
-DEPENDS = " \
-    qtbase qtdeclarative qtxmlpatterns qtquickcontrols2 qtgraphicaleffects qtmultimedia qtcharts qtlocation \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'qtdeclarative-native', '', d)} \
-    "
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
 
 do_install_append() {
-    # we only need plugins from the demos
-    rm -rf ${D}/data/user/camera
-    rm -rf ${D}/data/user/sensorexplorer
-    rm -rf ${D}/data/user/qtwebbrowser
-
-    # we need all qml and content files from the demos we want to use
-    cp -r ${S}/datacollector ${D}/data/user/qt/
-    cp -r ${S}/ebike-ui ${D}/data/user/qt/
-    cp -r ${S}/enterprise-charts ${D}/data/user/qt/
-    cp -r ${S}/graphicaleffects ${D}/data/user/qt/
-    cp -r ${S}/launchersettings ${D}/data/user/qt/
-    cp -r ${S}/mediaplayer ${D}/data/user/qt/
-    cp -r ${S}/qtquickcontrols2 ${D}/data/user/qt/
-    cp -r ${S}/textinput ${D}/data/user/qt/
-    cp -r ${S}/shared ${D}/data/user/qt/
-    cp -r ${S}/qtwebbrowser ${D}/data/user/qt/
-    cp ${S}/demos.xml ${D}/data/user/qt/
-
-    # but none of the source files
-    find ${D}/data/user/qt/ \( -name '*.cpp' -or -name '*.h' -or -name '*.pro' \) -delete
-    rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser
-    rm -rf ${D}/data/user/qt/qtwebbrowser/qmldir
-
     install -d -m 0755 ${D}/data/videos
     install -m 0644 ${WORKDIR}/*.mp4 ${D}/data/videos
 }
 
-FILES_${PN} += " \
-    /data/images/ \
-    /data/videos/ \
-    /data/user \
-    "
-
-FILES_${PN}-dbg += " \
-    /data/user/qt/qmlplugins/*/.debug/ \
-    "
-FILES_${PN}-staticdev += " \
-    /data/user/qt/qmlplugins/*/*.a \
-    "
+FILES_${PN} += "/data/videos/"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtcharts_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtcharts_git.bb
new file mode 100644
index 00000000..04330bc9
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtcharts_git.bb
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 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 = "Boot to Qt Demo - QtCharts"
+LICENSE = "BSD | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+require boot2qt-demo.inc
+
+S = "${WORKDIR}/git/basicsuite/enterprise-charts/"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2 qtcharts"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtgraphicaleffects_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtgraphicaleffects_git.bb
new file mode 100644
index 00000000..e36a005b
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtgraphicaleffects_git.bb
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 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 = "Boot to Qt Demo - QtGraphicalEffects"
+LICENSE = "BSD | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+require boot2qt-demo.inc
+
+S = "${WORKDIR}/git/basicsuite/graphicaleffects/"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtquickcontrols2_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtquickcontrols2_git.bb
new file mode 100644
index 00000000..b832f0ac
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtquickcontrols2_git.bb
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 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 = "Boot to Qt Demo - QtQuickControls2"
+LICENSE = "BSD | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+require boot2qt-demo.inc
+
+S = "${WORKDIR}/git/basicsuite/qtquickcontrols2"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtvirtualkeyboard_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtvirtualkeyboard_git.bb
new file mode 100644
index 00000000..a80c911c
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtvirtualkeyboard_git.bb
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 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 = "Boot to Qt Demo - QtVirtualKeyboard"
+LICENSE = "BSD | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+require boot2qt-demo.inc
+
+S = "${WORKDIR}/git/basicsuite/textinput"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2 qtvirtualkeyboard"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtwebbrowser_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtwebbrowser_git.bb
new file mode 100644
index 00000000..0ebb01d0
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo-qtwebbrowser_git.bb
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 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 = "Boot to Qt Demo - QtWebBrowser"
+LICENSE = "BSD | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+require boot2qt-demo.inc
+
+S = "${WORKDIR}/git/basicsuite/qtwebbrowser"
+
+DEPENDS += "qtbase qtdeclarative qtwebengine"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc
new file mode 100644
index 00000000..40fb8753
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc
@@ -0,0 +1,54 @@
+############################################################################
+##
+## Copyright (C) 2019 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$
+##
+############################################################################
+
+inherit qmake5
+
+QT_GIT_PROJECT = ""
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/boot2qt-demos:"
+
+SRC_URI = " \
+    ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH} \
+    "
+
+PV = "5.13.0+git${SRCPV}"
+
+BRANCH = "5.13"
+
+SRCREV = "c10b4e842adaf096bf46ed5f98e236f3fee87870"
+
+FILES_${PN} += " \
+    /data/user \
+    "
+FILES_${PN}-dbg += " \
+    /data/user/qt/qmlplugins/*/.debug/ \
+    "
+FILES_${PN}-staticdev += " \
+    /data/user/qt/qmlplugins/*/*.a \
+    "
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/ebikedata.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos/ebikedata.service
index 47c97c43..47c97c43 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/ebikedata.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos/ebikedata.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 e067b57d..68fcdb9f 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -40,10 +40,9 @@ SRC_URI += " \
     file://b2qt-startup.sh \
     file://qtlauncher.service \
     file://b2qt.service \
-    file://ebikedata.service \
     "
 
-SRCREV = "747d70eaa865aad25b0ee680a0090c059a0549a9"
+SRCREV = "04cecef50d9316d98c11e8b82be5a492ef9bde70"
 
 DEPENDS = "\
     qtbase qtdeclarative qtquickcontrols2 \
@@ -58,12 +57,11 @@ 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 ebikedata.service"
+SYSTEMD_SERVICE_${PN} = "qtlauncher.service b2qt.service"
 
 inherit update-rc.d systemd
diff --git a/scripts/mount-image.sh b/scripts/mount-image.sh
index 434530d6..b6dff84f 100755
--- a/scripts/mount-image.sh
+++ b/scripts/mount-image.sh
@@ -48,8 +48,12 @@ mkdir -p root
 
 sudo umount boot root || true
 
-OFFSET=$(parted "${IMAGE}" unit B print | grep "^ 1" | awk {'print $2'} | cut -d B -f 1)
-sudo mount -o loop,offset=${OFFSET} "${IMAGE}" boot
-
-OFFSET=$(parted "${IMAGE}" unit B print | grep "^ 2" | awk {'print $2'} | cut -d B -f 1)
-sudo mount -o loop,offset=${OFFSET} "${IMAGE}" root
+PARTITION=$(parted "${IMAGE}" unit B print | grep "^ 1")
+OFFSET=$(echo ${PARTITION} | awk {'print $2'} | cut -d B -f 1)
+SIZE=$(echo ${PARTITION}| awk {'print $4'} | cut -d B -f 1)
+sudo mount -o loop,offset=${OFFSET},sizelimit=${SIZE} "${IMAGE}" boot
+
+PARTITION=$(parted "${IMAGE}" unit B print | grep "^ 2")
+OFFSET=$(echo ${PARTITION}| awk {'print $2'} | cut -d B -f 1)
+SIZE=$(echo ${PARTITION}| awk {'print $4'} | cut -d B -f 1)
+sudo mount -o loop,offset=${OFFSET},sizelimit=${SIZE} "${IMAGE}" root