31 files changed, 169 insertions, 379 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index 0d3fd29..b4f4eef 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
@@ -31,15 +31,13 @@ include conf/distro/include/toradex.inc
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
-IMAGE_FSTYPES += "teziimg"
 QBSP_IMAGE_CONTENT += "\
    ${IMAGE_LINK_NAME}.tezi.tar \
    "
-BOOT_SCRIPTS += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
+    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
-    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
+    SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
    "
 SERIAL_CONSOLES = "115200;ttymxc0 \
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
index d570e3a..7a7728c 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
@@ -27,36 +27,8 @@
 ##
 ############################################################################
-include conf/distro/include/fsl.inc
+include conf/distro/include/fsl-imx8.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/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index c8f5424..b08e11a 100644
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -35,8 +35,6 @@ BBMASK += " \
    meta-boundary/recipes-mozilla/firefox \
    "
-EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
 MACHINE_EXTRA_INSTALL += "\
    kernel-module-qcacld \
    linux-firmware-bdsdmac-wlan \
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index f1bf7d8..a216613 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
@@ -31,13 +31,11 @@ include conf/distro/include/toradex.inc
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
-IMAGE_FSTYPES += "teziimg"
 QBSP_IMAGE_CONTENT += "\
    ${IMAGE_LINK_NAME}.tezi.tar \
    "
-BOOT_SCRIPTS += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
+    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
-    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
+    SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
    "
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
index 9090055..da92ad3 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -31,20 +31,18 @@ include conf/distro/include/toradex.inc
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6ULL"
-IMAGE_FSTYPES += "teziimg"
 QBSP_IMAGE_CONTENT += "\
    ${IMAGE_LINK_NAME}.tezi.tar \
    "
-BOOT_SCRIPTS += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \
+    u-boot-${MACHINE}.imx;${MACHINEDIR}/u-boot.imx \
    "
 PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index a5695f7..c7aa169 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -31,20 +31,18 @@ include conf/distro/include/toradex.inc
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
-IMAGE_FSTYPES += "teziimg"
 QBSP_IMAGE_CONTENT += "\
    ${IMAGE_LINK_NAME}.tezi.tar \
    "
-BOOT_SCRIPTS += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+    u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \
    "
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
index e4c025b..ecd01da 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
@@ -33,11 +33,11 @@ DEPLOY_CONF_NAME = "Toradex Colibri VF"
 IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024"
-BOOT_SCRIPTS += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+    u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \
    "
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
diff --git a/meta-boot2qt-distro/conf/distro/include/emulator.conf b/meta-boot2qt-distro/conf/distro/include/emulator.conf
index b6125ae..619af16 100644
--- a/meta-boot2qt-distro/conf/distro/include/emulator.conf
+++ b/meta-boot2qt-distro/conf/distro/include/emulator.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 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,10 +27,7 @@
 ##
 ############################################################################
-IMAGE_CLASSES += "image-hdd"
+IMAGE_FSTYPES = "ext3 wic"
-IMAGE_ROOTFS_ALIGNMENT = "1048576"
-ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext3"
-IMAGE_FSTYPES = "ext3"
 QBSP_IMAGE_CONTENT = "${IMAGE_LINK_NAME}.hdd"
@@ -41,12 +38,13 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 PREFERRED_PROVIDER_virtual/egl = "qtglesstream-dummy-client"
 PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client"
+RDEPENDS_qtbase_pn-qtbase += "qtglesstream"
 KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
-DISTRO_FEATURES_remove = "webengine opengl wayland"
+DISTRO_FEATURES_remove = "webengine opengl wayland vulkan"
 MACHINE_EXTRA_INSTALL += "\
        mount-vboxsf \
        qtsystems \
-        qtglesstream \
        "
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
new file mode 100644
index 0000000..4e4256b
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
@@ -0,0 +1,79 @@
+############################################################################
+##
+## 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
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
+DISTRO_FEATURES_remove = "vulkan"
+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-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
+    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
+    meta-freescale/recipes-graphics/wayland/weston \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-bsp/imx-test \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/connman \
+    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-devtools/gdb \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-extended/logrotate \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/opencv \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/xorg-driver \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-kernel/cryptodev \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa \
+    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 \
+    "
+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"
+WKS_FILE = "imx8-uboot-bootpart.wks"
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS += "imx-boot"
+BOOT_CONFIG_MACHINE_pn-imx-boot = "${BOOT_NAME}-${UBOOT_CONFIG}.bin"
+IMAGE_BOOT_FILES = "\
+    Image \
+    fsl-*.dtb \
+    hdmitxfw.bin \
+    "
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index 32fec1b..5f22dd4 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -29,7 +29,7 @@
 BBMASK += "meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5"
-IMAGE_FSTYPES += "ext3 sdcard"
+IMAGE_FSTYPES += "ext3 wic"
 IMAGE_CLASSES += "image_types_fsl"
 QBSP_IMAGE_CONTENT ?= "\
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
deleted file mode 100644
index af49983..0000000
--- a/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
+++ /dev/null
@@ -1,32 +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$
-##
-############################################################################
-require imx6qsabresd.conf
-DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Dual"
diff --git a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
index bac366d..5f3ddb3 100644
--- a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.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,9 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+include conf/distro/include/fsl.inc
-SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch"
+include conf/distro/include/opencv.inc
-PACKAGECONFIG += "perl"
+DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device"
+KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
deleted file mode 100644
index 683c601..0000000
--- a/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
+++ /dev/null
@@ -1,41 +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$
-##
-############################################################################
-include conf/distro/include/fsl.inc
-include conf/distro/include/opencv.inc
-DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
-KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
-# add support for both imx6qsabresd and imx6dlsabresd
-KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
-                     imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
-                    "
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
index 1d30445..906b4fe 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 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.
@@ -34,6 +34,4 @@ DEPLOY_CONF_NAME = "i.MX7S WaRP"
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
-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
index 6dfaa3a..a3a2c29 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
@@ -27,36 +27,8 @@
 ##
 ############################################################################
-include conf/distro/include/fsl.inc
+include conf/distro/include/fsl-imx8.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 \
-    "
-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/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
index 0c8200a..64432d3 100644
--- a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
+++ b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
@@ -31,8 +31,7 @@ DEPLOY_CONF_NAME = "Intel NUC"
 DISTRO_FEATURES_remove = "usbgadget"
-IMAGE_CLASSES += "image_dd_efi"
+IMAGE_FSTYPES += "wic"
-IMAGE_FSTYPES += "ext3 dd"
 QBSP_IMAGE_CONTENT ?= "\
    ${IMAGE_LINK_NAME}.img \
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index e3e0292..3212cb9 100644
--- a/meta-boot2qt-distro/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 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,6 @@
 ##
 ############################################################################
-PREFERRED_PROVIDER_libdrm-tegra = "libdrm-tegra"
 # use mmc0
 ROOTFS_DEVICE = "mmcblk1p1"
@@ -43,8 +41,3 @@ QBSP_IMAGE_CONTENT = "\
    ${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/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
index 894d51d..f6871be 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
@@ -33,25 +33,26 @@ include conf/distro/include/opencv.inc
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
 BOOT_SPACE = "16384"
-BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \
+IMAGE_BOOT_FILES += "\
-                 u-boot-nit6xlite-*.imx:u-boot.nit6xlite \
+    upgrade.scr-${MACHINE};upgrade.scr \
-                 u-boot-nit6xlite1g-*.imx:u-boot.nit6xlite1g \
+    upgrade.scr-${MACHINE};6x_upgrade \
-                 u-boot-nitrogen6dl-*.imx:u-boot.nitrogen6dl \
+    u-boot-${MACHINE}.imx-nit6xlite;u-boot.nit6xlite \
-                 u-boot-nitrogen6dl2g-*.imx:u-boot.nitrogen6dl2g \
+    u-boot-${MACHINE}.imx-nit6xlite1g;u-boot.nit6xlite1g \
-                 u-boot-nitrogen6q2g-*.imx:u-boot.nitrogen6q2g \
+    u-boot-${MACHINE}.imx-nitrogen6dl;u-boot.nitrogen6dl \
-                 u-boot-nitrogen6q-*.imx:u-boot.nitrogen6q \
+    u-boot-${MACHINE}.imx-nitrogen6dl2g;u-boot.nitrogen6dl2g \
-                 u-boot-nitrogen6q_fl-*.imx:u-boot.nitrogen6q_fl \
+    u-boot-${MACHINE}.imx-nitrogen6q2g;u-boot.nitrogen6q2g \
-                 u-boot-nitrogen6qp_max-*.imx:u-boot.nitrogen6qp_max \
+    u-boot-${MACHINE}.imx-nitrogen6q;u-boot.nitrogen6q \
-                 u-boot-nitrogen6s1g-*.imx:u-boot.nitrogen6s1g \
+    u-boot-${MACHINE}.imx-nitrogen6q_fl;u-boot.nitrogen6q_fl \
-                 u-boot-nitrogen6s-*.imx:u-boot.nitrogen6s \
+    u-boot-${MACHINE}.imx-nitrogen6qp_max;u-boot.nitrogen6qp_max \
-                 u-boot-nitrogen6sx-*.imx:u-boot.nitrogen6sx \
+    u-boot-${MACHINE}.imx-nitrogen6s1g;u-boot.nitrogen6s1g \
-                 u-boot-nitrogen6_lum_dl1-*.imx:u-boot.nitrogen6_lum_dl1 \
+    u-boot-${MACHINE}.imx-nitrogen6s;u-boot.nitrogen6s \
-                 u-boot-nitrogen6_max-*.imx:u-boot.nitrogen6_max \
+    u-boot-${MACHINE}.imx-nitrogen6sx;u-boot.nitrogen6sx \
-                 u-boot-nitrogen6_vm1g-*.imx:u-boot.nitrogen6_vm1g \
+    u-boot-${MACHINE}.imx-nitrogen6_lum_dl1;u-boot.nitrogen6_lum_dl1 \
-                 u-boot-nitrogen6_vm-*.imx:u-boot.nitrogen6_vm \
+    u-boot-${MACHINE}.imx-nitrogen6_max;u-boot.nitrogen6_max \
-                "
+    u-boot-${MACHINE}.imx-nitrogen6_vm1g;u-boot.nitrogen6_vm1g \
+    u-boot-${MACHINE}.imx-nitrogen6_vm;u-boot.nitrogen6_vm \
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary"
+    "
+WKS_FILE_DEPENDS += "u-boot"
 UBOOT_MACHINE = ""
 UBOOT_CONFIG ??= "nit6xlite nit6xlite1g \
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
index 1614b04..0d225fa 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
@@ -34,5 +34,5 @@ DEPLOY_CONF_NAME = "Boundary Devices i.MX7"
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index 1d2cf9d..65faba4 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -47,10 +47,6 @@ VIDEO_CAMERA = "1"
 MACHINE_FEATURES += "pitft"
-BBMASK += "\
-    meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12%.bbappend \
-    "
 MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx"
 KERNEL_DEVICETREE += "\
diff --git a/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
index 6c79d2c..dca0916 100644
--- a/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 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.
@@ -33,7 +33,7 @@ QBSP_IMAGE_CONTENT = "\
    ${IMAGE_LINK_NAME}.tar.gz \
    "
-PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/drive-t186")}'
 NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 MACHINE_EXTRA_INSTALL += "\
@@ -55,6 +55,10 @@ MACHINE_EXTRA_INSTALL += "\
    libdrm-nv \
    "
+MACHINE_EXTRA_INSTALL_SDK = "\
+    tegra-drivers \
+    "
 PREFERRED_PROVIDER_virtual/libgles2 = "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libgles2-dev = "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libegl = "tegra-drivers"
@@ -66,16 +70,21 @@ PREFERRED_PROVIDER_virtual/mesa = "tegra-drivers"
 PREFERRED_PROVIDER_drm = "libdrm-nv"
 PREFERRED_PROVIDER_libdrm = "libdrm-nv"
 PREFERRED_PROVIDER_virtual/kernel = "linux-nvidia"
-PREFERRED_VERSION_linux-libc-headers = "4.4"
+PREFERRED_VERSION_linux-libc-headers = "4.9"
-PREFERRED_VERSION_nativesdk-linux-libc-headers = "4.4"
+PREFERRED_VERSION_nativesdk-linux-libc-headers = "4.9"
+DISTRO_FEATURES_remove = "vulkan"
 BBMASK += "\
-    meta-tegra/recipes-bsp/flashing \
+    meta-vib4/recipes-connectivity/bluez5 \
+    meta-vib4/recipes-connectivity/hostapd \
    meta-vib4/recipes-connectivity/openssl \
+    meta-vib4/recipes-connectivity/soft66 \
    meta-vib4/recipes-core/busybox \
    meta-vib4/recipes-core/glibc \
    meta-vib4/recipes-core/images \
    meta-vib4/recipes-core/kbd \
+    meta-vib4/recipes-core/llvm \
    meta-vib4/recipes-core/packagegroups \
    meta-vib4/recipes-core/toybox \
    meta-vib4/recipes-devtools/binutils \
@@ -91,6 +100,7 @@ BBMASK += "\
    meta-vib4/recipes-kernel/linux-libc-headers \
    meta-vib4/recipes-multimedia/audiomanager \
    meta-vib4/recipes-navigation/gpsd \
+    meta-vib4/recipes-navigation/navit \
    meta-vib4/recipes-support/keyutils \
    meta-vib4/recipes-support/lvm2 \
    meta-vib4/recipes-yocto-ivi \
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 85d9455..f61aad7 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -29,6 +29,9 @@
 include conf/distro/include/fsl.inc
+# include file from meta-toradex-nxp
+require conf/machine/include/${MACHINE}.inc
 BBMASK += "\
   meta-toradex-nxp/recipes-graphics/xorg-xserver \
   meta-toradex-bsp-common/recipes-devtools/python \
@@ -37,16 +40,12 @@ BBMASK += "\
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex"
+WKS_FILE_DEPENDS += "u-boot-script-toradex"
 MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"
-BOOT_SCRIPTS += " \
+IMAGE_BOOT_FILES += " \
-    fwd_blk.img:flash_blk.img \
+    fwd_blk.img;flash_blk.img \
-    fwd_eth.img:flash_eth.img \
+    fwd_eth.img;flash_eth.img \
-    fwd_mmc.img:flash_mmc.img \
+    fwd_mmc.img;flash_mmc.img \
-    ${MACHINE}:${MACHINEDIR} \
+    ${MACHINE}/*;${MACHINEDIR}/ \
    "
-# fix: basehash value changed from ... to ....
-# The metadata is not deterministic and this needs to be fixed.
-rootfs_tezi_json[vardepsexclude] = "DATE"
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf
index 9a218d9..d9ededa 100644
--- a/meta-boot2qt-distro/conf/layer.conf
+++ b/meta-boot2qt-distro/conf/layer.conf
@@ -39,3 +39,5 @@ BBMASK += "meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bba
 BBFILE_COLLECTIONS += "b2qt-distro"
 BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt-distro = "20"
+LAYERSERIES_COMPAT_b2qt-distro = "sumo"
diff --git a/meta-boot2qt-distro/conf/machine/emulator.conf b/meta-boot2qt-distro/conf/machine/emulator.conf
index 2ab622e..cb18983 100644
--- a/meta-boot2qt-distro/conf/machine/emulator.conf
+++ b/meta-boot2qt-distro/conf/machine/emulator.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.
@@ -50,3 +50,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d virtualbox-guest-additions"
 MACHINE_FEATURES += "apm alsa pcmcia bluetooth irda usbgadget screen"
 SYSTEMD_DEFAULT_TARGET = "custom.target"
+WKS_FILE = "directdisk.wks"
+do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
deleted file mode 100644
index fda246a..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## 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 http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://0001-disable-connman-when-booting-over-nfs-${PV}.patch"
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
deleted file mode 100644
index f893746..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001
-From: Mikko Gronoff <mikko.gronoff@qt.io>
-Date: Tue, 20 Sep 2016 11:02:50 +0300
-Subject: [PATCH] Disable connman when booting over NFS
---
- src/connman.service.in | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/src/connman.service.in b/src/connman.service.in
-index 09dfec9..4132cf7 100644
--- a/src/connman.service.in
-+++ b/src/connman.service.in
-@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
- After=dbus.service network-pre.target systemd-sysusers.service
- Before=network.target multi-user.target shutdown.target
- Wants=network.target
-+ConditionKernelCommandLine=!root=/dev/nfs
- 
- [Service]
- Type=dbus
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
deleted file mode 100644
index 8b46666..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
--- 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/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
deleted file mode 100644
index 9aa9648..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 9 Sep 2015 13:37:28 +0300
-Subject: [PATCH] Support SYSROOT in c_rehash
-update-ca-certificates is ran during image creation, which in turn runs
-c_rehash. Since the symlinks in /etc/ssl/certs/ are pointing to absolute
-location, c_rehash does not find the actual files. Add support for SYSROOT
-environment variable and use it to locate the actual files during image
-creation.
-Upstream-status: Pending
---
- tools/c_rehash.in | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index 92cb503..f3d2703 100644
--- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
-@@ -7,6 +7,7 @@ my $dir;
- my $prefix;
- 
- my $openssl = $ENV{OPENSSL} || "openssl";
-+my $sysroot = $ENV{SYSROOT} || "";
- my $pwd;
- my $verbose = 0;
- my $symlink_exists=eval {symlink("",""); 1};
-@@ -101,16 +102,17 @@ sub hash_dir {
-                }
-        }
-        FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
-+               $fullname = $sysroot . readlink($fname);
-                # Check to see if certificates and/or CRLs present.
-               my ($cert, $crl) = check_file($fname);
-+               my ($cert, $crl) = check_file($fullname);
-                if(!$cert && !$crl) {
-                        print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
-                        next;
-                }
-               link_hash_cert($fname) if($cert);
-               link_hash_cert_old($fname) if($cert);
-               link_hash_crl($fname) if($crl);
-               link_hash_crl_old($fname) if($crl);
-+               link_hash_cert($fname, $fullname) if($cert);
-+               link_hash_cert_old($fname, $fullname) if($cert);
-+               link_hash_crl($fname, $fullname) if($crl);
-+               link_hash_crl_old($fname, $fullname) if($crl);
-        }
- }
- 
-@@ -143,9 +145,10 @@ sub check_file {
- 
- sub link_hash_cert {
-                my $fname = $_[0];
-               my $x509hash = $_[1] || '-subject_hash';
-               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
-+               my $fullname = $_[1];
-+               my $x509hash = $_[2] || '-subject_hash';
-+               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`;
-                chomp $hash;
-                chomp $fprint;
-                $fprint =~ s/^.*=//;
-@@ -176,11 +179,11 @@ sub link_hash_cert {
- }
- 
- sub link_hash_cert_old {
-               link_hash_cert($_[0], '-subject_hash_old');
-+               link_hash_cert($_[0], $_[1], '-subject_hash_old');
- }
- 
- sub link_hash_crl_old {
-               link_hash_crl($_[0], '-hash_old');
-+               link_hash_crl($_[0], $_[1], '-hash_old');
- }
- 
- 
-@@ -188,9 +191,10 @@ sub link_hash_crl_old {
- 
- sub link_hash_crl {
-                my $fname = $_[0];
-               my $crlhash = $_[1] || "-hash";
-               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
-+               my $fullname = $_[1];
-+               my $crlhash = $_[2] || "-hash";
-+               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`;
-                chomp $hash;
-                chomp $fprint;
-                $fprint =~ s/^.*=//;
-- 
-1.9.1
diff --git a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
index 4e55e66..4e55e66 100644
--- a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index f24556e..0e4089b 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -40,6 +40,7 @@ PACKAGECONFIG += " \
    getentropy \
    gif \
    glib \
+    harfbuzz \
    ico \
    icu \
    libinput \
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
index ad4c7b8..b90d2f8 100644
--- 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
@@ -1,23 +1,24 @@
-From a7af02fe34bd8e067c7654ac366e19783b89e990 Mon Sep 17 00:00:00 2001
+From 5a68ac7a0121eff661a448e2fcbe5c02981c50a1 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
+index 4453b8a3..c36a1b58 100644
 --- a/src/plugins/position/position.pro
 +++ b/src/plugins/position/position.pro
-@@ -5,7 +5,7 @@ QT_FOR_CONFIG += positioning-private
+@@ -6,7 +6,7 @@ qtHaveModule(dbus):SUBDIRS += geoclue
- qtHaveModule(dbus):SUBDIRS += geoclue
+ qtHaveModule(dbus):SUBDIRS += geoclue2
 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
+ qtHaveModule(serialport):SUBDIRS += serialnmea