330 files changed, 2110 insertions, 1031 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index d4dbbdf..5b2d630 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -106,10 +106,16 @@ get_groups() {
    all)
      PROJECT_GROUPS="external"
    ;;
+    apalis-imx8|imx8qmlpddr4arm2)
+      PROJECT_GROUPS="fsl-imx8"
+    ;;
    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
      PROJECT_GROUPS="toradex"
    ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
+    nitrogen6x|nitrogen7)
+      PROJECT_GROUPS="boundary"
+    ;;
+    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
      PROJECT_GROUPS="fsl"
    ;;
    smarc-samx6i)
@@ -130,7 +136,7 @@ get_groups() {
    emulator)
      PROJECT_GROUPS="emulator"
    ;;
-    jetson-tx1|jetson-tk1)
+    jetson-tx1|jetson-tx2|jetson-tk1)
      PROJECT_GROUPS="jetson"
    ;;
    salvator-x|h3ulcb|m3ulcb)
@@ -150,7 +156,7 @@ get_groups() {
 list_devices() {
  echo "Available device configurations:"
-  for device in $(ls $DIR/conf/distro/include/*.conf); do
+  for device in $(ls ${DIR}/meta-boot2qt-distro/conf/distro/include/*.conf); do
    echo "  $(basename ${device%%.conf})"
  done
 }
@@ -188,10 +194,6 @@ init() {
    ln -s ${DIR} sources/meta-boot2qt
  fi
-  if [ ! -e "sources/meta-qt5" ]  && [ -e "${DIR}/../meta-qt5" ]; then
-    ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5
-  fi
  if [ ! -e "setup-environment.sh" ]; then
    ln -s ${DIR}/scripts/setup-environment.sh setup-environment.sh
  fi
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
deleted file mode 100644
index 3a1bcbe..0000000
--- a/classes/qtquickcompiler.bbclass
+++ /dev/null
@@ -1,53 +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$
-##
-############################################################################
-python __anonymous() {
-    if d.getVar('DISABLE_QTQUICKCOMPILER', True) == "1":
-        return
-    provider = ""
-    sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
-    pn = d.getVar("PN", True)
-    if d.getVar('ENABLE_QTQUICKCOMPILER', True) == "1":
-        provider = "qtquickcompiler"
-    elif os.path.isdir(sdk_path):
-        provider = "qtquickcompiler-sdk"
-    else:
-        bb.note("qtquickcompiler not enabled for %s" % pn)
-        return
-    if "toolchain-host" in pn:
-        d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider)
-    if "toolchain-target" in pn:
-        d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider)
-    else:
-        d.appendVar('DEPENDS', " %s %s-native" % (provider, provider))
-        d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler")
-}
diff --git a/classes/remove-libtool.bbclass b/classes/remove-libtool.bbclass
deleted file mode 100644
index 0d7bd21..0000000
--- a/classes/remove-libtool.bbclass
+++ /dev/null
@@ -1,11 +0,0 @@
-# This class removes libtool .la files after do_install
-REMOVE_LIBTOOL_LA ?= "1"
-remove_libtool_la() {
-    if [ "${REMOVE_LIBTOOL_LA}" != "0" ]; then
-        find "${D}" -ignore_readdir_race -name "*.la" -delete
-    fi
-}
-do_install[postfuncs] += "remove_libtool_la"
diff --git a/classes/qmake5_paths.bbclass b/meta-boot2qt-distro/classes/qmake5_paths.bbclass
index 32c7716..32c7716 100644
--- a/classes/qmake5_paths.bbclass
+++ b/meta-boot2qt-distro/classes/qmake5_paths.bbclass
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
new file mode 100644
index 0000000..14d9c0b
--- /dev/null
+++ b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
@@ -0,0 +1,54 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-poky \
+  ${BSPDIR}/sources/meta-boundary \
+  ${BSPDIR}/sources/meta-freescale \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
+  "
diff --git a/conf/bblayers.conf.emulator.sample b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample
index 381c488..bf32887 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample
@@ -43,7 +43,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample
new file mode 100644
index 0000000..504577d
--- /dev/null
+++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample
@@ -0,0 +1,55 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-poky \
+  ${BSPDIR}/sources/meta-fsl-bsp-release/imx/meta-bsp \
+  ${BSPDIR}/sources/meta-fsl-bsp-release/imx/meta-sdk \
+  ${BSPDIR}/sources/meta-freescale \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
+  "
diff --git a/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
index 389cb82..e6afe33 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
@@ -45,7 +45,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
index e6094d6..efe626a 100644
--- a/conf/bblayers.conf.intel.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
@@ -44,7 +44,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-intel-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
index 969f071..eccc371 100644
--- a/conf/bblayers.conf.jetson.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
@@ -44,7 +44,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample
index c1ac918..d042805 100644
--- a/conf/bblayers.conf.nvidia-tegra.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample
@@ -45,7 +45,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-nvidia-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.rcar-gen3.sample b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
index 8f7a3c4..6f502ea 100644
--- a/conf/bblayers.conf.rcar-gen3.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
@@ -46,7 +46,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
index e376bea..c701d0e 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
@@ -44,7 +44,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.sample b/meta-boot2qt-distro/conf/bblayers.conf.sample
index 381c488..bf32887 100644
--- a/conf/bblayers.conf.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.sample
@@ -43,7 +43,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
diff --git a/conf/bblayers.conf.smx6.sample b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample
index 4c634ec..5a09ec9 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample
@@ -46,7 +46,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
  ${BSPDIR}/sources/meta-boot2qt/meta-smx6-extras \
  ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.ti.sample b/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
index d97a613..47260a4 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
@@ -45,7 +45,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.toradex.sample b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
index a8f4f43..f30ba79 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
@@ -47,7 +47,8 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
  ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index 3048fff..1aa4bd5 100644
--- a/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -54,6 +54,8 @@ SYSVINIT_ENABLED_GETTYS = ""
 DISTRO_FEATURES_DEFAULT_remove = "irda pcmcia pci 3g nfc zeroconf x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
+DISTRO_FEATURES_FILTER_NATIVESDK_append = " wayland"
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
@@ -74,8 +76,6 @@ OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
 # Disable SHA validation for branch
 QT_MODULE_BRANCH_PARAM = "nobranch=1"
-PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
 IMAGE_FSTYPES = "conf"
 IMAGE_CLASSES += "image_types_sdcard deploy-conf"
diff --git a/conf/distro/include/am335x-evm.conf b/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
index 4ec3e4d..4ec3e4d 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
diff --git a/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index bdb57d8..bdb57d8 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
new file mode 100644
index 0000000..d570e3a
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
@@ -0,0 +1,62 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+include conf/distro/include/fsl.inc
+DEPLOY_CONF_NAME = "Toradex Apalis iMX8"
+SERIAL_CONSOLE = "115200 ttyLP1"
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
+RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
+RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
+BBMASK += "\
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa/alsa-lib_%.bbappend \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
+    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
+    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
+    meta-freescale/recipes-graphics/wayland/weston \
+    "
+KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
+EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
+MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
diff --git a/conf/distro/include/beagleboard.conf b/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
index d9b92f0..d9b92f0 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
diff --git a/conf/distro/include/beaglebone.conf b/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
index 099be56..099be56 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index 430999a..c8f5424 100644
--- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,11 +27,17 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+include conf/distro/include/fsl.inc
-SRC_URI_append_beagleboard = " file://fixed_mac_address"
+BBMASK += " \
+    meta-boundary/recipes-browser/chromium \
+    meta-boundary/recipes-core/init-ifupdown \
+    meta-boundary/recipes-mozilla/firefox \
+    "
-do_install_append_beagleboard() {
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/fixed_mac_address ${D}${sysconfdir}/network/if-pre-up.d/
+MACHINE_EXTRA_INSTALL += "\
-}
+    kernel-module-qcacld \
+    linux-firmware-bdsdmac-wlan \
+    "
diff --git a/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index 814676b..814676b 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
diff --git a/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index 6e80e00..4e0daa7 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -41,3 +41,6 @@ PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 DISTRO_FEATURES_remove = "webengine wayland"
+# 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/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
index e4c025b..e4c025b 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
diff --git a/conf/distro/include/emulator.conf b/meta-boot2qt-distro/conf/distro/include/emulator.conf
index a749086..b6125ae 100644
--- a/conf/distro/include/emulator.conf
+++ b/meta-boot2qt-distro/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/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index 32fec1b..32fec1b 100644
--- a/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
diff --git a/conf/distro/include/h3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf
index ddb40e0..ddb40e0 100644
--- a/conf/distro/include/h3ulcb.conf
+++ b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf
diff --git a/conf/distro/include/h3ulcb.pre.inc b/meta-boot2qt-distro/conf/distro/include/h3ulcb.pre.inc
index ad1e9aa..ad1e9aa 100644
--- a/conf/distro/include/h3ulcb.pre.inc
+++ b/meta-boot2qt-distro/conf/distro/include/h3ulcb.pre.inc
diff --git a/conf/distro/include/imx6dlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
index af49983..af49983 100644
--- a/conf/distro/include/imx6dlsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
diff --git a/conf/distro/include/imx6qsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
index 683c601..683c601 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
diff --git a/conf/distro/include/imx7dsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf
index 962077c..962077c 100644
--- a/conf/distro/include/imx7dsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf
diff --git a/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
index fdd7f17..1d30445 100644
--- a/conf/distro/include/imx7s-warp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
@@ -35,3 +35,5 @@ PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 DISTRO_FEATURES_remove = "webengine wayland"
+KERNEL_DEVICETREE = "imx7d-warp.dtb"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf b/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
new file mode 100644
index 0000000..9940d75
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
@@ -0,0 +1,67 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+include conf/distro/include/fsl.inc
+DEPLOY_CONF_NAME = "NXP iMX8QM"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
+RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
+RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
+BBMASK += "\
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa/alsa-lib_%.bbappend \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
+    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
+    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
+    meta-freescale/recipes-graphics/wayland/weston \
+    "
+SRC_URI_remove_pn-imx-boot = "\
+    file://0001-add-board-support-for-DCD-memory-timings.patch \
+    file://0002-add-memory-timings-for-Apalis-iMX8.patch \
+    "
+KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
+EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
+MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
diff --git a/conf/distro/include/intel-corei7-64.conf b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
index 0c8200a..0c8200a 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
diff --git a/conf/distro/include/jetson-tx1.conf b/meta-boot2qt-distro/conf/distro/include/jetson-tx1.conf
index 80435f3..ca82ab0 100644
--- a/conf/distro/include/jetson-tx1.conf
+++ b/meta-boot2qt-distro/conf/distro/include/jetson-tx1.conf
@@ -29,16 +29,4 @@
 DEPLOY_CONF_NAME = "NVIDIA Jetson TX1"
-# use mmc0
+include conf/distro/include/jetson.inc
-ROOTFS_DEVICE = "mmcblk1p1"
-INITRAMFS_MAXSIZE = "165888"
-IMAGE_CLASSES += "image_types_tegra"
-IMAGE_FSTYPES += "tegraflash"
-IMAGE_ROOTFS_ALIGNMENT = "1024"
-UBOOT_SUFFIX = "bin"
-QBSP_IMAGE_CONTENT = "\
-    ${IMAGE_LINK_NAME}.img \
-    ${IMAGE_LINK_NAME}.conf \
-    "
diff --git a/recipes/gnutls/gnutls_3.%.bbappend b/meta-boot2qt-distro/conf/distro/include/jetson-tx2.conf
index 8d91bb0..7ab3fb0 100644
--- a/recipes/gnutls/gnutls_3.%.bbappend
+++ b/meta-boot2qt-distro/conf/distro/include/jetson-tx2.conf
@@ -27,6 +27,6 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+DEPLOY_CONF_NAME = "NVIDIA Jetson TX2"
-SRC_URI += "file://check_SYS_getrandom.patch"
+include conf/distro/include/jetson.inc
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
new file mode 100644
index 0000000..e3e0292
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -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$
+##
+############################################################################
+PREFERRED_PROVIDER_libdrm-tegra = "libdrm-tegra"
+# use mmc0
+ROOTFS_DEVICE = "mmcblk1p1"
+INITRAMFS_MAXSIZE = "165888"
+IMAGE_CLASSES += "image_types_tegra"
+IMAGE_FSTYPES += "tegraflash"
+IMAGE_ROOTFS_ALIGNMENT = "1024"
+UBOOT_SUFFIX = "bin"
+QBSP_IMAGE_CONTENT = "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
+    ${IMAGE_LINK_NAME}.flasher.tar.gz \
+    "
+BBMASK += "\
+    meta-tegra/recipes-graphics/drm \
+    meta-tegra/external/openembedded-layer/recipes-support/opencv \
+    "
diff --git a/conf/distro/include/m3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf
index cff7893..cff7893 100644
--- a/conf/distro/include/m3ulcb.conf
+++ b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf
diff --git a/conf/distro/include/m3ulcb.pre.inc b/meta-boot2qt-distro/conf/distro/include/m3ulcb.pre.inc
index c0429db..c0429db 100644
--- a/conf/distro/include/m3ulcb.pre.inc
+++ b/meta-boot2qt-distro/conf/distro/include/m3ulcb.pre.inc
diff --git a/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
index 389ac03..894d51d 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,7 +27,7 @@
 ##
 ############################################################################
-include conf/distro/include/fsl.inc
+include conf/distro/include/boundary.inc
 include conf/distro/include/opencv.inc
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
@@ -51,6 +51,8 @@ BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \
                 u-boot-nitrogen6_vm-*.imx:u-boot.nitrogen6_vm \
                "
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary"
 UBOOT_MACHINE = ""
 UBOOT_CONFIG ??= "nit6xlite nit6xlite1g \
                  nitrogen6dl nitrogen6dl2g \
@@ -76,8 +78,6 @@ UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config"
 UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config"
 UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
-EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
 KERNEL_DEVICETREE += "\
    imx6dl-nit6xlite.dtb \
    "
diff --git a/recipes/ca-certificates/ca-certificates_%.bbappend b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
index 210f550..1614b04 100644
--- a/recipes/ca-certificates/ca-certificates_%.bbappend
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,8 +27,12 @@
 ##
 ############################################################################
-SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch"
+include conf/distro/include/boundary.inc
-DEPENDS_class-native = "coreutils-native"
+DEPLOY_CONF_NAME = "Boundary Devices i.MX7"
+PREFERRED_PROVIDER_virtual/egl = "opengldummy"
+PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
+DISTRO_FEATURES_remove = "webengine wayland"
-# for c_rehash
-RDEPENDS_${PN}_class-target += "openssl openssl-misc"
diff --git a/conf/distro/include/opencv.inc b/meta-boot2qt-distro/conf/distro/include/opencv.inc
index a1d37df..a1d37df 100644
--- a/conf/distro/include/opencv.inc
+++ b/meta-boot2qt-distro/conf/distro/include/opencv.inc
diff --git a/conf/distro/include/raspberrypi.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
index 4429fa9..4429fa9 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
diff --git a/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index f980e13..f980e13 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
diff --git a/conf/distro/include/raspberrypi0.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
index 647e597..647e597 100644
--- a/conf/distro/include/raspberrypi0.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
diff --git a/conf/distro/include/raspberrypi2.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi2.conf
index 93215d3..93215d3 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi2.conf
diff --git a/conf/distro/include/raspberrypi3.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi3.conf
index ef090a1..ef090a1 100644
--- a/conf/distro/include/raspberrypi3.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi3.conf
diff --git a/conf/distro/include/rcar-gen3.inc b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
index 4350dda..4350dda 100644
--- a/conf/distro/include/rcar-gen3.inc
+++ b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
diff --git a/conf/distro/include/salvator-x.conf b/meta-boot2qt-distro/conf/distro/include/salvator-x.conf
index c44dbe1..c44dbe1 100644
--- a/conf/distro/include/salvator-x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/salvator-x.conf
diff --git a/conf/distro/include/salvator-x.pre.inc b/meta-boot2qt-distro/conf/distro/include/salvator-x.pre.inc
index e87933c..e87933c 100644
--- a/conf/distro/include/salvator-x.pre.inc
+++ b/meta-boot2qt-distro/conf/distro/include/salvator-x.pre.inc
diff --git a/conf/distro/include/smarc-samx6i.conf b/meta-boot2qt-distro/conf/distro/include/smarc-samx6i.conf
index 240e3dd..240e3dd 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/meta-boot2qt-distro/conf/distro/include/smarc-samx6i.conf
diff --git a/conf/distro/include/tegra-t18x.conf b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
index bde2d16..6c79d2c 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
@@ -71,6 +71,7 @@ PREFERRED_VERSION_nativesdk-linux-libc-headers = "4.4"
 BBMASK += "\
    meta-tegra/recipes-bsp/flashing \
+    meta-vib4/recipes-connectivity/openssl \
    meta-vib4/recipes-core/busybox \
    meta-vib4/recipes-core/glibc \
    meta-vib4/recipes-core/images \
diff --git a/conf/distro/include/ti.inc b/meta-boot2qt-distro/conf/distro/include/ti.inc
index 80f90f2..80f90f2 100644
--- a/conf/distro/include/ti.inc
+++ b/meta-boot2qt-distro/conf/distro/include/ti.inc
diff --git a/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index ef395a1..83b6d45 100644
--- a/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -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,6 +29,12 @@
 include conf/distro/include/fsl.inc
+BBMASK += "\
+   meta-toradex-nxp/recipes-graphics/xorg-xserver \
+   meta-toradex-bsp-common/recipes-devtools/python \
+   meta-toradex-bsp-common/recipes-devtools/e2fsprogs \
+   "
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex"
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf
new file mode 100644
index 0000000..268f6d3
--- /dev/null
+++ b/meta-boot2qt-distro/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+BBFILE_COLLECTIONS += "b2qt-distro"
+BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt-distro = "20"
diff --git a/conf/local.conf.sample b/meta-boot2qt-distro/conf/local.conf.sample
index 166ae94..24c572e 100644
--- a/conf/local.conf.sample
+++ b/meta-boot2qt-distro/conf/local.conf.sample
@@ -150,7 +150,7 @@ DISTRO ?= "b2qt"
 #  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
 #  - 'package_rpm' for rpm style packages
 # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
-# We default to rpm:
+# We default to ipk:
 PACKAGE_CLASSES ?= "package_ipk"
 #
@@ -281,9 +281,6 @@ CONF_VERSION = "1"
 INHERIT += "image-buildinfo"
 INHERIT += "internal-build"
-# Enables use of QtQuickCompiler if you have access to the gerrit project
-#ENABLE_QTQUICKCOMPILER = "1"
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
diff --git a/conf/machine/emulator.conf b/meta-boot2qt-distro/conf/machine/emulator.conf
index 21cd96d..2ab622e 100644
--- a/conf/machine/emulator.conf
+++ b/meta-boot2qt-distro/conf/machine/emulator.conf
@@ -48,3 +48,5 @@ MACHINE_FEATURES += "x86"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d virtualbox-guest-additions"
 MACHINE_FEATURES += "apm alsa pcmcia bluetooth irda usbgadget screen"
+SYSTEMD_DEFAULT_TARGET = "custom.target"
diff --git a/conf/machine/qemuarmv7.conf b/meta-boot2qt-distro/conf/machine/qemuarmv7.conf
index 530f802..530f802 100644
--- a/conf/machine/qemuarmv7.conf
+++ b/meta-boot2qt-distro/conf/machine/qemuarmv7.conf
diff --git a/recipes/alsa/alsa-state.bbappend b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.bbappend
index dbeb030..dbeb030 100644
--- a/recipes/alsa/alsa-state.bbappend
+++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.bbappend
diff --git a/recipes/alsa/alsa-state/emulator/asound.conf b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf
index edd2e82..edd2e82 100644
--- a/recipes/alsa/alsa-state/emulator/asound.conf
+++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf
diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf
index 83f7f9a..83f7f9a 100644
--- a/recipes/alsa/alsa-state/raspberrypi/asound.conf
+++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf
diff --git a/recipes/v86d/v86d/fbsetup b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup
index 064e080..064e080 100755
--- a/recipes/v86d/v86d/fbsetup
+++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup
diff --git a/recipes/v86d/v86d/uvesafb.options.conf b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf
index 7d0dc96..7d0dc96 100644
--- a/recipes/v86d/v86d/uvesafb.options.conf
+++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf
diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend
index bf72dee..bf72dee 100644
--- a/recipes/v86d/v86d_0.1.10.bbappend
+++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend
diff --git a/recipes/connman-conf/connman-conf.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend
index 06dc61d..06dc61d 100644
--- a/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend
diff --git a/recipes/connman-conf/connman-conf/settings b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf/settings
index edfedd4..edfedd4 100644
--- a/recipes/connman-conf/connman-conf/settings
+++ b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf/settings
diff --git a/recipes/connman/connman_%.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
index 0b03755..fda246a 100644
--- a/recipes/connman/connman_%.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
@@ -21,4 +21,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://0001-disable-connman-when-booting-over-nfs.patch"
+SRC_URI += "file://0001-disable-connman-when-booting-over-nfs-${PV}.patch"
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
index f893746..f893746 100644
--- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
new file mode 100644
index 0000000..8b46666
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
@@ -0,0 +1,11 @@
+--- a/src/connman.service.in
+++ b/src/connman.service.in
+@@ -7,6 +7,7 @@
+ Before=network.target multi-user.target shutdown.target
+ Wants=network.target
+ Conflicts=systemd-resolved.service
+ConditionKernelCommandLine=!root=/dev/nfs
+ 
+ [Service]
+ Type=dbus
diff --git a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
index 9aa9648..9aa9648 100644
--- a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
+++ b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
diff --git a/recipes/openssl/openssl_1.%.bbappend b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
index bac366d..bac366d 100644
--- a/recipes/openssl/openssl_1.%.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend b/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend
index e880897..e880897 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend
diff --git a/recipes/base-files/base-files/blacklist.conf b/meta-boot2qt-distro/recipes-core/base-files/base-files/blacklist.conf
index a8b8885..a8b8885 100644
--- a/recipes/base-files/base-files/blacklist.conf
+++ b/meta-boot2qt-distro/recipes-core/base-files/base-files/blacklist.conf
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend
index 1dc5501..1dc5501 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend
diff --git a/recipes/dbus/dbus/dbus-session-address b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session-address
index 3f85306..3f85306 100644
--- a/recipes/dbus/dbus/dbus-session-address
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session-address
diff --git a/recipes/dbus/dbus/dbus-session.init b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.init
index 0690511..0690511 100644
--- a/recipes/dbus/dbus/dbus-session.init
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.init
diff --git a/recipes/dbus/dbus/dbus-session.service b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.service
index 8dcf081..8dcf081 100644
--- a/recipes/dbus/dbus/dbus-session.service
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.service
diff --git a/recipes/dbus/dbus_%.bbappend b/meta-boot2qt-distro/recipes-core/dbus/dbus_%.bbappend
index 64d750c..64d750c 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus_%.bbappend
diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend
index e2550b1..e2550b1 100644
--- a/recipes/initscripts/initscripts_1.0.bbappend
+++ b/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend
diff --git a/recipes/meta/meta-environment.bbappend b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend
index 65cc6b3..65cc6b3 100644
--- a/recipes/meta/meta-environment.bbappend
+++ b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 9f43fff..9f43fff 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb
index 65f7f5e..b6573e2 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb
@@ -52,6 +52,7 @@ RDEPENDS_${PN} = "\
        tzdata-asia \
        tzdata-europe \
        connman \
+        rng-tools \
        ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \
        ${MACHINE_EXTRA_INSTALL} \
        "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb
index b1bec0e..b1bec0e 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb
index af291c7..af291c7 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb
index e8936e4..7644f6f 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb
@@ -44,7 +44,9 @@ RDEPENDS_${PN} = "\
        ldd \
        openssh-sftp-server \
        perf \
+        procps \
        rsync \
        tslib-calibrate \
+        valgrind \
        ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
        "
diff --git a/recipes/systemd/systemd/usb-rndis.network b/meta-boot2qt-distro/recipes-core/systemd/systemd/usb-rndis.network
index d529eeb..d529eeb 100644
--- a/recipes/systemd/systemd/usb-rndis.network
+++ b/meta-boot2qt-distro/recipes-core/systemd/systemd/usb-rndis.network
diff --git a/recipes/systemd/systemd_%.bbappend b/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend
index 96b8910..96b8910 100644
--- a/recipes/systemd/systemd_%.bbappend
+++ b/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross_%.bbappend
index 9d4ef68..8a069ed 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross_%.bbappend
@@ -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.
@@ -27,8 +27,4 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+LDGOLD_sdkmingw32 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}"
-SRC_URI_append_mx6 = " \
-    file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
-    "
diff --git a/recipes/gdb/gdb-cross-canadian_7.%.bbappend b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
index 452753d..4e55e66 100644
--- a/recipes/gdb/gdb-cross-canadian_7.%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
@@ -27,13 +27,30 @@
 ##
 ############################################################################
+FILESEXTRAPATHS_prepend_sdkmingw32 := "${THISDIR}/${BPN}:"
+SRC_URI_append_sdkmingw32 = " file://0001-Do-not-use-win32-specific-filehandling.patch"
 DEPENDS_append_sdkmingw32 = " nativesdk-prebuild-python"
 RDEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python"
 EXTRA_OECONF_remove_sdkmingw32 = "--without-python --with-python=no"
-EXTRA_OECONF_append_sdkmingw32 = " --with-python"
+EXTRA_OECONF_append_sdkmingw32 = " --with-python=${WORKDIR}/python_win"
+CXXFLAGS_append_sdkmingw32 = " -D_hypot=hypot"
+do_configure_prepend_sdkmingw32() {
+cat > ${WORKDIR}/python_win << EOF
+#! /bin/sh
+case "\$2" in
+        --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}" ;;
+        --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -lpython35" ;;
+        --exec-prefix) echo "${exec_prefix}" ;;
+        *) exit 1 ;;
+esac
+exit 0
+EOF
+        chmod +x ${WORKDIR}/python_win
+}
 do_install_append_sdkmingw32() {
-    mkdir -p ${D}${bindir}/lib
+    ln -s ../python35.dll ${D}${bindir}/
-    cp -r ${STAGING_DIR_HOST}${exec_prefix}/lib/python2.7/* -d ${D}${bindir}/lib
+    ln -s ../python35.zip ${D}${bindir}/
-    cp ${STAGING_DIR_HOST}${exec_prefix}/bin/python27.dll ${D}${bindir}
 }
diff --git a/meta-boot2qt-distro/recipes-devtools/gdb/gdb/0001-Do-not-use-win32-specific-filehandling.patch b/meta-boot2qt-distro/recipes-devtools/gdb/gdb/0001-Do-not-use-win32-specific-filehandling.patch
new file mode 100644
index 0000000..c9a20ed
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb/0001-Do-not-use-win32-specific-filehandling.patch
@@ -0,0 +1,24 @@
+From 3c928a3bf8d873f6173a076da6e4c1bc85e9a3a0 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 28 Jun 2017 20:41:49 +0300
+Subject: [PATCH] Do not use win32 specific filehandling
+PyFile_FromString and PyFile_AsFile are no longer available in python3
+see https://sourceware.org/bugzilla/show_bug.cgi?id=15600
+---
+ gdb/python/python.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/gdb/python/python.c b/gdb/python/python.c
+index 9bccaa9..1d58dff 100644
+--- a/gdb/python/python.c
+++ b/gdb/python/python.c
+@@ -374,7 +374,7 @@ python_interactive_command (char *arg, int from_tty)
+ static void
+ python_run_simple_file (FILE *file, const char *filename)
+ {
+-#ifndef _WIN32
+#ifdef _WIN32
+ 
+   PyRun_SimpleFile (file, filename);
+ 
diff --git a/recipes/perl/perl_5.%.bbappend b/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend
index 5f4baf7..5f4baf7 100644
--- a/recipes/perl/perl_5.%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend
diff --git a/recipes/python/python3-native_%.bbappend b/meta-boot2qt-distro/recipes-devtools/python/python3-native_%.bbappend
index 9015f3f..9015f3f 100644
--- a/recipes/python/python3-native_%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/python/python3-native_%.bbappend
diff --git a/recipes/python/python3-virtualenv.bb b/meta-boot2qt-distro/recipes-devtools/python/python3-virtualenv.bb
index cc091b8..cc091b8 100644
--- a/recipes/python/python3-virtualenv.bb
+++ b/meta-boot2qt-distro/recipes-devtools/python/python3-virtualenv.bb
diff --git a/recipes/python/python3_%.bbappend b/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend
index b3a5eb7..b3a5eb7 100644
--- a/recipes/python/python3_%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend
diff --git a/recipes/gperf/gperf_%.bbappend b/meta-boot2qt-distro/recipes-extended/gperf/gperf_%.bbappend
index 6f2651c..6f2651c 100644
--- a/recipes/gperf/gperf_%.bbappend
+++ b/meta-boot2qt-distro/recipes-extended/gperf/gperf_%.bbappend
diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/meta-boot2qt-distro/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
index 955c797..955c797 100644
--- a/recipes/libsdl/libsdl_1.2.15.bbappend
+++ b/meta-boot2qt-distro/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
diff --git a/recipes/mesa/mesa_%.bbappend b/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend
index 35f66f4..35f66f4 100644
--- a/recipes/mesa/mesa_%.bbappend
+++ b/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend
diff --git a/recipes/linux-firmware/linux-firmware_git.bbappend b/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
index 33bcc34..33bcc34 100644
--- a/recipes/linux-firmware/linux-firmware_git.bbappend
+++ b/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
diff --git a/recipes/linux/linux-yocto/snd_intel8x0.cfg b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/snd_intel8x0.cfg
index 6d78f08..6d78f08 100644
--- a/recipes/linux/linux-yocto/snd_intel8x0.cfg
+++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/snd_intel8x0.cfg
diff --git a/recipes/linux/linux-yocto_4.%.bbappend b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto_4.%.bbappend
index 3687f9b..3687f9b 100644
--- a/recipes/linux/linux-yocto_4.%.bbappend
+++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto_4.%.bbappend
diff --git a/recipes/perf/perf.bbappend b/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend
index 487cd41..f8a9591 100644
--- a/recipes/perf/perf.bbappend
+++ b/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,5 +27,4 @@
 ##
 ############################################################################
-PERF_FEATURES_ENABLE = "perf-libunwind"
+PACKAGECONFIG_append = " libunwind"
-EXTRA_OEMAKE_remove = "NO_DWARF=1"
diff --git a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch
new file mode 100644
index 0000000..2c0530e
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch
@@ -0,0 +1,26 @@
+From 804c0ca68e18a3e83ccbf49d0476fce3eb739477 Mon Sep 17 00:00:00 2001
+From: Kari Oikarinen <kari.oikarinen@qt.io>
+Date: Mon, 11 Dec 2017 13:55:27 +0200
+Subject: [PATCH] Increase default playback volume
+It is too quiet otherwise on Apalis iMX6.
+---
+ alsactl/init/default | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/alsactl/init/default b/alsactl/init/default
+index 1c84f3e..af41576 100644
+--- a/alsactl/init/default
+++ b/alsactl/init/default
+@@ -12,7 +12,7 @@
+ 
+ ENV{ppercent}:="75%"
+ ENV{cpercent}:="75%"
+-ENV{pvolume}:="-20dB"
+ENV{pvolume}:="5dB"
+ ENV{cvolume}:="12dB"
+ ENV{has_pmaster_vol}:="false"
+ 
+-- 
+2.11.0
diff --git a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend
new file mode 100644
index 0000000..ddb5c91
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend
@@ -0,0 +1,32 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append_apalis-imx6 = "file://0001-Increase-default-playback-volume.patch"
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
index f42e121..f42e121 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
diff --git a/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base/fix-gstvolume.patch
index d229e95..d229e95 100644
--- a/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base/fix-gstvolume.patch
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base_0.10.%.bbappend
index 646faa5..646faa5 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base_0.10.%.bbappend
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index f42e121..f42e121 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
index e338316..e338316 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
diff --git a/recipes/samba/samba_4.%.bbappend b/meta-boot2qt-distro/recipes-networking/samba/samba_4.%.bbappend
index 4a86809..4a86809 100644
--- a/recipes/samba/samba_4.%.bbappend
+++ b/meta-boot2qt-distro/recipes-networking/samba/samba_4.%.bbappend
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
index 67819d7..67819d7 100644
--- a/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
diff --git a/recipes-qt/images/b2qt-embedded-ci-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
index 32773e1..32773e1 100644
--- a/recipes-qt/images/b2qt-embedded-ci-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb
index d8743a5..d8743a5 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb
diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index 3752fc0..5595cc6 100644
--- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -38,7 +38,7 @@ S = "${WORKDIR}"
 inherit qbsp
-PV := "${@d.getVar('PV', True)[0:5]}"
+PV := "${@d.getVar('PV', True).split('+')[0]}"
 QBSP_NAME = "Automotive ${PV}"
 QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index 1d0b018..dc2873f 100644
--- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -38,7 +38,7 @@ S = "${WORKDIR}"
 inherit qbsp
-PV := "${@d.getVar('PV', True)[0:5]}"
+PV := "${@d.getVar('PV', True).split('+')[0]}"
 VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}"
 QBSP_NAME = "Boot2Qt ${PV}"
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
index 94bf48d..94bf48d 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 65354ad..65354ad 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
index 777bffe..777bffe 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
index 1ba6d97..7ce53c6 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
@@ -31,7 +31,7 @@ DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
-inherit nativesdk packagegroup qtquickcompiler
+inherit nativesdk packagegroup
 RDEPENDS_${PN} += "\
    nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host \
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index c3f07b8..3ce2e79 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
@@ -31,7 +31,7 @@ DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
-inherit nativesdk packagegroup qtquickcompiler
+inherit nativesdk packagegroup
 python __anonymous() {
    overrides = d.getVar("OVERRIDES", True).split(":")
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index bb2e4de..9fe3827 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -35,13 +35,12 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
-    b2qt-appcontroller \
+    boot2qt-appcontroller \
    qtivi \
-    neptune-ui \
+    neptune3-ui \
-    neptune-ui-apps \
+    neptune3-ui-apps \
    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
    gammaray \
-    qmllive-target \
+    qmllive \
-    multiscreen-demo \
+    qdb \
-    qdbd \
    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
index 6ae1ef4..6ae1ef4 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 1fdbcf3..345fbaa 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -35,9 +35,9 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
-    b2qt-appcontroller \
+    boot2qt-appcontroller \
-    b2qt-launcher \
+    boot2qt-launcher \
-    b2qt-demos \
+    boot2qt-demos \
    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
-    qdbd \
+    qdb \
    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 7a22951..83b075b 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -31,7 +31,7 @@ DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
-inherit packagegroup qtquickcompiler
+inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
@@ -75,3 +75,7 @@ RDEPENDS_${PN} += " \
    qtwebchannel-dev \
    qtxmlpatterns-dev \
    "
+RDEPENDS_${PN} += "\
+    ${@ "qtquicktimeline-dev" if (d.getVar("QT_INTERNAL_BUILD")) else "" } \
+    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 8ad37d8..1cdf831 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -73,6 +73,11 @@ RDEPENDS_${PN} += " \
    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine qtwebview', '', d)} \
    qtwebsockets \
    qtwebchannel \
+    qtwebglplugin \
    qtxmlpatterns \
    qtvirtualkeyboard \
    "
+RDEPENDS_${PN} += "\
+    ${@ "qtquicktimeline qmlpreview" if (d.getVar("QT_INTERNAL_BUILD")) else "" } \
+    "
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index d79bf57..2ae2206 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -40,3 +40,5 @@ PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
 fakeroot do_generate_qt_environment_file_mingw32() {
 }
+SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase-native_git.bbappend
index 821c6d3..821c6d3 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase-native_git.bbappend
diff --git a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
index ac4fe40..ac4fe40 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch
new file mode 100644
index 0000000..26c7838
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch
@@ -0,0 +1,25 @@
+From 655618933b78f53bb4338c8b7e3109da780ad3c6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Thu, 23 Nov 2017 11:28:47 +0200
+Subject: [PATCH] disable qt_random_cpu
+The code caused internal compiler error when compiling for mingw32
+Change-Id: Ieba798a9599a6d683c6630c6cd3731b2b909b628
+---
+ src/corelib/global/qrandom.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
+index 6769190..c1a775a 100644
+--- a/src/corelib/global/qrandom.cpp
+++ b/src/corelib/global/qrandom.cpp
+@@ -92,7 +92,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
+#if 0
+ static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW;
+ 
+ #  ifdef Q_PROCESSOR_X86_64
diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
index 43e1685..d29adb2 100644
--- a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
@@ -3,4 +3,4 @@ QMAKE_LIBS_OPENGL_ES2  = -lQtGlesStreamClient
 QMAKE_PLATFORM         += boot2qt
 QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = none
+EGLFS_DEVICE_INTEGRATION = eglfs_emu
diff --git a/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
index cdb6204..cdb6204 100644
--- a/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
index d4c14ca..d4c14ca 100644
--- a/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
new file mode 100644
index 0000000..d4c14ca
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
@@ -0,0 +1,4 @@
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
index f5445e3..f5445e3 100644
--- a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx8/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx8/oe-device-extra.pri
new file mode 100644
index 0000000..7e7cae3
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx8/oe-device-extra.pri
@@ -0,0 +1,5 @@
+QMAKE_CFLAGS_EGL += -DLINUX -DEGL_API_FB
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = eglfs_viv
diff --git a/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
index 6554742..6554742 100644
--- a/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri
index 250c999..250c999 100644
--- a/recipes-qt/qt5/qtbase/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
index 9f64808..9f64808 100644
--- a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri
index ae04468..ae04468 100644
--- a/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
index 4597a84..4597a84 100644
--- a/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
index 0a18a5d..0a18a5d 100644
--- a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index 7685c5a..e7c7adf 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -43,7 +43,6 @@ PACKAGECONFIG += " \
    icu \
    libinput \
    linuxfb \
-    qml-debug \
    sql-sqlite \
    tslib \
    xkbcommon-evdev \
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
index 655364b..d9144a8 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,5 +27,6 @@
 ##
 ############################################################################
-EXTRA_QMAKEVARS_PRE_append_emulator = " SENSORS_PLUGINS=simulator"
+FILES_${PN}-plugins_mingw32 = " \
-DEPENDS_append_emulator = " qtsimulator"
+    ${OE_QMAKE_PATH_PLUGINS}/*/*.dll \
+"
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
new file mode 100644
index 0000000..ad4c7b8
--- /dev/null
+++ b/meta-boot2qt-distro/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 <mikko.gronoff@qt.io>
+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/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
index 2a949eb..d6ee6a1 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
@@ -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.
@@ -27,5 +27,8 @@
 ##
 ############################################################################
-EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
+PACKAGECONFIG += "geoservices_mapboxgl"
-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/qtmultimedia_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend
index fbae3ba..fbae3ba 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtsystems_git.bbappend
index 8ae3521..e8fe1f3 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtsystems_git.bbappend
@@ -29,12 +29,3 @@
 EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
 DEPENDS_append_emulator = " qtsimulator"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4193e7f1d47a858f6b7c0f1ee66161de \
-    file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
index 59fb06b..4f48099 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
@@ -27,6 +27,5 @@
 ##
 ############################################################################
-inherit qtquickcompiler
+PACKAGECONFIG_append = " hunspell"
+RDEPENDS_${PN} += "hunspell-dicts"
-PACKAGECONFIG = "lipi-toolkit lang-all hunspell"
diff --git a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service
new file mode 100644
index 0000000..22c7361
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hardware RNG Entropy Gatherer Daemon
+[Service]
+ExecStart=@SBINDIR@/rngd -f
+SuccessExitStatus=66
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
new file mode 100644
index 0000000..dedddf0
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
@@ -0,0 +1,45 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://rngd.service \
+    "
+inherit systemd
+do_install_append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${systemd_unitdir}/system
+        install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system
+        sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service
+    fi
+}
+SYSTEMD_SERVICE_${PN} = "rngd.service"
diff --git a/classes/abi-arch.bbclass b/meta-boot2qt/classes/abi-arch.bbclass
index 23b9b1c..23b9b1c 100644
--- a/classes/abi-arch.bbclass
+++ b/meta-boot2qt/classes/abi-arch.bbclass
diff --git a/classes/bootfs-image.bbclass b/meta-boot2qt/classes/bootfs-image.bbclass
index c7a25ae..c7a25ae 100644
--- a/classes/bootfs-image.bbclass
+++ b/meta-boot2qt/classes/bootfs-image.bbclass
diff --git a/classes/consistent_timestamps.bbclass b/meta-boot2qt/classes/consistent_timestamps.bbclass
index 1f560c2..1f560c2 100644
--- a/classes/consistent_timestamps.bbclass
+++ b/meta-boot2qt/classes/consistent_timestamps.bbclass
diff --git a/classes/deploy-conf.bbclass b/meta-boot2qt/classes/deploy-conf.bbclass
index 228b1e2..228b1e2 100644
--- a/classes/deploy-conf.bbclass
+++ b/meta-boot2qt/classes/deploy-conf.bbclass
diff --git a/classes/image-hdd.bbclass b/meta-boot2qt/classes/image-hdd.bbclass
index d12f3bf..d12f3bf 100644
--- a/classes/image-hdd.bbclass
+++ b/meta-boot2qt/classes/image-hdd.bbclass
diff --git a/classes/image_dd.bbclass b/meta-boot2qt/classes/image_dd.bbclass
index e05536b..e05536b 100644
--- a/classes/image_dd.bbclass
+++ b/meta-boot2qt/classes/image_dd.bbclass
diff --git a/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass
index 5bd86c2..7dedf87 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/meta-boot2qt/classes/image_types_sdcard.bbclass
@@ -52,17 +52,38 @@ IMAGE_DEPENDS_tegraflash_append = " parted-native:do_populate_sysroot"
 create_tegraflash_pkg_prepend() {
    # Create partition table
    SDCARD=${IMGDEPLOYDIR}/${IMAGE_NAME}.img
-    SDCARD_ROOTFS=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext3
+    SDCARD_ROOTFS=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE}
-    SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT})
+    SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${ROOTFS_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT})
-    dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE})
+    dd if=/dev/zero of=$SDCARD bs=1 count=0 seek=$(expr 1024 \* $SDCARD_SIZE)
-    parted -s ${SDCARD} mklabel gpt
+    parted -s $SDCARD mklabel gpt
-    parted -s ${SDCARD} unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE})
+    parted -s $SDCARD unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE})
-    parted ${SDCARD} print
+    parted $SDCARD print
-    dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
+    dd if=$SDCARD_ROOTFS of=$SDCARD conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
    ln -s ${IMAGE_NAME}.img ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
+# create flash package that utilizes the SD card image
+create_tegraflash_pkg_append() {
+    cd ${WORKDIR}/tegraflash
+    cat > prepare-image.sh <<END
+#!/bin/sh -e
+if [ ! -e "${IMAGE_BASENAME}.img" ]; then
+    dd if=../${IMAGE_LINK_NAME}.img of=${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} skip=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) count=$(expr ${ROOTFS_SIZE} / 1024)
+    ./tegra*-flash/mksparse -v --fillpattern=0 ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} ${IMAGE_BASENAME}.img
+    rm -f ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE}
+fi
+echo "Flash image ready"
+END
+    chmod +x prepare-image.sh
+    rm ${IMAGE_BASENAME}.img
+    cd ..
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_NAME}.flasher.tar.gz
+    tar czhf ${IMGDEPLOYDIR}/${IMAGE_NAME}.flasher.tar.gz tegraflash
+    ln -sf ${IMAGE_NAME}.flasher.tar.gz ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.flasher.tar.gz
+}
diff --git a/classes/internal-build.bbclass b/meta-boot2qt/classes/internal-build.bbclass
index 64c07bf..d842dcb 100644
--- a/classes/internal-build.bbclass
+++ b/meta-boot2qt/classes/internal-build.bbclass
@@ -34,7 +34,7 @@ python enable_internal_build () {
    except:
        return
-    e.data.setVar('ENABLE_QTQUICKCOMPILER', "1")
+    e.data.setVar('QT_INTERNAL_BUILD', "1")
    e.data.prependVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH")
    e.data.prependVar('PREMIRRORS', "\
        ftp://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
index 453d94e..e98565c 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
@@ -83,7 +83,7 @@ EOF
 create_qtcreator_configure_script () {
    # add qtcreator configuration script
-    install -m 0755 ${B2QTBASE}/scripts/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH}
+    install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH}
    sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
    sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
 }
diff --git a/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
index fc64842..8d600d0 100644
--- a/classes/populate_b2qt_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
@@ -46,7 +46,7 @@ replace_sysroot_symlink() {
        done
 }
-do_populate_sysroot[depends] += "p7zip-native:do_populate_sysroot"
+do_populate_sdk[depends] += "p7zip-native:do_populate_sysroot"
 fakeroot tar_sdk_sdkmingw32() {
        replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} ${SDK_OUTPUT}${SDKTARGETSYSROOT}
diff --git a/classes/qbsp-image.bbclass b/meta-boot2qt/classes/qbsp-image.bbclass
index 71d1d45..71d1d45 100644
--- a/classes/qbsp-image.bbclass
+++ b/meta-boot2qt/classes/qbsp-image.bbclass
diff --git a/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index 8b8aa7f..da790bf 100644
--- a/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -43,7 +43,7 @@ SRC_URI = "\
 INHIBIT_DEFAULT_DEPS = "1"
 do_qbsp[depends] += "\
    p7zip-native:do_populate_sysroot \
-    installer-framework:do_populate_sysroot \
+    installer-framework-native:do_populate_sysroot \
    ${QBSP_SDK_TASK}:do_populate_sdk \
    ${QBSP_IMAGE_TASK}:do_image_complete \
    "
diff --git a/classes/qt5-module.bbclass b/meta-boot2qt/classes/qt5-module.bbclass
index e68f95f..e68f95f 100644
--- a/classes/qt5-module.bbclass
+++ b/meta-boot2qt/classes/qt5-module.bbclass
diff --git a/meta-boot2qt/classes/qtquickcompiler.bbclass b/meta-boot2qt/classes/qtquickcompiler.bbclass
new file mode 100644
index 0000000..f54887c
--- /dev/null
+++ b/meta-boot2qt/classes/qtquickcompiler.bbclass
@@ -0,0 +1,30 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler"
diff --git a/classes/sdk-sources.bbclass b/meta-boot2qt/classes/sdk-sources.bbclass
index b12f371..b12f371 100644
--- a/classes/sdk-sources.bbclass
+++ b/meta-boot2qt/classes/sdk-sources.bbclass
diff --git a/conf/layer.conf b/meta-boot2qt/conf/layer.conf
index 4c8757c..43c8441 100644
--- a/conf/layer.conf
+++ b/meta-boot2qt/conf/layer.conf
@@ -31,11 +31,9 @@
 BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes/*/*.bb \
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
-            ${LAYERDIR}/recipes/*/*.bbappend \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
            "
-BBFILES += "${@bb.utils.contains("BBFILE_COLLECTIONS", "qt5-layer", "${LAYERDIR}/recipes-qt/*/*.bb ${LAYERDIR}/recipes-qt/*/*.bbappend" , "", d)}"
 BBFILE_COLLECTIONS += "b2qt"
 BBFILE_PATTERN_b2qt := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt = "20"
@@ -43,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/scripts/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index d6e9c07..7386f70 100755
--- a/scripts/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -85,7 +85,7 @@ fi
 source $CONFIG
 MKSPEC="devices/linux-oe-generic-g++"
-MKSPECPATH=$(find ${OECORE_TARGET_SYSROOT} -name $(basename ${MKSPEC}))
+MKSPECPATH=$(find ${OECORE_TARGET_SYSROOT} -name $(basename ${MKSPEC}) 2>/dev/null || true)
 if [ ! -d "${MKSPECPATH}" ]; then
    echo "Error: could not find mkspec ${MKSPEC} from the toolchain"
    exit 1
diff --git a/files/qbsp/NXP-EULA b/meta-boot2qt/files/qbsp/NXP-EULA
index 8acbf5a..8acbf5a 100644
--- a/files/qbsp/NXP-EULA
+++ b/meta-boot2qt/files/qbsp/NXP-EULA
diff --git a/files/qbsp/base_package.xml b/meta-boot2qt/files/qbsp/base_package.xml
index 5f16dfa..5f16dfa 100644
--- a/files/qbsp/base_package.xml
+++ b/meta-boot2qt/files/qbsp/base_package.xml
diff --git a/files/qbsp/image_package.xml b/meta-boot2qt/files/qbsp/image_package.xml
index 27e5f2e..27e5f2e 100644
--- a/files/qbsp/image_package.xml
+++ b/meta-boot2qt/files/qbsp/image_package.xml
diff --git a/files/qbsp/license_package.xml b/meta-boot2qt/files/qbsp/license_package.xml
index 405ee5c..405ee5c 100644
--- a/files/qbsp/license_package.xml
+++ b/meta-boot2qt/files/qbsp/license_package.xml
diff --git a/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 4afab71..4afab71 100644
--- a/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
diff --git a/files/qbsp/toolchain_package.xml b/meta-boot2qt/files/qbsp/toolchain_package.xml
index 166e09b..166e09b 100644
--- a/files/qbsp/toolchain_package.xml
+++ b/meta-boot2qt/files/qbsp/toolchain_package.xml
diff --git a/licenses/The-Qt-Company-DCLA-2.1 b/meta-boot2qt/licenses/The-Qt-Company-DCLA-2.1
index 5231cb1..5231cb1 100644
--- a/licenses/The-Qt-Company-DCLA-2.1
+++ b/meta-boot2qt/licenses/The-Qt-Company-DCLA-2.1
diff --git a/recipes/initramfs-basic/files/init.sh b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
index 94eb39b..94eb39b 100644
--- a/recipes/initramfs-basic/files/init.sh
+++ b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
diff --git a/recipes/initramfs-basic/init-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
index 25039e7..25039e7 100644
--- a/recipes/initramfs-basic/init-basic.bb
+++ b/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
diff --git a/recipes/initramfs-basic/initramfs-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
index 31388d3..31388d3 100644
--- a/recipes/initramfs-basic/initramfs-basic.bb
+++ b/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
diff --git a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch b/meta-boot2qt/recipes-core/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
index d416543..d416543 100644
--- a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
diff --git a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch b/meta-boot2qt/recipes-core/ostree/ostree/Create-firmware-convenience-symlinks.patch
index 656887d..656887d 100644
--- a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Create-firmware-convenience-symlinks.patch
diff --git a/recipes/ostree/ostree/Mount-boot-partition.patch b/meta-boot2qt/recipes-core/ostree/ostree/Mount-boot-partition.patch
index a81f731..a81f731 100644
--- a/recipes/ostree/ostree/Mount-boot-partition.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Mount-boot-partition.patch
diff --git a/recipes/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch b/meta-boot2qt/recipes-core/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
index f8e7324..f8e7324 100644
--- a/recipes/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
diff --git a/recipes/ostree/ostree/Support-for-booting-without-initramfs.patch b/meta-boot2qt/recipes-core/ostree/ostree/Support-for-booting-without-initramfs.patch
index 4ec137f..4ec137f 100644
--- a/recipes/ostree/ostree/Support-for-booting-without-initramfs.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Support-for-booting-without-initramfs.patch
diff --git a/recipes/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch b/meta-boot2qt/recipes-core/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
index ece69b8..ece69b8 100644
--- a/recipes/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
diff --git a/recipes/ostree/ostree/deploy-add-karg-none-argument.patch b/meta-boot2qt/recipes-core/ostree/ostree/deploy-add-karg-none-argument.patch
index 5eaf68f..5eaf68f 100644
--- a/recipes/ostree/ostree/deploy-add-karg-none-argument.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/deploy-add-karg-none-argument.patch
diff --git a/recipes/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch b/meta-boot2qt/recipes-core/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
index 2800618..2800618 100644
--- a/recipes/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
diff --git a/recipes/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch b/meta-boot2qt/recipes-core/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
index e8c8f16..e8c8f16 100644
--- a/recipes/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
diff --git a/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch b/meta-boot2qt/recipes-core/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
index 5f19007..5f19007 100644
--- a/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
diff --git a/recipes/ostree/ostree.bb b/meta-boot2qt/recipes-core/ostree/ostree_git.bb
index 267289a..e4c8076 100644
--- a/recipes/ostree/ostree.bb
+++ b/meta-boot2qt/recipes-core/ostree/ostree_git.bb
@@ -52,7 +52,7 @@ SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
 S = "${WORKDIR}/git"
-DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
+DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
 # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
 # The production image do not require bash for proper working.
 RDEPENDS_${PN} += "bash"
diff --git a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc
new file mode 100644
index 0000000..3d8c083
--- /dev/null
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc
@@ -0,0 +1,53 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+LICENSE = "PSFv2"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4b8a9367e6bb2acb6f26dc08654f6ee5"
+do_unpack[depends] += "p7zip-native:do_populate_sysroot"
+inherit bin_package nativesdk python3-dir
+PV = "3.5.2"
+S = "${WORKDIR}"
+do_install() {
+    install -d ${D}${includedir}/${PYTHON_DIR}
+    install -m 0644 ${S}/include/* ${D}${includedir}/${PYTHON_DIR}
+    install -d ${D}${libdir}
+    install -m 0644 ${S}/libs/*.a ${D}${libdir}
+    install -d ${D}${bindir}
+    install -m 0644 ${S}/python.exe ${D}${bindir}
+    install -m 0644 ${S}/python35.dll ${D}${bindir}
+    install -m 0644 ${S}/python35.zip ${D}${bindir}
+}
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.bb
index 2fb3f8c..2ff4f76 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.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.
@@ -27,22 +27,16 @@
 ##
 ############################################################################
-DESCRIPTION = "Virtual input plugin for QtSimulator"
+require nativesdk-prebuild-python.inc
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://qvinput.h;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17"
-inherit qt5-module
+COMPATIBLE_HOST = "i686.*-mingw.*"
-SRC_URI = " \
+SRC_URI = "\
-    git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
+    https://download.qt.io/development_releases/prebuilt/python/Python35-win-x86.7z \
+    https://www.python.org/ftp/python/${PV}/python-${PV}-embed-win32.zip;name=bin \
    "
-SRCREV = "011e1c40716c8323f247e927de6640653d6811c4"
+SRC_URI[md5sum] = "3da266445a4e6a93ff1949810141da8f"
-BRANCH = "master"
+SRC_URI[sha256sum] = "b60c49227c6e920904d784681c16ee3591a18824c3abb89613813f93fde1c1f2"
-PV = "1.0+git${SRCPV}"
+SRC_URI[bin.md5sum] = "ad637a1db7cf91e344318d55c94ad3ca"
+SRC_URI[bin.sha256sum] = "75f05800fbe4a8cd6672b268ca53244838684561e03c60c668a7dccb050eb954"
-EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent"
-S = "${WORKDIR}/git/src/helperlibs/vinput"
-DEPENDS = "qtbase qtsimulator"
diff --git a/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb
new file mode 100644
index 0000000..8e69fbd
--- /dev/null
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb
@@ -0,0 +1,42 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+require nativesdk-prebuild-python.inc
+COMPATIBLE_HOST = "x86_64.*-mingw.*"
+SRC_URI = "\
+    https://download.qt.io/development_releases/prebuilt/python/Python35-win-x64.7z \
+    https://www.python.org/ftp/python/${PV}/python-${PV}-embed-amd64.zip;name=bin \
+    "
+SRC_URI[md5sum] = "08766b13bcbdcf8217a98bfc291d549f"
+SRC_URI[sha256sum] = "43e38c8a05dcbc2effd1915dbe2dc2be6e701ebf3eb00d6e45197ee773978124"
+SRC_URI[bin.md5sum] = "f1c24bb78bd6dd792a73d5ebfbd3b20e"
+SRC_URI[bin.sha256sum] = "faefbd98f61c0d87c5683eeb526ae4d4a9ddc369bef27870cfe1c8939329d066"
diff --git a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.service b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.service
index 7c7211f..7c7211f 100644
--- a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.service
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.service
diff --git a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.sh b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.sh
index 80476de..80476de 100755
--- a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.sh
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.sh
diff --git a/recipes/virtualbox/mount-vboxsf_4.3.30.bb b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb
index 1eb2652..1eb2652 100644
--- a/recipes/virtualbox/mount-vboxsf_4.3.30.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb
diff --git a/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.bb
index 00dcaa5..752d8cb 100644
--- a/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.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.
@@ -38,8 +38,8 @@ PR = "${MACHINE_KERNEL_PR}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2"
-SRC_URI[md5sum] = "21eaec9f21477d555559a63761779880"
+SRC_URI[md5sum] = "37ebbd51370841eed8ab80f2f38446d6"
-SRC_URI[sha256sum] = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"
+SRC_URI[sha256sum] = "78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7"
 S = "${WORKDIR}/vbox"
diff --git a/recipes/fonts/otf-noto_git.bb b/meta-boot2qt/recipes-graphics/fonts/otf-noto_git.bb
index 3be53c2..093ee33 100644
--- a/recipes/fonts/otf-noto_git.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/otf-noto_git.bb
@@ -45,8 +45,7 @@ S = "${WORKDIR}/git"
 do_install() {
    install -m 0755 -d ${D}${datadir}/fonts/otf/noto
-    install -m 0644 ${S}/NotoSansCJKsc-*.otf ${D}${datadir}/fonts/otf/noto
+    install -m 0644 ${S}/NotoSansCJKsc-Regular.otf ${D}${datadir}/fonts/otf/noto
-    install -m 0644 ${S}/NotoSansMonoCJKsc-*.otf ${D}${datadir}/fonts/otf/noto
 }
 PACKAGES = "${PN}"
diff --git a/recipes/fonts/ttf-devanagari_2.94.0.bb b/meta-boot2qt/recipes-graphics/fonts/ttf-devanagari_2.94.0.bb
index ee0ea06..ee0ea06 100644
--- a/recipes/fonts/ttf-devanagari_2.94.0.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/ttf-devanagari_2.94.0.bb
diff --git a/recipes/fonts/ttf-freefont_20120503.bb b/meta-boot2qt/recipes-graphics/fonts/ttf-freefont_20120503.bb
index abf9562..abf9562 100644
--- a/recipes/fonts/ttf-freefont_20120503.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/ttf-freefont_20120503.bb
diff --git a/recipes/fonts/ttf-opensans.bb b/meta-boot2qt/recipes-graphics/fonts/ttf-opensans_git.bb
index 08e8421..1d581ac 100644
--- a/recipes/fonts/ttf-opensans.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/ttf-opensans_git.bb
@@ -29,21 +29,22 @@
 SUMMARY = "Open Sans Fonts"
 SECTION = "fonts"
-HOMEPAGE = "https://www.google.com/fonts"
+HOMEPAGE = "https://fonts.google.com"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87"
+LIC_FILES_CHKSUM = "file://apache/opensans/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87"
 INHIBIT_DEFAULT_DEPS = "1"
 inherit allarch fontcache
-SRC_URI = "https://www.google.com/fonts/download?kit=3hvsV99qyKCBS55e5pvb3ltkqrIMaAZWyLYEoB48lSQ;downloadfilename=Open_Sans.zip"
+SRC_URI = "git://github.com/google/fonts"
-# Google packs fonts package on demand which results in unpredictable md5sum, so disable checksum check
+SRCREV = "beaec0837bd21524b57ecb435158f9011fc03999"
-BB_STRICT_CHECKSUM = ""
+S = "${WORKDIR}/git"
 do_install() {
    install -m 0755 -d ${D}${datadir}/fonts/truetype/opensans
-    install -m 0644 ${WORKDIR}/*.ttf ${D}${datadir}/fonts/truetype/opensans
+    install -m 0644 apache/opensans/*.ttf ${D}${datadir}/fonts/truetype/opensans
 }
 PACKAGES = "${PN}"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts_git.bb
index c5140c3..92fd300 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts_git.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 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.
@@ -27,25 +27,31 @@
 ##
 ############################################################################
-DESCRIPTION = "Qt Quick Compiler"
+DESCRIPTION = "Hunspell Dictionaries"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=02f6307ab0d6c4bd38a1540f16ea705d;beginline=1;endline=17"
-inherit qt5-module
+LICENSE = "GPL-2.0 & (GPL-2.0|LGPL-2.1|MPL-1.1)"
+LIC_FILES_CHKSUM = " \
+    file://en/license.txt;md5=686e6cb566fd6382c9fcc7a557bf4544 \
+    file://ar/COPYING.txt;md5=ccafd10563b9ffba693011bf470062c6 \
+"
-SRC_URI = " \
+SRC_URI = "git://github.com/libreoffice/dictionaries.git;branch=libreoffice-5-4-2"
-    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
-    "
-SRCREV = "c7a681d02db3daeacd32e203a46df6415c60515e"
 S = "${WORKDIR}/git"
-DEPENDS = "qtbase qtdeclarative"
+inherit bin_package
-do_install_append() {
+# using branch libreoffice-5.4.2 for dictionaries
-    # Use the EffectivePath instead of installation path
+SRCREV = "28016713cf482d2ac466d03e007ce91ddb8b76aa"
-    sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf
-}
+FILES_${PN} = "${datadir}/hunspell"
-BBCLASSEXTEND = "native nativesdk"
+do_install() {
+    install -m 0755 -d ${D}${datadir}/hunspell
+    install -m 0755 ${S}/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic
+    install -m 0755 ${S}/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff
+    install -m 0755 ${S}/en/en_GB.dic ${D}${datadir}/hunspell
+    install -m 0755 ${S}/en/en_GB.aff ${D}${datadir}/hunspell
+}
diff --git a/recipes/opengldummy/files/egl.cpp b/meta-boot2qt/recipes-graphics/opengldummy/files/egl.cpp
index 7c28b41..7c28b41 100644
--- a/recipes/opengldummy/files/egl.cpp
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/egl.cpp
diff --git a/recipes/opengldummy/files/gles2.cpp b/meta-boot2qt/recipes-graphics/opengldummy/files/gles2.cpp
index 3f632a3..3f632a3 100644
--- a/recipes/opengldummy/files/gles2.cpp
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/gles2.cpp
diff --git a/recipes/opengldummy/files/headers/EGL/egl.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/egl.h
index 99ea342..99ea342 100644
--- a/recipes/opengldummy/files/headers/EGL/egl.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/egl.h
diff --git a/recipes/opengldummy/files/headers/EGL/eglext.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglext.h
index a392b31..a392b31 100644
--- a/recipes/opengldummy/files/headers/EGL/eglext.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglext.h
diff --git a/recipes/opengldummy/files/headers/EGL/eglplatform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglplatform.h
index 572c7d5..572c7d5 100644
--- a/recipes/opengldummy/files/headers/EGL/eglplatform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglplatform.h
diff --git a/recipes/opengldummy/files/headers/GLES2/gl2.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2.h
index f6bed7d..f6bed7d 100644
--- a/recipes/opengldummy/files/headers/GLES2/gl2.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2.h
diff --git a/recipes/opengldummy/files/headers/GLES2/gl2ext.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2ext.h
index 36801be..36801be 100644
--- a/recipes/opengldummy/files/headers/GLES2/gl2ext.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2ext.h
diff --git a/recipes/opengldummy/files/headers/GLES2/gl2platform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2platform.h
index 89d4d44..89d4d44 100644
--- a/recipes/opengldummy/files/headers/GLES2/gl2platform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2platform.h
diff --git a/recipes/opengldummy/files/headers/GLES3/gl3.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3.h
index 81b63bd..81b63bd 100644
--- a/recipes/opengldummy/files/headers/GLES3/gl3.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3.h
diff --git a/recipes/opengldummy/files/headers/GLES3/gl31.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl31.h
index 6fe473d..6fe473d 100644
--- a/recipes/opengldummy/files/headers/GLES3/gl31.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl31.h
diff --git a/recipes/opengldummy/files/headers/GLES3/gl3platform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3platform.h
index b1e869d..b1e869d 100644
--- a/recipes/opengldummy/files/headers/GLES3/gl3platform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3platform.h
diff --git a/recipes/opengldummy/files/headers/KHR/khrplatform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/KHR/khrplatform.h
index d976ab5..d976ab5 100644
--- a/recipes/opengldummy/files/headers/KHR/khrplatform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/KHR/khrplatform.h
diff --git a/recipes/opengldummy/opengldummy.bb b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.bb
index 3f68b17..3f68b17 100644
--- a/recipes/opengldummy/opengldummy.bb
+++ b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.bb
diff --git a/recipes/opengldummy/opengldummy.inc b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.inc
index 720b310..720b310 100644
--- a/recipes/opengldummy/opengldummy.inc
+++ b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.inc
diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/meta-boot2qt/recipes-graphics/opengldummy/qtglesstream-dummy-client.bb
index ad33127..1d4e223 100644
--- a/recipes/opengldummy/qtglesstream-dummy-client.bb
+++ b/meta-boot2qt/recipes-graphics/opengldummy/qtglesstream-dummy-client.bb
@@ -38,6 +38,8 @@ SOLIBMINOR = "0"
 require opengldummy.inc
+inherit nopackages
 S = "${WORKDIR}"
 do_compile() {
diff --git a/recipes-qt/automotive/gammaray_git.bb b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
index 7466822..7676b2d 100644
--- a/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"
+BRANCH = "5.11"
-SRCREV = "87656b9c344077d84682b53ba3e4676e18b57f9e"
+SRCREV = "3b701f3ce0ffb23762271cba9c531775bae941df"
 PV = "${BRANCH}+git${SRCPV}"
 DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \
diff --git a/recipes-qt/automotive/multiscreen-demo/automotivedemo.service b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
index af23213..af23213 100644
--- a/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
+++ b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
diff --git a/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
index 1025cc1..1025cc1 100644
--- a/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
+++ b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
index ef73324..d64a119 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui/neptune.service
@@ -5,7 +5,7 @@ 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/neptune-ui
+WorkingDirectory=/opt/neptune3
 [Install]
 WantedBy=multi-user.target
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index 5fc3965..f6be9cb 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Copyright (C) 2018 Pelagicore AG.
 ## Contact: https://www.qt.io/licensing/
 ##
@@ -28,9 +28,12 @@
 ##
 ############################################################################
-DESCRIPTION = "Neptune IVI UI"
+DESCRIPTION = "Neptune 3 IVI UI"
-LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-DCLA-2.1 )"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82"
+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
@@ -41,26 +44,50 @@ SRC_URI += " \
    file://neptune.service \
    "
-SRCREV = "7b64754e5d1aa3ea3b63347bc5637bae9795e193"
+SRCREV = "716aadcbd88fbaa8f2b7bbf399cde1a4754e0def"
-DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager"
+DEPENDS = "\
-RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \
+    qtbase \
-                  qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \
+    qtdeclarative \
-                  ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+    qttools-native \
+    qtquickcontrols2 \
-EXTRA_QMAKEVARS_PRE += "INSTALL_PREFIX=/opt"
+    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/neptune-ui/apps"
+FILES_${PN}-apps += "/opt/neptune3/apps"
 FILES_${PN} += "\
-    /opt/neptune-ui \
+    /opt/neptune3 \
+    ${datadir}/fonts/ttf \
+    "
+FILES_${PN}-dev += "\
+    /opt/neptune3/lib/*.so \
    "
 SYSTEMD_SERVICE_${PN} = "neptune.service"
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index 54f1188..1b6e02e 100644
--- a/recipes-qt/automotive/qmllive-target_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
@@ -30,21 +30,17 @@
 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
 QT_GIT_PROJECT = "qt-apps"
-QT_MODULE = "qmllive"
 QT_MODULE_BRANCH = "master"
-SRC_URI += " \
+SRCREV = "4d360892c7a21b4b2aad0ec47ef3f60fb0b0b381"
-    file://qmllive-target.patch \
-    "
-SRCREV = "d0d41c71c4691a5f3e2b72e22917f314b4190ffc"
-S = "${WORKDIR}/git/src/runtime"
 DEPENDS = "qtbase qtdeclarative"
+EXTRA_QMAKEVARS_PRE += "CONFIG+=skip-tests CONFIG+=skip-examples"
+EXTRA_QMAKEVARS_POST += "QMAKE_RPATHDIR="
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index ae66e8a..8c41333 100644
--- a/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/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
index 9f6c0c0..9f6c0c0 100644
--- a/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
diff --git a/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index 5cbf131..5c17935 100644
--- a/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"
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb
index 9cc0d37..ed299ac 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -28,7 +28,7 @@
 ############################################################################
 DESCRIPTION = "Qt Web Browser"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
 inherit qmake5
@@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc
 QT_GIT_PROJECT = "qt-apps"
 QT_MODULE_BRANCH = "dev"
-SRCREV = "023733af5523a5ad84359926224fa106001215f4"
+SRCREV = "09d629199fa153ea7954321d81f647d5eb52fb6c"
 DEPENDS = "qtbase qtdeclarative qtwebengine"
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf
index 61818b8..1ef3732 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf
@@ -3,4 +3,5 @@ env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf
index db9fe89..4fa1931 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf
@@ -5,4 +5,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf
index 83f3876..2bc6eca 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf
@@ -3,6 +3,8 @@ env=QT_QPA_EGLFS_HIDECURSOR=1
 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QTGLESSTREAM_DISPLAY=192.168.56.1
+env=SIMULATOR_HOSTNAME=192.168.56.1
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf
index 4608bfe..4e3415f 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf
@@ -6,4 +6,5 @@ env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
 env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf
index 71a4f4f..b27315e 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf
@@ -5,4 +5,5 @@ env=QSG_RENDER_LOOP=basic
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf
index aad2161..0915343 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf
@@ -3,4 +3,5 @@ env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=1
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf
index 0b7ae16..21bb44c 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf
@@ -4,4 +4,5 @@ env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
 env=QSG_RENDER_LOOP=basic
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf
index 4935581..37284de 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf
@@ -4,4 +4,5 @@ env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=QT_QPA_EGLFS_INTEGRATION=none
 env=XDG_RUNTIME_DIR=/tmp
+env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
index 9c52606..82f02be 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
@@ -34,10 +34,9 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginli
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
-SRC_URI = " \
+QT_GIT_PROJECT = "qt-apps"
-    git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;${QT_MODULE_BRANCH_PARAM};protocol=http \
-    file://appcontroller.conf \
+SRC_URI += "file://appcontroller.conf"
-    "
 SRCREV = "5ab7fdbf0845c40418272bafa565295511055d3b"
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index b816a11..e8b97c3 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -33,26 +33,26 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4
 inherit qmake5
-QT_GIT_PROJECT = ""
+QT_GIT_PROJECT=""
 SRC_URI = " \
    ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \
-    ${QT_GIT}qt/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
+    ${QT_GIT}qt/qtcanvas3d.git;branch=${BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
-    ${QT_GIT}qt/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
+    ${QT_GIT}qt/qtquickcontrols.git;branch=${BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
    ${QT_GIT}qt-apps/qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
    "
-PV = "5.9.5+git${SRCPV}"
+PV = "5.11.0+git${SRCPV}"
-BRANCH = "5.7"
+BRANCH = "5.11"
 BROWSER_BRANCH = "dev"
-QT_BRANCH = "5.7"
-SRCREV_demos = "cd9f0c40f30226c7ce1c3259aea8ebca08acfbb8"
+SRCREV_demos = "0909f9baabc446e4a7bb85593e39fad474af88ab"
-SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a"
+SRCREV_qtcanvas3d = "80d7f92b9628076b681e509ddf8eae43cac550d5"
-SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1"
+SRCREV_qtquickcontrols = "710058343297bba7cc44fa2369b7cec742f34cb2"
-SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd"
+SRCREV_qtwebbrowser = "09d629199fa153ea7954321d81f647d5eb52fb6c"
 SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser"
 SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b"
@@ -77,6 +77,7 @@ do_install_append() {
    # 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
    if [ -d ${WORKDIR}/git/images ]; then
        install -d 0755 ${D}/data/images
@@ -87,11 +88,11 @@ do_install_append() {
    install -m 0644 ${WORKDIR}/Qt_video_720p.webm ${D}/data/videos
    install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos
-    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.qml  ${D}/data/user/qt/canvas3d-planets
+    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/planets/*.qml  ${D}/data/user/qt/canvas3d-planets
-    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.js ${D}/data/user/qt/canvas3d-planets
+    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/planets/*.js ${D}/data/user/qt/canvas3d-planets
-    cp -r ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/images ${D}/data/user/qt/canvas3d-planets
+    cp -r ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/planets/images ${D}/data/user/qt/canvas3d-planets
-    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/controls/ControlEventSource.qml ${D}/data/user/qt/canvas3d-planets
+    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/controls/ControlEventSource.qml ${D}/data/user/qt/canvas3d-planets
-    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/3rdparty/*.js ${D}/data/user/qt/canvas3d-planets
+    cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/3rdparty/*.js ${D}/data/user/qt/canvas3d-planets
    # get rid of qrc:/ prefixes and the custom slider
    sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.qml
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt-startup.sh
index 89e4bbb..89e4bbb 100755
--- a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt-startup.sh
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt.service
index f941f91..f941f91 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/b2qt.service
index cdf6480..cdf6480 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/b2qt.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/qtlauncher.service
index 1094675..1094675 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/qtlauncher.service
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/b2qt.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/b2qt.service
new file mode 100644
index 0000000..65fba92
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/b2qt.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=B2Qt user application
+After=multi-user.target
+ConditionPathExists=/usr/bin/b2qt
+[Service]
+ExecStart=-/usr/bin/appcontroller /usr/bin/b2qt
+[Install]
+WantedBy=custom.target
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/qtlauncher.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/qtlauncher.service
new file mode 100644
index 0000000..2b02c87
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/qtlauncher.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=B2Qt Launcher Demo
+After=multi-user.target
+ConditionPathExists=!/usr/bin/b2qt
+[Service]
+ExecStart=-/usr/bin/appcontroller /usr/bin/qtlauncher --applications-root /data/user/qt
+[Install]
+WantedBy=custom.target
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/qtlauncher.service
index 7658ca8..7658ca8 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/qtlauncher.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
index 0a0a21f..e77d7b2 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -35,7 +35,6 @@ inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 QT_GIT_PROJECT = "qt-apps"
-QT_MODULE = "boot2qt-launcher"
 SRC_URI += " \
    file://b2qt-startup.sh \
@@ -43,7 +42,7 @@ SRC_URI += " \
    file://b2qt.service \
    "
-SRCREV = "7ff96b74f8721dbaf50722561770815a4530b6a0"
+SRCREV = "8d7fe0e4b8852a16469a6d0fe910309e8964ab58"
 DEPENDS = "qtbase qtdeclarative \
           ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb
index 3d9a196..3d9a196 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb
diff --git a/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/b2qt-gadget-network.sh
index 3161db7..3161db7 100755
--- a/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/b2qt-gadget-network.sh
diff --git a/recipes-qt/b2qt-addons/qdbd/defaults b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/defaults
index cb4a78f..5ced90d 100644
--- a/recipes-qt/b2qt-addons/qdbd/defaults
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/defaults
@@ -5,3 +5,4 @@ if [ -e /sys/class/net/eth0/address ]; then
 else
  SERIAL=$(hostname)-$(cat /etc/machine-id)
 fi
+export QT_HASH_SEED=0
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
index 15981b0..15981b0 100755
--- a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd.service b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd.service
index be8e701..be8e701 100644
--- a/recipes-qt/b2qt-addons/qdbd/qdbd.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd.service
diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
index c98e682..5615473 100644
--- a/recipes-qt/b2qt-addons/qdbd.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
@@ -37,7 +37,6 @@ inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 QT_GIT_PROJECT = "qt-apps"
-QT_MODULE = "qdb"
 QT_MODULE_BRANCH = "5.9"
 SRC_URI += "file://b2qt-gadget-network.sh \
@@ -46,8 +45,8 @@ SRC_URI += "file://b2qt-gadget-network.sh \
           file://qdbd-init.sh \
          "
-SRCREV = "430e26a747c1df605d1f6b55f4a7f7125d100dca"
+SRCREV = "69f95b6a8d2ca0912a8d502a2b6871109725731e"
-PV = "1.0.0+git${SRCPV}"
+PV = "1.1.0+git${SRCPV}"
 REQUIRED_DISTRO_FEATURES = "systemd"
 DEPENDS = "qtbase"
diff --git a/recipes-qt/qt5-addons/installer-framework_3.0.1.bb b/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb
index 5bc09c0..5bc09c0 100644
--- a/recipes-qt/qt5-addons/installer-framework_3.0.1.bb
+++ b/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb
diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb
index 4d46679..d22e1d0 100644
--- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,19 +27,18 @@
 ##
 ############################################################################
-DESCRIPTION = "QtSimulator"
+DESCRIPTION = "QML Live Preview debug service"
 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://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
-SRC_URI = " \
+SRCREV = "6ae4a9da17e53bbb7c1729c24f58141a33bbcb9b"
-    git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \
-    "
-SRCREV = "0307e85a8d3a8b83a346aa3910e88aabb7b7b2ac"
 BRANCH = "master"
-S = "${WORKDIR}/git"
+SRC_URI = " \
+    git://codereview.qt-project.org/qt/tqtc-qmlpreview;branch=${BRANCH};protocol=ssh \
+    "
-DEPENDS = "qtbase"
+DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index 4a6c8f5..954c484 100644
--- a/recipes-qt/qt5/qtdeviceutilities.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
@@ -39,6 +39,6 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "8f3dfc1e6364fbd1aaf62d2c0aba0e4d6ac1742f"
+SRCREV = "518749701642b9d93773b5599e9a64ecbc640b9a"
 DEPENDS = "qtbase qtdeclarative qtconnectivity"
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.bb
index bbf3d00..0f942e7 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.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,7 +29,7 @@
 DESCRIPTION = "QtGlesStream"
 LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0"
+LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=875f34471470b09977705aed7863e440"
 inherit qt5-module
@@ -38,14 +38,12 @@ SRC_URI = " \
    "
 PV = "1.0.0"
-SRCREV = "114e5a1941f831d082395ed80a017f45d3b71a63"
+SRCREV = "37f98d4b7123378d1ade7beedf5c5150cd26e178"
 BRANCH = "dev"
 S = "${WORKDIR}/git"
 DEPENDS = "qtbase"
-RREPLACES_${PN} = "qtglesstream-dummy-client"
-RREPLACES_${PN}-dev = "qtglesstream-dummy-client-dev"
 do_install_append() {
    install -m 0755 -d ${D}${includedir}/EGL
diff --git a/recipes-qt/qt5/qtotaupdate.bb b/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb
index 495598a..495598a 100644
--- a/recipes-qt/qt5/qtotaupdate.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb
diff --git a/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb
new file mode 100644
index 0000000..9e6b051
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -0,0 +1,44 @@
+############################################################################
+##
+## 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 = "Qt Quick Timeline"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
+SRCREV = "7ee1adca536b422623de1fe8da44135aeee6e9cf"
+BRANCH = "dev"
+SRC_URI = " \
+    git://codereview.qt-project.org/qt/tqtc-qtquicktimeline;branch=${BRANCH};protocol=ssh \
+    "
+DEPENDS = "qtbase qtdeclarative"
diff --git a/meta-boot2qt/recipes-qt/qt5/qtsimulator/custom.target b/meta-boot2qt/recipes-qt/qt5/qtsimulator/custom.target
new file mode 100644
index 0000000..05b2268
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/custom.target
@@ -0,0 +1,5 @@
+[Unit]
+Description=Custom Target
+Requires=multi-user.target
+After=multi-user.target
+AllowIsolate=yes
diff --git a/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator
new file mode 100644
index 0000000..aa4a718
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator
@@ -0,0 +1 @@
+SIMULATOR_HOSTNAME=192.168.56.1
diff --git a/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator-hostname.sh b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator-hostname.sh
new file mode 100644
index 0000000..c1a6954
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator-hostname.sh
@@ -0,0 +1 @@
+export SIMULATOR_HOSTNAME=192.168.56.1
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxy.service
index 7a709fd..baf0296 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxy.service
@@ -1,10 +1,11 @@
 [Unit]
 Description=QtSimulator Proxy Daemon
-After=systemd-user-sessions.service
+After=multi-user.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/emulatorproxyd
+EnvironmentFile=/etc/default/emulator
 [Install]
-WantedBy=multi-user.target
+WantedBy=custom.target
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxyd.sh
index d73f1e7..d73f1e7 100755
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxyd.sh
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/meta-boot2qt/recipes-qt/qt5/qtsimulator_1.0.bb
index 0692fc0..c4c8d21 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
+++ b/meta-boot2qt/recipes-qt/qt5/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.
@@ -27,37 +27,48 @@
 ##
 ############################################################################
-DESCRIPTION = "Proxy daemon for QtSimulator"
+DESCRIPTION = "QtSimulator"
 LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://proxy.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://src/simulator/simulatorglobal.h;md5=3daa1a609195439d0292259a74c7d615;beginline=1;endline=20"
-inherit qmake5
+inherit qt5-module
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
+    git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \
    file://emulatorproxyd.sh \
    file://emulatorproxy.service \
+    file://emulator-hostname.sh \
+    file://emulator \
+    file://custom.target \
    "
-SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
+SRCREV = "f98633ebee7dbce79c00fbfec86537c6330e2b5f"
 BRANCH = "master"
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git/src/helperlibs/proxy"
+S = "${WORKDIR}/git"
-DEPENDS = "qtbase qtsimulator"
+DEPENDS = "qtbase"
+RRECOMMENDS_${PN} += "${PN}-tools"
+# 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/
+    install -m 0644 ${WORKDIR}/custom.target ${D}${systemd_unitdir}/system/
+    install -m 0755 -d ${D}${sysconfdir}/profile.d
+    install -m 0644 ${WORKDIR}/emulator-hostname.sh ${D}${sysconfdir}/profile.d/
+    install -m 0755 -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/emulator ${D}${sysconfdir}/default/
 }
 INITSCRIPT_NAME = "emulatorproxyd.sh"
 INITSCRIPT_PARAMS = "defaults 97 10"
-SYSTEMD_SERVICE_${PN} = "emulatorproxy.service"
+SYSTEMD_SERVICE_${PN} = "emulatorproxy.service custom.target"
 inherit update-rc.d systemd
diff --git a/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch b/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch
new file mode 100644
index 0000000..dbb7995
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch
@@ -0,0 +1,25 @@
+From 9ffa222dbaa3b11c3b1399192e0abd478fc3b564 Mon Sep 17 00:00:00 2001
+From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
+Date: Mon, 18 Sep 2017 12:45:54 +0300
+Subject: [PATCH 1/1] Fix /dev/hwrng by enabling warp7 crypto-device
+---
+ arch/arm/boot/dts/imx7d-warp.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/arch/arm/boot/dts/imx7d-warp.dts b/arch/arm/boot/dts/imx7d-warp.dts
+index ee72690..19aee0e 100755
+--- a/arch/arm/boot/dts/imx7d-warp.dts
+++ b/arch/arm/boot/dts/imx7d-warp.dts
+@@ -181,7 +181,7 @@
+ };
+ 
+ &crypto {
+-       status = "disabled";
+       status = "okay";
+ };
+ 
+ &clks {
+-- 
+2.7.4
diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend
index 5efcce0..72db716 100644
--- a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend
@@ -27,8 +27,23 @@
 ##
 ############################################################################
+SRCBRANCH = "linux_4.1.29"
+SRCREV = "881845d84e3c2e58a00b9c36616203d748b7df0e"
+LOCALVERSION = "-warp7"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch \
+        "
 do_configure_prepend() {
    echo "CONFIG_NAMESPACES=y"      >> ${B}/.config
    echo "CONFIG_FHANDLE=y"         >> ${B}/.config
    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
+    echo "CONFIG_MXC_CAMERA_OV2680_MIPI=m"              >> ${B}/.config
+    echo "CONFIG_FB_MXC_TRULY_PANEL_TDO_ST7796H=y"      >> ${B}/.config
+    echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE=y"      >> ${B}/.config
+    echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV=y    >> ${B}/.config
+    echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE=y  >> ${B}/.config
 }
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
new file mode 100644
index 0000000..e8a0573
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
@@ -0,0 +1,22 @@
+From ef2f2eeef6974bda0fd878c5f76b8b05ac16aa3d Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 13 Sep 2017 09:40:44 +0300
+Subject: [PATCH] use imx7d-warp.dtb
+---
+ include/configs/warp7.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/include/configs/warp7.h b/include/configs/warp7.h
+index b3e1f2e..edbd43f 100644
+--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
+@@ -35,7 +35,7 @@
+        "ethact=usb_ether\0" \
+        "fdt_high=0xffffffff\0" \
+        "initrd_high=0xffffffff\0" \
+-       "fdt_file=imx7s-warp.dtb\0" \
+       "fdt_file=imx7d-warp.dtb\0" \
+        "fdt_addr=0x83000000\0" \
+        "boot_fdt=try\0" \
+        "ip_dyn=yes\0" \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
index c5201a0..b1df421 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
@@ -31,4 +31,5 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
        file://0001-Use-hdmi-as-primary-display-only-if-connected.patch \
+        file://0001-use-imx7d-warp.dtb.patch \
        "
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend
index b1826db..bfa84e3 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend
@@ -34,3 +34,4 @@ SRC_URI += " \
        file://0003-apalis-imx6-Ixora-v1.0-support.patch \
        file://0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch \
        "
+DEPENDS += "dtc-native"
diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 1f5fd9f..4454051 100644
--- a/meta-intel-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -35,10 +35,15 @@ inherit image_dd
 EXTRA_IMAGECMD_ext3 += "-L rootfs"
 do_populate_boot() {
+    GRUB_IMAGE="grub-efi-bootia32.efi"
+    DEST_IMAGE="bootia32.efi"
+    if [ "${TARGET_ARCH}" = "x86_64" ]; then
+        GRUB_IMAGE="grub-efi-bootx64.efi"
+        DEST_IMAGE="bootx64.efi"
+    fi
    mkdir -p ${WORKDIR}/EFI/BOOT/
    # Path where EFI firmware searches for EFI executable
-    cp ${DEPLOY_DIR_IMAGE}/bootx64.efi ${WORKDIR}/EFI/BOOT/
+    cp ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${WORKDIR}/EFI/BOOT/${DEST_IMAGE}
    mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI
 }
diff --git a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
index ca53537..287cf7c 100644
--- a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
+++ b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
@@ -1,7 +1,7 @@
 # Created by meta-b2qt
 serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
 default=boot
-timeout=10
+timeout=0
 menuentry 'boot' {
    linux /boot/bzImage root=LABEL=rootfs
diff --git a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
index 0104aab..f3a95f2 100644
--- a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -32,7 +32,7 @@ SRC_URI += "file://grub.cfg"
 do_install[depends] += " \
    virtual/kernel:do_deploy \
-    ${INITRAMFS_IMAGE}:do_rootfs \
+    ${INITRAMFS_IMAGE}:do_image_complete \
    ${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', 'intel-microcode:do_deploy', '', d)} \
 "
diff --git a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg b/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg
index af765b5..af765b5 100644
--- a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg
+++ b/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg
diff --git a/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg
index 65ac248..65ac248 100644
--- a/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
+++ b/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg
diff --git a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend b/meta-intel-extras/recipes/linux/linux-intel_%.bbappend
index a61cf4d..a61cf4d 100644
--- a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend
+++ b/meta-intel-extras/recipes/linux/linux-intel_%.bbappend
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
index ca5f455..ca5f455 100644
--- a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf
+++ b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
index d6da06c..d6da06c 100644
--- a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf
+++ b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend
index 708ed85..708ed85 100644
--- a/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend
+++ b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend
diff --git a/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend b/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend
new file mode 100644
index 0000000..ca8f573
--- /dev/null
+++ b/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+SRC_URI_remove = "file://ppp-fix-building-with-linux-4.8.patch"
diff --git a/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend b/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend
new file mode 100644
index 0000000..7c2f7b5
--- /dev/null
+++ b/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
new file mode 100644
index 0000000..5f4d79c
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
@@ -0,0 +1,29 @@
+From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 11 May 2016 16:16:30 +0300
+Subject: [PATCH] configure.ac: Fix wayland-protocols path
+The wayland-protocols directory is used during build: Fix the path
+to point to sysroot specified in recipe.
+Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that
+breaks multilib weston as it would point to multilib sysroot when the
+(allarch) wayland-protocols is actually in the machine sysroot.
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+--- a/configure.ac
+++ b/configure.ac
+@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
+ PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
+ 
+ PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7],
+-                 [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
+                 [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
+ 
+ AC_ARG_ENABLE(wayland-compositor, [  --enable-wayland-compositor],,
diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch b/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch
new file mode 100644
index 0000000..148848d
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch
@@ -0,0 +1,80 @@
+From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 May 2015 20:56:00 -0700
+Subject: [PATCH weston] make error() portable
+error() is not posix but gnu extension so may not be available on all
+kind of systemsi e.g. musl.
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+ configure.ac        |  2 ++
+ src/weston-error.h  | 20 ++++++++++++++++++++
+ src/weston-launch.c |  2 +-
+ 3 files changed, 23 insertions(+), 1 deletion(-)
+ create mode 100644 src/weston-error.h
+diff --git a/configure.ac b/configure.ac
+index 263fc22..f52cd62 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+              [[#include <time.h>]])
+ AC_CHECK_HEADERS([execinfo.h])
+ 
+AC_CHECK_HEADERS([error.h])
+
+ AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
+ 
+ COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2"
+diff --git a/src/weston-error.h b/src/weston-error.h
+new file mode 100644
+index 0000000..2089d02
+--- /dev/null
+++ b/src/weston-error.h
+@@ -0,0 +1,20 @@
+#ifndef _WESTON_ERROR_H
+#define _WESTON_ERROR_H
+
+#if defined(HAVE_ERROR_H)
+#include <error.h>
+#else
+#include <err.h>
+#include <string.h>
+#define _weston_error(S, E, F, ...) do { \
+       if (E) \
+               err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
+       else \
+               err(S, F, ##__VA_ARGS__); \
+} while(0)
+
+#define error _weston_error
+#endif
+
+#endif
+
+diff --git a/src/weston-launch.c b/src/weston-launch.c
+index 10c66de..3e6d30a 100644
+--- a/src/weston-launch.c
+++ b/src/weston-launch.c
+@@ -30,7 +30,6 @@
+ #include <poll.h>
+ #include <errno.h>
+ 
+-#include <error.h>
+ #include <getopt.h>
+ 
+ #include <sys/types.h>
+@@ -56,6 +55,7 @@
+ #endif
+ 
+ #include "weston-launch.h"
+#include "weston-error.h"
+ 
+ #define DRM_MAJOR 226
+ 
+-- 
+2.1.4
diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
new file mode 100644
index 0000000..70b9888
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -0,0 +1,174 @@
+From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Wed, 22 Feb 2017 15:53:30 +0200
+Subject: [PATCH] weston-launch: Provide a default version that doesn't require
+ PAM
+weston-launch requires PAM for starting weston as a non-root user.
+Since starting weston as root is a valid use case by itself, if
+PAM is not available, provide a default version of weston-launch
+without non-root-user support.
+Upstream-Status: Pending
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac              |  9 +++++++--
+ libweston/weston-launch.c | 20 ++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 2 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index 46cb2c7..bb45f46 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -435,13 +435,17 @@ AC_ARG_ENABLE(resize-optimization,
+ AS_IF([test "x$enable_resize_optimization" = "xyes"],
+       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
+ 
+AC_ARG_WITH(pam,
+            AS_HELP_STRING([--with-pam], [Use PAM]),
+            [use_pam=$withval], [use_pam=yes])
+ AC_ARG_ENABLE(weston-launch, [  --enable-weston-launch],, enable_weston_launch=yes)
+ AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes)
+-if test x$enable_weston_launch = xyes; then
+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then
+   WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
+   if test x$have_pam = xno; then
+-    AC_ERROR([weston-launch requires pam])
+    AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found])
+   fi
+  AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available])
+ fi
+ 
+ AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
+@@ -701,6 +705,7 @@ AC_MSG_RESULT([
+        Enable developer documentation  ${enable_devdocs}
+ 
+        weston-launch utility           ${enable_weston_launch}
+       PAM support                     ${use_pam}
+        systemd-login support           ${have_systemd_login}
+        systemd notify support          ${enable_systemd_notify}
+ 
+diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
+index 0491896..07e7469 100644
+--- a/libweston/weston-launch.c
+++ b/libweston/weston-launch.c
+@@ -51,7 +51,9 @@
+ 
+ #include <pwd.h>
+ #include <grp.h>
+#ifdef HAVE_PAM
+ #include <security/pam_appl.h>
+#endif
+ 
+ #ifdef HAVE_SYSTEMD_LOGIN
+ #include <systemd/sd-login.h>
+@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd)
+ #endif
+ 
+ struct weston_launch {
+#ifdef HAVE_PAM
+        struct pam_conv pc;
+        pam_handle_t *ph;
+#endif
+        int tty;
+        int ttynr;
+        int sock[2];
+@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl)
+        return false;
+ }
+ 
+#ifdef HAVE_PAM
+ static int
+ pam_conversation_fn(int msg_count,
+                    const struct pam_message **messages,
+@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl)
+ 
+        return 0;
+ }
+#endif
+ 
+ static int
+ setup_launcher_socket(struct weston_launch *wl)
+@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status)
+        close(wl->signalfd);
+        close(wl->sock[0]);
+ 
+#ifdef HAVE_PAM
+        if (wl->new_user) {
+                err = pam_close_session(wl->ph, 0);
+                if (err)
+@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status)
+                                err, pam_strerror(wl->ph, err));
+                pam_end(wl->ph, err);
+        }
+#endif
+ 
+        if (ioctl(wl->tty, KDSKBMUTE, 0) &&
+            ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
+@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+        setenv("HOME", wl->pw->pw_dir, 1);
+        setenv("SHELL", wl->pw->pw_shell, 1);
+ 
+#ifdef HAVE_PAM
+        env = pam_getenvlist(wl->ph);
+        if (env) {
+                for (i = 0; env[i]; ++i) {
+@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+                }
+                free(env);
+        }
+#endif
+ 
+        /*
+         * We open a new session, so it makes sense
+@@ -675,7 +685,9 @@ static void
+ help(const char *name)
+ {
+        fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
+#ifdef HAVE_PAM
+        fprintf(stderr, "  -u, --user      Start session as specified username\n");
+#endif
+        fprintf(stderr, "  -t, --tty       Start session on alternative tty\n");
+        fprintf(stderr, "  -v, --verbose   Be verbose\n");
+        fprintf(stderr, "  -h, --help      Display this help message\n");
+@@ -688,7 +700,9 @@ main(int argc, char *argv[])
+        int i, c;
+        char *tty = NULL;
+        struct option opts[] = {
+#ifdef HAVE_PAM
+                { "user",    required_argument, NULL, 'u' },
+#endif
+                { "tty",     required_argument, NULL, 't' },
+                { "verbose", no_argument,       NULL, 'v' },
+                { "help",    no_argument,       NULL, 'h' },
+@@ -700,9 +714,13 @@ main(int argc, char *argv[])
+        while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
+                switch (c) {
+                case 'u':
+#ifdef HAVE_PAM
+                        wl.new_user = optarg;
+                        if (getuid() != 0)
+                                error(1, 0, "Permission denied. -u allowed for root only");
+#else
+                       error(1, 0, "-u is unsupported in this weston-launch build");
+#endif
+                        break;
+                case 't':
+                        tty = optarg;
+@@ -740,8 +758,10 @@ main(int argc, char *argv[])
+        if (setup_tty(&wl, tty) < 0)
+                exit(EXIT_FAILURE);
+ 
+#ifdef HAVE_PAM
+        if (wl.new_user && setup_pam(&wl) < 0)
+                exit(EXIT_FAILURE);
+#endif
+ 
+        if (setup_launcher_socket(&wl) < 0)
+                exit(EXIT_FAILURE);
+-- 
+2.1.4
diff --git a/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch b/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch
new file mode 100644
index 0000000..93376ef
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch
@@ -0,0 +1,125 @@
+From 6c89292024cc08d4499916dc153c354175bd81c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
+Date: Fri, 21 Oct 2016 14:03:13 -0500
+Subject: [PATCH] Add configuration option for no input device.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+[Backported from master, 75b7197.)
+As it has been discussed in the past [1], running Weston
+without any input device at launch might be beneficial for
+some use cases.
+Certainly, it's best for the vast majority of users (and
+the project) to require an input device to be present, as
+to avoid frustration and hassle, but for those brave souls
+that so prefer, this patch lets them run without any input
+device at all.
+This introduces a simple configuration in weston.ini:
+  [core]
+  require-input=true
+True is the default, so no behavioral change is introduced.
+[1] https://lists.freedesktop.org/archives/wayland-devel/2015-November/025193.html
+Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Daniel Stone <daniels@collabora.com>
+---
+ man/weston.ini.man  | 5 +++++
+ src/compositor.h    | 4 ++++
+ src/libinput-seat.c | 6 ++++++
+ src/main.c          | 5 +++++
+ weston.ini.in       | 1 +
+ 5 files changed, 21 insertions(+)
+diff --git a/man/weston.ini.man b/man/weston.ini.man
+index a9b6026..668b16f 100644
+--- a/man/weston.ini.man
+++ b/man/weston.ini.man
+@@ -169,6 +169,11 @@ time, the one specified in the command-line will be used. On the other
+ hand, if none of these sets the value, default idle timeout will be
+ set to 300 seconds.
+ .RS
+.PP
+.RE
+.TP 7
+.BI "require-input=" true
+require an input device for launch
+ 
+ .SH "LIBINPUT SECTION"
+ The
+diff --git a/src/compositor.h b/src/compositor.h
+index c4c81f0..292a412 100644
+--- a/src/compositor.h
+++ b/src/compositor.h
+@@ -701,6 +701,10 @@ struct weston_compositor {
+ 
+        void *user_data;
+        void (*exit)(struct weston_compositor *c);
+
+       /* Whether to let the compositor run without any input device. */
+       bool require_input;
+
+ };
+ 
+ struct weston_buffer {
+diff --git a/src/libinput-seat.c b/src/libinput-seat.c
+index c9f9ed2..1c4c358 100644
+--- a/src/libinput-seat.c
+++ b/src/libinput-seat.c
+@@ -250,6 +250,12 @@ udev_input_enable(struct udev_input *input)
+                        devices_found = 1;
+        }
+ 
+       if (devices_found == 0 && !c->require_input) {
+               weston_log("warning: no input devices found, but none required "
+                          "as per configuration.\n");
+               return 0;
+       }
+
+        if (devices_found == 0) {
+                weston_log(
+                        "warning: no input devices on entering Weston. "
+diff --git a/src/main.c b/src/main.c
+index a98570e..b8632e9 100644
+--- a/src/main.c
+++ b/src/main.c
+@@ -658,6 +658,7 @@ int main(int argc, char *argv[])
+        struct wl_client *primary_client;
+        struct wl_listener primary_client_destroyed;
+        struct weston_seat *seat;
+       int require_input;
+ 
+        const struct weston_option core_options[] = {
+                { WESTON_OPTION_STRING, "backend", 'B', &backend },
+@@ -737,6 +738,10 @@ int main(int argc, char *argv[])
+        if (weston_compositor_init_config(ec, config) < 0)
+                goto out_signals;
+ 
+       weston_config_section_get_bool(section, "require-input",
+                                      &require_input, true);
+       ec->require_input = require_input;
+
+        if (backend_init(ec, &argc, argv, config) < 0) {
+                weston_log("fatal: failed to create compositor backend\n");
+                goto out_signals;
+diff --git a/weston.ini.in b/weston.ini.in
+index 06b51df..e9ef992 100644
+--- a/weston.ini.in
+++ b/weston.ini.in
+@@ -2,6 +2,7 @@
+ #modules=xwayland.so,cms-colord.so
+ #shell=desktop-shell.so
+ #gbm-format=xrgb2101010
+#require-input=true
+ 
+ [shell]
+ background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+-- 
+1.9.1
diff --git a/meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch b/meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
deleted file mode 100644
index 062da5c..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: weston-1.5.0/configure.ac
-===================================================================
--- weston-1.5.0.orig/configure.ac
-+++ weston-1.5.0/configure.ac
-@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then
-        AC_MSG_ERROR([wayland-scanner is needed to compile weston])
- fi
- 
-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
-+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
- 
- AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
- 
diff --git a/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch b/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch
new file mode 100644
index 0000000..a40eaf1
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch
@@ -0,0 +1,70 @@
+From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001
+From: Frederico Cadete <frederico@cadete.eu>
+Date: Mon, 28 Sep 2015 00:30:10 +0200
+Subject: configure.ac: add explicit enable/disable for systemd-login support
+Otherwise, auto-enable depending on whether the system has the necessary
+libraries.
+[Updated help text as per pq suggestion -- bwh]
+Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
+Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+Upstream-Status: Backport
+Backported from Weston git:
+http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc
+Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
+diff --git a/configure.ac b/configure.ac
+index a9cd429..67e80d0 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization,
+ AS_IF([test "x$enable_resize_optimization" = "xyes"],
+       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
+ 
+-PKG_CHECK_MODULES(SYSTEMD_LOGIN,
+-                  [libsystemd >= 209],
+-                  [have_systemd_login_209=yes;have_systemd_login=yes],
+-                  [have_systemd_login_209=no;have_systemd_login=no])
+-
+-# Older versions of systemd package systemd-login separately. Fall back on that
+-AS_IF([test x$have_systemd_login != xyes],[
+-      PKG_CHECK_MODULES(SYSTEMD_LOGIN,
+-                        [libsystemd-login >= 198],
+-                        [have_systemd_login=yes],
+-                        [have_systemd_login=no])
+-      ])
+AC_ARG_ENABLE(systemd-login,
+              AS_HELP_STRING([--enable-systemd-login],
+                             [Enable logind support]),,
+              enable_systemd_login=auto)
+if test x$enable_systemd_login != xno; then
+  PKG_CHECK_MODULES(SYSTEMD_LOGIN,
+                    [libsystemd >= 209],
+                    [have_systemd_login_209=yes;have_systemd_login=yes],
+                    [have_systemd_login_209=no;have_systemd_login=no])
+
+  # Older versions of systemd package systemd-login separately. Fall back on that
+  AS_IF([test x$have_systemd_login != xyes],[
+        PKG_CHECK_MODULES(SYSTEMD_LOGIN,
+                          [libsystemd-login >= 198],
+                          [have_systemd_login=yes],
+                          [have_systemd_login=no])
+        ])
+else
+  have_systemd_login=no
+fi
+
+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then
+  AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login])
+fi
+ 
+ AS_IF([test "x$have_systemd_login" = "xyes"],
+       [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
+-- 
+cgit v0.10.2
diff --git a/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch b/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch
new file mode 100644
index 0000000..2d28d56
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch
@@ -0,0 +1,53 @@
+From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001
+From: Frederico Cadete <frederico@cadete.eu>
+Date: Mon, 28 Sep 2015 00:30:09 +0200
+Subject: configure.ac: add support for new versions of systemd
+Starting from systemd version 209, a single libsystemd.pc is provided.
+For previous versions, fall back on libsystemd-login.pc.
+Signed-off-by: Frederico Cadete <frederico@cadete.eu>
+Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
+Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
+Upstream-Status: Backport
+Backported from Weston git:
+http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025
+Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
+diff --git a/configure.ac b/configure.ac
+index 045291c..a9cd429 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization,
+ AS_IF([test "x$enable_resize_optimization" = "xyes"],
+       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
+ 
+-PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
+-                  [have_systemd_login=yes], [have_systemd_login=no])
+PKG_CHECK_MODULES(SYSTEMD_LOGIN,
+                  [libsystemd >= 209],
+                  [have_systemd_login_209=yes;have_systemd_login=yes],
+                  [have_systemd_login_209=no;have_systemd_login=no])
+
+# Older versions of systemd package systemd-login separately. Fall back on that
+AS_IF([test x$have_systemd_login != xyes],[
+      PKG_CHECK_MODULES(SYSTEMD_LOGIN,
+                        [libsystemd-login >= 198],
+                        [have_systemd_login=yes],
+                        [have_systemd_login=no])
+      ])
+
+ AS_IF([test "x$have_systemd_login" = "xyes"],
+       [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
+ AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
+ 
+-PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
+-                  [have_systemd_login_209=yes], [have_systemd_login_209=no])
+ AS_IF([test "x$have_systemd_login_209" = "xyes"],
+       [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
+ 
+-- 
+cgit v0.10.2
diff --git a/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch b/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch
new file mode 100644
index 0000000..35e6d6f
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch
@@ -0,0 +1,43 @@
+weston-1.5.0/configure.ac: make lcms explicitly configurable
+The lcms package is outside of openembedded-core, so make it
+explicitly configurable. Make it deterministic, so that if lcms
+dependencies are missing, autoconf throws a fatal error. Follow
+upstream style to make it more likely to be merged.
+Upstream-Status: Pending
+Index: weston-1.5.0/configure.ac
+===================================================================
+--- weston-1.5.0.orig/configure.ac
+++ weston-1.5.0/configure.ac
+@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install,
+                             enable_demo_clients_install=no)
+ AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
+ 
+-PKG_CHECK_MODULES(LCMS, lcms2,
+-                  [have_lcms=yes], [have_lcms=no])
+-if test "x$have_lcms" = xyes; then
+-       AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
+AC_ARG_ENABLE(lcms,
+              AS_HELP_STRING([--disable-lcms],
+                             [Disable lcms support]),,
+              enable_lcms=auto)
+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes])
+if test "x$enable_lcms" != "xno"; then
+        PKG_CHECK_MODULES(LCMS, 
+                         lcms2,
+                         [have_lcms=yes],
+                         [have_lcms=no])
+        if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then
+          AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found])
+        fi
+        if test "x$have_lcms" = "xyes"; then
+                enable_lcms=yes
+                AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
+        fi
+ fi
+-AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
+ 
+ AC_PATH_PROG([wayland_scanner], [wayland-scanner])
+ if test x$wayland_scanner = x; then
diff --git a/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch b/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch
new file mode 100644
index 0000000..ad07d4f
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch
@@ -0,0 +1,37 @@
+The libwebp package is outside of openembedded-core, so make it
+explicitly configurable. Make it deterministic, so that if libwebp 
+dependencies are missing, autoconf throws a fatal error.
+Upstream-Status: Pending
+Index: weston-1.5.0/configure.ac
+===================================================================
+--- weston-1.5.0.orig/configure.ac
+++ weston-1.5.0/configure.ac
+@@ -268,9 +268,22 @@ fi
+ 
+ PKG_CHECK_MODULES(PIXMAN, [pixman-1])
+ PKG_CHECK_MODULES(PNG, [libpng])
+-PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
+-AS_IF([test "x$have_webp" = "xyes"],
+-      [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
+AC_ARG_ENABLE(webp,
+              AS_HELP_STRING([--disable-webp],
+                             [Disable libwebp support]),,
+              enable_webp=auto)
+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes])
+AS_IF([test "x$enable_webp" != "xno"],
+    PKG_CHECK_MODULES(WEBP,
+                     [libwebp],
+                     [have_webp=yes],
+                     [have_webp=no])
+    AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"],
+        AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found]))
+    AS_IF([test "x$have_webp" = "xyes"],
+        [enable_webp=yes]
+        [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
+)
+ 
+ AC_ARG_ENABLE(vaapi-recorder, [  --enable-vaapi-recorder],,
+              enable_vaapi_recorder=auto)
diff --git a/meta-nvidia-extras/recipes/weston/weston/weston.desktop b/meta-nvidia-extras/recipes/weston/weston/weston.desktop
new file mode 100644
index 0000000..1086ae8
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/weston.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Weston
+Comment=Wayland Compostitor
+Exec=weston
+Icon=weston
+Terminal=false
+Categories=Utility;
diff --git a/meta-nvidia-extras/recipes/weston/weston/weston.png b/meta-nvidia-extras/recipes/weston/weston/weston.png
new file mode 100644
index 0000000..ea8b7e0
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/weston.png
Binary files differ
diff --git a/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start b/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start
new file mode 100644
index 0000000..b483c97
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start
@@ -0,0 +1,7 @@
+#!/bin/sh
+if type Xwayland  >/dev/null 2>/dev/null; then
+        mkdir -p /tmp/.X11-unix
+        add_weston_argument "--modules=xwayland.so"
+fi
diff --git a/meta-nvidia-extras/recipes/weston/weston_%.bbappend b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
index 22f0f11..e9a2154 100644
--- a/meta-nvidia-extras/recipes/weston/weston_%.bbappend
+++ b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
@@ -28,5 +28,6 @@
 ############################################################################
 PACKAGECONFIG_remove = "kms"
+DEPENDS += "drm"
 TARGET_CFLAGS += "-DWIN_INTERFACE_CUSTOM"
diff --git a/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb b/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb
new file mode 100644
index 0000000..3fdfbab
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb
@@ -0,0 +1,104 @@
+SUMMARY = "Weston, a Wayland compositor"
+DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
+                    file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331"
+SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+           file://weston.png \
+           file://weston.desktop \
+           file://make-lcms-explicitly-configurable.patch \
+           file://make-libwebp-explicitly-configurable.patch \
+           file://0001-make-error-portable.patch \
+           file://libsystemd.patch \
+           file://explicit-enable-disable-systemd.patch \
+           file://add-config-option-for-no-input-device.patch \
+"
+SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e"
+SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf"
+inherit autotools pkgconfig useradd distro_features_check
+# depends on virtual/egl
+REQUIRED_DISTRO_FEATURES = "opengl"
+DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
+DEPENDS += "wayland libinput virtual/egl pango wayland-native"
+EXTRA_OECONF = "--enable-setuid-install \
+                --enable-simple-clients \
+                --enable-clients \
+                --enable-demo-clients-install \
+                --disable-rpi-compositor \
+                --disable-rdp-compositor \
+                "
+EXTRA_OECONF_append_qemux86 = "\
+        WESTON_NATIVE_BACKEND=fbdev-backend.so \
+        "
+EXTRA_OECONF_append_qemux86-64 = "\
+        WESTON_NATIVE_BACKEND=fbdev-backend.so \
+        "
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+                  "
+#
+# Compositor choices
+#
+# Weston on KMS
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev"
+# Weston on Wayland (nested Weston)
+PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
+# Weston on X11
+PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
+# Headless Weston
+PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
+# Weston on framebuffer
+PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
+# weston-launch
+PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm"
+# VA-API desktop recorder
+PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
+# Weston with EGL support
+PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl"
+# Weston with cairo glesv2 support
+PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
+# Weston with lcms support
+PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
+# Weston with webp support
+PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
+# Weston with unwinding support
+PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
+# Weston with systemd-login support
+PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus"
+# Weston with Xwayland support
+PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo"
+# colord CMS support
+PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord"
+do_install_append() {
+    # Weston doesn't need the .la files to load modules, so wipe them
+    rm -f ${D}/${libdir}/weston/*.la
+    # If X11, ship a desktop file to launch it
+    if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then
+        install -d ${D}${datadir}/applications
+        install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+        install -d ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+        fi
+}
+PACKAGES += "${PN}-examples"
+FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}"
+FILES_${PN}-examples = "${bindir}/*"
+RDEPENDS_${PN} += "xkeyboard-config"
+RRECOMMENDS_${PN} = "liberation-fonts"
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system weston-launch"
diff --git a/meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend b/meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend
index 8a9bda0..9806a3c 100644
--- a/meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend
+++ b/meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend
@@ -27,4 +27,12 @@
 ##
 ############################################################################
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://gl3ext.h"
 DEPENDS = "mesa"
+do_install_append() {
+    install -m 644 ${WORKDIR}/gl3ext.h ${D}/${includedir}/GLES3/
+}
diff --git a/meta-renesas-extras/recipes/gles-module/gles-user-module/gl3ext.h b/meta-renesas-extras/recipes/gles-module/gles-user-module/gl3ext.h
new file mode 100644
index 0000000..4d4ea96
--- /dev/null
+++ b/meta-renesas-extras/recipes/gles-module/gles-user-module/gl3ext.h
@@ -0,0 +1,24 @@
+#ifndef __gl3ext_h_
+#define __gl3ext_h_
+/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+/* OpenGL ES 3 Extensions
+ *
+ * After an OES extension's interactions with OpenGl ES 3.0 have been documented,
+ * its tokens and function definitions should be added to this file in a manner
+ * that does not conflict with gl2ext.h or gl3.h.
+ *
+ * Tokens and function definitions for extensions that have become standard
+ * features in OpenGL ES 3.0 will not be added to this file.
+ *
+ * Applications using OpenGL-ES-2-only extensions should include gl2ext.h
+ */
+#endif /* __gl3ext_h_ */
diff --git a/recipes/libyaml/libyaml_%.bbappend b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 728a546..85be953 100644
--- a/recipes/libyaml/libyaml_%.bbappend
+++ b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -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.
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-BBCLASSEXTEND += "nativesdk"
+DEPENDS += "wayland-kms libgbm"
diff --git a/meta-renesas-extras/recipes/mesa/mesa_12.%.bbappend b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
index 0542b65..0542b65 100644
--- a/meta-renesas-extras/recipes/mesa/mesa_12.%.bbappend
+++ b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
diff --git a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
index 2b4919d..2b4919d 100644
--- a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
diff --git a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/kms.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
index db7a503..db7a503 100644
--- a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/kms.conf
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
diff --git a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller.bbappend b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend
index 708ed85..708ed85 100644
--- a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller.bbappend
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend
diff --git a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend b/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend
index 361abbf..47fe2ce 100644
--- a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend
+++ b/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend
@@ -27,10 +27,14 @@
 ##
 ############################################################################
+LICENSE = "GPLv2+"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch"
+S = "${WORKDIR}/git"
 do_deploy_prepend() {
    cp ${B}/${UBOOT_SREC} ${S}/${UBOOT_SREC}
 }
diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend
index 8297a74..0cd3eec 100644
--- a/recipes-qt/qt5/qtcharts_git.bbappend
+++ b/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend
@@ -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.
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-inherit qtquickcompiler
+DEPENDS += "wayland-native"
diff --git a/meta-renesas-extras/recipes/wayland/weston_1.11.0.bbappend b/meta-renesas-extras/recipes/wayland/weston_1.11.0.bbappend
new file mode 100644
index 0000000..ef14c2f
--- /dev/null
+++ b/meta-renesas-extras/recipes/wayland/weston_1.11.0.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+EXTRA_OECONF += "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
diff --git a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
index 940c931..bf4cc08 100644
--- a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
+++ b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
@@ -1,32 +1,15 @@
-############################################################################
+inherit update-alternatives
-##
-## 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$
-##
-############################################################################
 do_install_append() {
-    rm -f ${D}${libdir}/libdrm.so.2
+    mv ${D}${libdir}/libdrm.so.2.4.0 ${D}${libdir}/libdrm-freedesktop.so.2.4.0
+    rm ${D}${libdir}/libdrm.so
+    rm ${D}${libdir}/libdrm.so.2
+    ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so
+    ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so.2
 }
+ALTERNATIVE_${PN} = "libdrm.so.2.4.0 libdrm.so.2"
+ALTERNATIVE_LINK_NAME[libdrm.so.2.4.0] = "${libdir}/libdrm.so.2.4.0"
+ALTERNATIVE_LINK_NAME[libdrm.so.2] = "${libdir}/libdrm.so.2"
+ALTERNATIVE_TARGET = "${libdir}/libdrm-freedesktop.so.2.4.0"
+ALTERNATIVE_PRIORITY = "20"
diff --git a/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch b/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch
index c700e0e..dd58eed 100644
--- a/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch
+++ b/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch
@@ -16,14 +16,14 @@ NULL pointer dereference in fbcon_switch.
 Fix the issue by using the variable screen info structure also when adding
 new mode to the modelist.
 ---
- drivers/video/modedb.c | 7 ++++---
+ drivers/video/fbdev/core/modedb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
-diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
+diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c
-index 12dadab..e5093cf 100644
+index f5a53a6..a8fd871 100644
--- a/drivers/video/modedb.c
+--- a/drivers/video/fbdev/core/modedb.c
-+++ b/drivers/video/modedb.c
+++ b/drivers/video/fbdev/core/modedb.c
-@@ -2190,13 +2190,14 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head)
+@@ -2187,13 +2187,14 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head)
 {
        struct list_head *pos;
        struct fb_modelist *modelist;
diff --git a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
index db152a3..d3c4803 100644
--- a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
+++ b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
@@ -31,3 +31,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "\
    file://0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch \
    "
+require recipes-kernel/linux/linux-dtb.inc
diff --git a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend b/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
index 8770c65..d48d6ac 100644
--- a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
@@ -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.
diff --git a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend
index 1f375e6..84a817c 100644
--- a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend
+++ b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend
@@ -27,8 +27,6 @@
 ##
 ############################################################################
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa', '', d)}"
 PACKAGES += "${PN}-dev"
 RRECOMMENDS_${PN}-dev += "\
    libgles1-mesa-dev \
@@ -37,7 +35,3 @@ RRECOMMENDS_${PN}-dev += "\
    libegl-mesa-dev \
    libgl-mesa-dev \
    "
-do_install_append() {
-    install -m 0644 ${DRVROOT}/tegra/libdrm* ${D}${libdir}
-}
diff --git a/meta-ti-extras/recipes/dtc/dtc_git.bbappend b/meta-ti-extras/recipes/dtc/dtc_%.bbappend
index e4f43eb..c22b103 100644
--- a/meta-ti-extras/recipes/dtc/dtc_git.bbappend
+++ b/meta-ti-extras/recipes/dtc/dtc_%.bbappend
@@ -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.
diff --git a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch
new file mode 100644
index 0000000..8a986ef
--- /dev/null
+++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch
@@ -0,0 +1,28 @@
+From fdbf7768bcd14b182b0372631fe762a3fde16a49 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Thu, 8 Jun 2017 15:42:58 +0300
+Subject: [PATCH] Change typedef for EGLNativeDisplayType
+Change EGLNativeDisplayType to void* as it's in more recent versions
+---
+ targetfs/ti335x/include/EGL/eglplatform.h | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+diff --git a/targetfs/ti335x/include/EGL/eglplatform.h b/targetfs/ti335x/include/EGL/eglplatform.h
+index 7943741..e71df55 100644
+--- a/targetfs/ti335x/include/EGL/eglplatform.h
+++ b/targetfs/ti335x/include/EGL/eglplatform.h
+@@ -94,12 +94,7 @@ typedef Window   EGLNativeWindowType;
+ 
+ /* NULLWS fallback */
+ 
+-#if defined(_WIN64) ||  __WORDSIZE == 64
+-typedef khronos_int64_t EGLNativeDisplayType;
+-#else
+-typedef int EGLNativeDisplayType;
+-#endif
+-
+typedef void*  EGLNativeDisplayType;
+ typedef void*  EGLNativePixmapType;
+ typedef void*  EGLNativeWindowType;
+ 
diff --git a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
index 94ef641..c2251a8 100644
--- a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
+++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
@@ -29,6 +29,7 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += "\
+    file://0001-Change-typedef-for-EGLNativeDisplayType.patch \
    file://99-fb.rules \
    file://pvr.service \
    "
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_%.bbappend
index 0d9e282..a3c7cac 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_%.bbappend
@@ -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.
diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb
deleted file mode 100644
index c81adee..0000000
--- a/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/recipes-qt/automotive/qmllive-target/qmllive-target.patch b/recipes-qt/automotive/qmllive-target/qmllive-target.patch
deleted file mode 100644
index e3f81fa..0000000
--- a/recipes-qt/automotive/qmllive-target/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/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
deleted file mode 100644
index b9acd13..0000000
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.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 = "SD-Card mount daemon for Emulator"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"
-inherit qmake5
-SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
-    file://sdcardmountd.sh \
-    file://sdcardmount.service \
-    "
-SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
-BRANCH = "master"
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon"
-DEPENDS = "qtbase qtsimulator"
-do_install_append() {
-    install -m 0755 -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/
-    install -m 0755 -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/sdcardmount.service ${D}${systemd_unitdir}/system/
-}
-INITSCRIPT_NAME = "sdcardmountd.sh"
-INITSCRIPT_PARAMS = "defaults 97 10"
-SYSTEMD_SERVICE_${PN} = "sdcardmount.service"
-inherit update-rc.d systemd
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service
deleted file mode 100644
index 1171089..0000000
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=QtSimulator SD Card Mount Daemon
-After=systemd-user-sessions.service
-[Service]
-ExecStart=/usr/bin/sdcardmountd
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh
deleted file mode 100755
index 0849cc7..0000000
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.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/sdcardmountd
-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/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
deleted file mode 100644
index b21b2ce..0000000
--- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
+++ /dev/null
@@ -1,78 +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 Quick Compiler using prebuilt binaries from Qt SDK"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-inherit allarch qmake5_paths
-SRC_URI = "http://download.qt.io/development_releases/prebuilt/mingw_32/i686-4.9.2-release-posix-dwarf-rt_v3-rev1-runtime.7z"
-SRC_URI[md5sum] = "a7d673c4ad8bcef9e464ea5386492cb3"
-SRC_URI[sha256sum] = "f7e58b0fb1f5aa4c23eefdc60abb88cb642eaa272fb741dca23068c70ca86542"
-S = "${WORKDIR}"
-NATIVESDK_BINARY = "qtquickcompiler"
-NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe"
-do_install() {
-    install -d ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features
-    install -m 0755 ${THISDIR}/qtquickcompiler-sdk/mkspecs/features/qtquickcompiler.prf ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features
-    install -d ${D}${OE_QMAKE_PATH_ARCHDATA}/cmake/Qt5QuickCompiler
-    install -m 0644 ${THISDIR}/qtquickcompiler-sdk/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake ${D}${OE_QMAKE_PATH_ARCHDATA}/cmake/Qt5QuickCompiler
-    if [ "${PN}" = "qtquickcompiler-sdk-native" ]; then
-        install -d ${D}${OE_QMAKE_PATH_BINS}
-        install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/qtquickcompiler ${D}${OE_QMAKE_PATH_BINS}
-    elif [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then
-        install -d ${D}${OE_QMAKE_PATH_BINS}
-        install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/${NATIVESDK_BINARY} ${D}${OE_QMAKE_PATH_BINS}
-    fi
-    # Use the EffectivePath instead of installation path
-    sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf
-}
-do_install_append_mingw32() {
-    if [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then
-        install -m 0644 ${WORKDIR}/libgcc_s_dw2-1.dll ${D}${OE_QMAKE_PATH_BINS}
-        install -m 0644 ${WORKDIR}/libwinpthread-1.dll ${D}${OE_QMAKE_PATH_BINS}
-    fi
-}
-INHIBIT_PACKAGE_STRIP = "1"
-ALLOW_EMPTY_${PN} = "1"
-PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools = "${OE_QMAKE_PATH_BINS}"
-FILES_${PN}-dev = "${OE_QMAKE_PATH_ARCHDATA}"
-INSANE_SKIP_${PN} += "already-stripped"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch b/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch
deleted file mode 100644
index 2af19e8..0000000
--- a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 4903971e1e4b58f03b0f636a1ab494bfbc5d76d4 Mon Sep 17 00:00:00 2001
-From: Michal Klocek <michal.klocek@theqtcompany.com>
-Date: Mon, 7 Dec 2015 15:48:32 +0200
-Subject: [PATCH] Fix slow video with webengine on nitrogen6x
-Disable texture_rg on nitrogen6x. Yocto
-image 1.8 has driver which reports opengl es 3.0
-support, however texture_rg does not
-work properly.
---
- src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc | 18 ------------------
- 1 file changed, 18 deletions(-)
-diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-index 58aa147..4ab682a 100644
--- a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-+++ b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-@@ -1258,26 +1258,6 @@ void FeatureInfo::InitializeFeatures() {
-     }
-   }
- 
-  if ((gl_version_info_->is_es3 || gl_version_info_->is_desktop_core_profile ||
-       extensions.Contains("GL_EXT_texture_rg") ||
-       extensions.Contains("GL_ARB_texture_rg")) &&
-      IsGL_REDSupportedOnFBOs()) {
-    feature_flags_.ext_texture_rg = true;
-    AddExtensionString("GL_EXT_texture_rg");
-
-    validators_.texture_format.AddValue(GL_RED_EXT);
-    validators_.texture_format.AddValue(GL_RG_EXT);
-    validators_.texture_internal_format.AddValue(GL_RED_EXT);
-    validators_.texture_internal_format.AddValue(GL_R8_EXT);
-    validators_.texture_internal_format.AddValue(GL_RG_EXT);
-    validators_.texture_internal_format.AddValue(GL_RG8_EXT);
-    validators_.read_pixel_format.AddValue(GL_RED_EXT);
-    validators_.read_pixel_format.AddValue(GL_RG_EXT);
-    validators_.render_buffer_format.AddValue(GL_R8_EXT);
-    validators_.render_buffer_format.AddValue(GL_RG8_EXT);
-    validators_.texture_unsized_internal_format.AddValue(GL_RED_EXT);
-    validators_.texture_unsized_internal_format.AddValue(GL_RG_EXT);
-  }
-   UMA_HISTOGRAM_BOOLEAN("GPU.TextureRG", feature_flags_.ext_texture_rg);
- 
-   bool has_opengl_dual_source_blending =
-- 
-1.9.1
diff --git a/recipes/gnutls/files/check_SYS_getrandom.patch b/recipes/gnutls/files/check_SYS_getrandom.patch
deleted file mode 100644
index 50693bf..0000000
--- a/recipes/gnutls/files/check_SYS_getrandom.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f26c3979ab0325edb2e410d287bc501cf00e0ac0 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Mon, 22 Aug 2016 16:32:34 +0200
-Subject: [PATCH] rnd-linux: added check for SYS_getrandom being defined
-This allows to compile the getrandom() code in old Linux systems
-which do not have the system call defined.
---
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
- lib/nettle/rnd-linux.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/lib/nettle/rnd-linux.c b/lib/nettle/rnd-linux.c
-index d7f07a6..7a24d05 100644
--- a/lib/nettle/rnd-linux.c
-+++ b/lib/nettle/rnd-linux.c
-@@ -56,7 +56,11 @@ static dev_t _gnutls_urandom_fd_rdev = 0;
- # else
- #  include <sys/syscall.h>
- #  undef getrandom
-#  define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags)
-+#  if defined(SYS_getrandom)
-+#   define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags)
-+#  else
-+#   define getrandom(dst,s,flags) -1
-+#  endif
- # endif
- 
- static unsigned have_getrandom(void)
--
-libgit2 0.24.0
diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb
deleted file mode 100644
index e47c9c1..0000000
--- a/recipes/hunspell/hunspell_1.3.2.bb
+++ /dev/null
@@ -1,59 +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 = "Hunspell"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88"
-SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz;name=hunspell \
-           git://github.com/libreoffice/dictionaries.git;branch=libreoffice-4-3-2;name=dictionaries \
-          "
-SRC_URI[hunspell.md5sum] = "3121aaf3e13e5d88dfff13fb4a5f1ab8"
-SRC_URI[hunspell.sha256sum] = "b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd"
-# using branch libreoffice-4.3.2 for dictionaries
-SRCREV_dictionaries = "aa497b3c345133a1dc180dfb95dd1b3677b92afa"
-PR = "r0"
-inherit autotools gettext
-PACKAGES += "${PN}-dicts"
-RRECOMMENDS_${PN} += "${PN}-dicts"
-FILES_${PN}-dicts = "${datadir}/hunspell"
-do_install_append() {
-    install -m 0755 -d ${D}${datadir}/hunspell
-    install -m 0755 ${WORKDIR}/git/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic
-    install -m 0755 ${WORKDIR}/git/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff
-    install -m 0755 ${WORKDIR}/git/en/en_GB.dic ${D}${datadir}/hunspell
-    install -m 0755 ${WORKDIR}/git/en/en_GB.aff ${D}${datadir}/hunspell
-}
diff --git a/recipes/init-ifupdown/init-ifupdown/beagleboard/interfaces b/recipes/init-ifupdown/init-ifupdown/beagleboard/interfaces
deleted file mode 100644
index e315b94..0000000
--- a/recipes/init-ifupdown/init-ifupdown/beagleboard/interfaces
+++ /dev/null
@@ -1,33 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
- 
-# The loopback interface
-auto lo
-iface lo inet loopback
-# Wireless interfaces
-iface wlan0 inet dhcp
-        wireless_mode managed
-        wireless_essid any
-        wpa-driver wext
-        wpa-conf /etc/wpa_supplicant.conf
-iface atml0 inet dhcp
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
-    hostname `/bin/hostname`
-#    hwaddress ether 00:00:00:00:00:00
-iface eth1 inet dhcp
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-        address 192.168.7.2
-        netmask 255.255.255.0
-        network 192.168.7.0
-        gateway 192.168.7.1
-# Bluetooth networking
-iface bnep0 inet dhcp
diff --git a/recipes/init-ifupdown/init-ifupdown/emulator/interfaces b/recipes/init-ifupdown/init-ifupdown/emulator/interfaces
deleted file mode 100644
index 06adafb..0000000
--- a/recipes/init-ifupdown/init-ifupdown/emulator/interfaces
+++ /dev/null
@@ -1,33 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
- 
-# The loopback interface
-auto lo
-iface lo inet loopback
-# Wireless interfaces
-iface wlan0 inet dhcp
-        wireless_mode managed
-        wireless_essid any
-        wpa-driver wext
-        wpa-conf /etc/wpa_supplicant.conf
-iface atml0 inet dhcp
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
-auto eth1
-iface eth1 inet dhcp
-    hostname `/bin/hostname`
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-        address 192.168.7.2
-        netmask 255.255.255.0
-        network 192.168.7.0
-        gateway 192.168.7.1
-# Bluetooth networking
-iface bnep0 inet dhcp
diff --git a/recipes/init-ifupdown/init-ifupdown/fixed_mac_address b/recipes/init-ifupdown/init-ifupdown/fixed_mac_address
deleted file mode 100755
index 020257e..0000000
--- a/recipes/init-ifupdown/init-ifupdown/fixed_mac_address
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ ! -e /etc/network/interfaces.fixed ]; then
-    HWADDRESS=$(cat /sys/class/net/eth0/address)
-    sed -i -e 's,^#\(.*\)00:00:00:00:00:00,\1'$HWADDRESS',' /etc/network/interfaces
-    touch /etc/network/interfaces.fixed
-fi
diff --git a/recipes/init-ifupdown/init-ifupdown/interfaces b/recipes/init-ifupdown/init-ifupdown/interfaces
deleted file mode 100644
index 5c1ec07..0000000
--- a/recipes/init-ifupdown/init-ifupdown/interfaces
+++ /dev/null
@@ -1,32 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
- 
-# The loopback interface
-auto lo
-iface lo inet loopback
-# Wireless interfaces
-iface wlan0 inet dhcp
-        wireless_mode managed
-        wireless_essid any
-        wpa-driver wext
-        wpa-conf /etc/wpa_supplicant.conf
-iface atml0 inet dhcp
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
-    hostname `/bin/hostname`
-iface eth1 inet dhcp
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-        address 192.168.7.2
-        netmask 255.255.255.0
-        network 192.168.7.0
-        gateway 192.168.7.1
-# Bluetooth networking
-iface bnep0 inet dhcp
diff --git a/recipes/init-ifupdown/init-ifupdown/nitrogen6x/interfaces b/recipes/init-ifupdown/init-ifupdown/nitrogen6x/interfaces
deleted file mode 100644
index 93ba671..0000000
--- a/recipes/init-ifupdown/init-ifupdown/nitrogen6x/interfaces
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
- 
-# The loopback interface
-auto lo
-iface lo inet loopback
-# Wireless interfaces
-iface wlan0 inet dhcp
-        wireless_mode managed
-        wireless_essid any
-        wpa-driver nl80211
-        wpa-conf /etc/wpa_supplicant.conf
-iface atml0 inet dhcp
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
-    hostname `/bin/hostname`
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-        address 192.168.7.2
-        netmask 255.255.255.0
-        network 192.168.7.0
-        gateway 192.168.7.1
-# Bluetooth networking
-iface bnep0 inet dhcp
diff --git a/recipes/python/nativesdk-prebuild-python.bb b/recipes/python/nativesdk-prebuild-python.bb
deleted file mode 100644
index e8edb9e..0000000
--- a/recipes/python/nativesdk-prebuild-python.bb
+++ /dev/null
@@ -1,60 +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$
-##
-############################################################################
-LICENSE = "PSFv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Python-2.0;md5=a5c8025e305fb49e6d405769358851f6"
-inherit bin_package nativesdk
-COMPATIBLE_HOST = ".*-mingw.*"
-SRC_URI[md5sum] = "6d37712f01fa836b1303141a6d4cabda"
-SRC_URI[sha256sum] = "3835868c171dddb8cb68ed5578b6d4d639387a038e999a5b008f393b704d6ad7"
-SRC_URI = "http://download.qt.io/development_releases/prebuilt/gdb/build-prerequisites/python.zip"
-S = "${WORKDIR}"
-do_install() {
-    install -d ${D}${bindir}
-    install ${WORKDIR}/python/python27.dll ${D}${bindir}
-    install -d ${D}${includedir}
-    install ${WORKDIR}/python/include/* ${D}${includedir}
-    install -d ${D}${libdir}
-    install ${WORKDIR}/python/libs/* ${D}${libdir}
-    install -d ${D}${libdir}/python2.7
-    cp -r ${WORKDIR}/python/lib/* ${D}${libdir}/python2.7
-}
-sysroot_stage_dirs_append() {
-    sysroot_stage_dir $from${bindir} $to${bindir}
-}
-# requires /usr/local/bin/python, but no providers found
-INSANE_SKIP_${PN} += "file-rdeps"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index fb900be..9a87860 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -13,52 +13,54 @@
  <remote fetch="git://github.com/renesas-rcar" name="renesas"/>
  <remote fetch="git://git.linaro.org/openembedded" name="linaro"/>
  <remote fetch="git://git.toradex.com" name="toradex"/>
+  <remote fetch="git://github.com/boundarydevices" name="boundary"/>
+  <remote fetch="git://github.com/toradex" name="toradex-github"/>
  <project name="poky"
           remote="yocto"
-           revision="4f6027c30ae2b07a238e7fec63f69169e6a70cf9"
+           revision="b9ad197bbc88cad4ef8d2245a2d262b8d8dd757e"
           path="sources/poky"/>
  <project name="meta-openembedded"
           remote="oe-mirror"
-           revision="b40116cf457b88a2db14b86fda9627fb34d56ae6"
+           revision="b2ce52334cf88e07f703cf25ced92302edd5b0e9"
           path="sources/meta-openembedded"/>
  <project name="meta-qt5"
           remote="qtyocto"
-           revision="5d375076a9c2b2e39f99012d3519a1cb2ff5811d"
+           revision="d6b6664ef23c38db48e48be36b90a34ae92dc558"
           path="sources/meta-qt5"/>
  <project name="meta-mingw"
           remote="qtyocto"
-           path="sources/meta-mingw"
+           revision="27ccecd47b5e745d4c6a11708dd42a90cc235fb3"
-           revision="4a621def8529c3a55c6fcaef72e3b1832a9327b3"/>
+           path="sources/meta-mingw"/>
  <project name="meta-freescale"
           remote="freescale"
-           revision="05681fdf8298bb441c15135eae424c7601b07e98"
+           revision="06178400afbd641a6709473fd21d893dcd3cfbfa"
           path="sources/meta-freescale"
-           groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/>
+           groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3,boundary,fsl-imx8"/>
  <project name="meta-freescale-3rdparty"
           remote="freescale"
-           revision="1879485e63ce369292c89b5902ff6df13509090b"
+           revision="9613dbc02ca970122a01c935bc9e5789ced73a9d"
           path="sources/meta-freescale-3rdparty"
-           groups="notdefault,external,fsl,toradex,smx6"/>
+           groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
  <project name="meta-ti"
           remote="yocto"
-           revision="0862a33b8d642e5fad031a78f90410d497453415"
+           revision="aca8f5d6ff8a529e00bdeae5b401c791ed6ecb2b"
           path="sources/meta-ti"
           groups="notdefault,external,ti"/>
  <project name="meta-raspberrypi"
           remote="yocto"
-           revision="380bf2ff445c2049bdea15f3bb36e8cb36540345"
+           revision="8ba2d6fc80b31c87d25c87c863e2a77752b07c3c"
           path="sources/meta-raspberrypi"
           groups="notdefault,external,rpi"/>
  <project name="meta-intel"
           remote="intel"
-           revision="6add41510412ca196efb3e4f949d403a8b6f35d7"
+           revision="7e8f98aa326f16edd679a95f7bb2daf4256479f3"
           path="sources/meta-intel"
           groups="notdefault,external,intel"/>
  <project name="meta-tegra"
           remote="madisongh"
-           revision="fba09b70a8ac36248e5fcea611e3bb661bb089fc"
+           revision="4aea5e3785dc400e31981467f475b54e652dbd67"
           path="sources/meta-tegra"
           groups="notdefault,external,jetson"/>
  <project name="meta-renesas"
@@ -68,7 +70,7 @@
           groups="notdefault,external,renesas-gen3"/>
  <project name="meta-linaro"
           remote="linaro"
-           revision="c44bd0ebc8ca2e6201996ef7cba8b71421d3aff7"
+           revision="74dacb34c13d1c85fe4627a890b9c04940f9ffeb"
           path="sources/meta-linaro"
           groups="notdefault,external,renesas-gen3"/>
  <project name="meta-toradex-bsp-common"
@@ -81,6 +83,16 @@
           revision="45c33b79a734d016dddb997c1895b53202286f23"
           path="sources/meta-toradex-nxp"
           groups="notdefault,external,toradex"/>
+  <project name="meta-boundary"
+           remote="boundary"
+           revision="42b00061076b2a6e15c1eeed7da6fc14a0dae9d8"
+           path="sources/meta-boundary"
+           groups="notdefault,external,boundary"/>
+  <project name="meta-fsl-bsp-release"
+           remote="toradex-github"
+           revision="d2b0d14c82da830584bc7f43ba1b83097c890454"
+           path="sources/meta-fsl-bsp-release"
+           groups="notdefault,external,fsl-imx8"/>
  <project name="nvidia-layer"
           remote="playground"
@@ -103,4 +115,3 @@
           path="sources/meta-smx6"
           groups="notdefault,internal"/>
 </manifest>
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index fbe8672..3045e3c 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -56,10 +56,16 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
  case ${MACHINE} in
+    apalis-imx8|imx8qmlpddr4arm2)
+      LAYERSCONF="bblayers.conf.fsl-imx8.sample"
+    ;;
    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
      LAYERSCONF="bblayers.conf.toradex.sample"
    ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
+    nitrogen6x|nitrogen7)
+      LAYERSCONF="bblayers.conf.boundary.sample"
+    ;;
+    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
      LAYERSCONF="bblayers.conf.fsl.sample"
    ;;
    smarc-samx6i)
@@ -83,7 +89,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    emulator)
      LAYERSCONF="bblayers.conf.emulator.sample"
    ;;
-    jetson-tx1|jetson-tk1)
+    jetson-tx1|jetson-tx2|jetson-tk1)
      LAYERSCONF="bblayers.conf.jetson.sample"
    ;;
    *)
@@ -93,18 +99,14 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
  esac
  mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
-  cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
+  cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
-  if [ ! -d ${PWD}/sources/meta-qt5 ]; then
-    sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
-  fi
  if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
  fi
 fi
-export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
+export TEMPLATECONF="${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf"
 . sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 # use sources from Qt SDK if that is available
diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index e6d945f..4ae42e8 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -53,9 +53,8 @@ for S in $SHA1S; do
    elif [ "${PROJECT}" = "qtlocation/src/3rdparty/mapbox-gl-native" ]; then
        sed -i -e "/^SRCREV_qtlocation-mapboxgl/s/\".*\"/\"${SHA1}\"/" qtlocation_git.bb*
        echo "qtlocation (mapboxgl) -> ${SHA1}"
-    elif [ "${PROJECT}" = "tqtc-qmlcompiler" ] && [ -e "qtquickcompiler_git.bb" ]; then
+    elif [ "${PROJECT}" = "qtenginio" ] || [ "${PROJECT}" = "qtquick1" ] || [ "${PROJECT}" = "qtsystems" ]; then
-        sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb
+        echo "${PROJECT} -> ignored"
-        echo "qtquickcompiler -> ${SHA1}"
    elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then
        sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb*
        echo "${PROJECT} -> ${SHA1}"