122 files changed, 1104 insertions, 659 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index cd5952f..b395e5d 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -101,7 +101,7 @@ get_groups() {
     apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x)
       PROJECT_GROUPS="fsl"
     ;;
     smarc-samx6i)
@@ -116,15 +116,18 @@ get_groups() {
     beaglebone)
       PROJECT_GROUPS="bbb"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       PROJECT_GROUPS="rpi"
     ;;
-    nuc)
-      PROJECT_GROUPS="nuc"
+    intel-corei7-64)
+      PROJECT_GROUPS="intel"
     ;;
     nvidia-logan)
       PROJECT_GROUPS="nvidia-logan"
     ;;
+    tegra-x1|tegra-t18x)
+      PROJECT_GROUPS="nvidia-tegra"
+    ;;
     emulator)
       PROJECT_GROUPS="emulator"
     ;;
@@ -182,8 +185,9 @@ init() {
     ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5
   fi
 
-  cp ${DIR}/scripts/setup-environment.sh .
-
+  if [ ! -e "setup-environment.sh" ]; then
+    ln -s ${DIR}/scripts/setup-environment.sh setup-environment.sh
+  fi
 }
 
 get_repo
diff --git a/recipes/libsoup-2.4/libsoup-2.4_2.46.0.bbappend b/classes/consistent_timestamps.bbclass
index fec4f94..e82f77c 100644
--- a/recipes/libsoup-2.4/libsoup-2.4_2.46.0.bbappend
+++ b/classes/consistent_timestamps.bbclass
@@ -19,9 +19,9 @@
 ##
 ##############################################################################
 
-# Remove this recipe when openembedded-core/meta/recipes-support/libsoup/
-# will be updated to 2.50.0 version or above.
-PV = "2.50.0"
+update_file_timestaps() {
+    # Update file timestamp to 0 seconds since Epoch time.
+    TZ=UTC find ${IMAGE_ROOTFS} -exec touch -h -m -t '197001010000' {} \;
+}
 
-SRC_URI[md5sum] = "9a84d66e1b7ccd3bd340574b11eccc15"
-SRC_URI[sha256sum] = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b"
+ROOTFS_POSTINSTALL_COMMAND += "update_file_timestaps; "
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
index 2a975f6..0fb28e5 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -38,7 +38,6 @@ python enable_internal_build () {
         hg://.*/.*    http://yocto-cache.ci.local/sources/ \n \
         osc://.*/.*   http://yocto-cache.ci.local/sources/ \n \
         p4://.*/.*    http://yocto-cache.ci.local/sources/ \n \
-        svk://.*/.*   http://yocto-cache.ci.local/sources/ \n \
         svn://.*/.*   http://yocto-cache.ci.local/sources/ \n \
         ")
 }
diff --git a/classes/remove-libtool.bbclass b/classes/remove-libtool.bbclass
new file mode 100644
index 0000000..0d7bd21
--- /dev/null
+++ b/classes/remove-libtool.bbclass
@@ -0,0 +1,11 @@
+# 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/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index 617e039..2fc1501 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -37,7 +37,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 4703b10..83761b3 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -34,7 +34,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index b05310d..5ae7b1c 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -36,7 +36,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.intel.sample
index fe8fe20..df1f544 100644
--- a/conf/bblayers.conf.nuc.sample
+++ b/conf/bblayers.conf.intel.sample
@@ -31,14 +31,13 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-yocto \
   ${BSPDIR}/sources/meta-intel \
-  ${BSPDIR}/sources/meta-intel/meta-nuc \
   ${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-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-intel-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index 0c8fb99..22d16ba 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -35,9 +35,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
new file mode 100644
index 0000000..f0dfbb7
--- /dev/null
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -0,0 +1,49 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  ${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-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-vib4 \
+  ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  "
+
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index 3be5ea3..5a7f571 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -35,7 +35,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index db9ac22..ee5876e 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -37,7 +37,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-raspberrypi \
   ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index f604394..a628f05 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -37,7 +37,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-smx6-extras \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 20addb8..ac53e69 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -36,7 +36,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 21d53e9..63311fb 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -37,6 +37,7 @@ BBLAYERS ?= " \
   ${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-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index 6cb549f..2a60463 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -37,7 +37,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 7b56113..9c597e4 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -34,6 +34,7 @@ MAINTAINER = "B2Qt <B2Qt@digia.com>"
 
 SANITY_TESTED_DISTROS += " \
             Ubuntu 11.04 \n \
+            Ubuntu-15.10 \n \
             LinuxMint-14 \n \
             LinuxMint-16 \n \
             LinuxMint-17.1 \n \
@@ -45,6 +46,11 @@ DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 
+FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
+
+# backport from oe/krogoth, needed by meta-qt5
+EXTRA_CONF_PACKAGECONFIG = "${EXTRA_OECONF}"
+
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
 DISTRO_FEATURES += "gstreamer"
 
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 8a2c3e2..c034200 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -40,7 +40,7 @@ PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
 PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
 
-PREFERRED_PROVIDER_u-boot = "u-boot"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
 UBOOT_MACHINE = "am335x_boneblack_config"
 KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/intel-corei7-64.conf
index 8a41388..8a41388 100644
--- a/conf/distro/include/nuc.conf
+++ b/conf/distro/include/intel-corei7-64.conf
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index a9e4b20..5f80c38 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -19,33 +19,11 @@
 ##
 ##############################################################################
 
-DEPLOY_CONF_NAME = "Raspberry Pi"
-
-IMAGE_FSTYPES += "ext3 rpi-sdimg"
+include conf/distro/include/raspberrypi.inc
 
-BOOTFS_CONTENT = "\
-    bcm2835-bootfiles/*: \
-    ${KERNEL_IMAGETYPE}:kernel.img \
-    "
-BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
-
-PREFERRED_PROVIDER_virtual/libgles1 = "userland"
+DEPLOY_CONF_NAME = "Raspberry Pi"
 
 DISTRO_FEATURES_remove = "webengine"
 
-MACHINE_EXTRA_INSTALL = "\
-        userland \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK = " \
-        userland-dev \
-        "
-
-KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
-KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
-module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
-
 # additional memory for GPU
 GPU_MEM = "128"
-# video camera support
-VIDEO_CAMERA = "1"
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/raspberrypi.inc
index 5fd52a0..49d152e 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/raspberrypi.inc
@@ -19,24 +19,32 @@
 ##
 ##############################################################################
 
-include conf/distro/include/imx6.inc
-
-DEPLOY_CONF_NAME = "Freescale iMX53 Quick Start Board"
+IMAGE_FSTYPES += "ext3 rpi-sdimg"
 
 BOOTFS_CONTENT = "\
-    u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    bcm2835-bootfiles/*: \
+    ${KERNEL_IMAGETYPE}:kernel.img \
     "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 
-DISTRO_FEATURES_remove = "webengine"
+BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
 
-MACHINE_EXTRA_INSTALL = "\
-        amd-gpu-bin-mx51 \
+MACHINE_EXTRA_INSTALL_SDK = " \
+        userland-dev \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
-        libgsl-fsl-mx51-dev \
-        libegl-mx51-dev \
-        libgles2-mx51-dev \
+MACHINE_EXTRA_INSTALL = "\
+        userland \
+        omxplayer \
         "
+
+KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
+KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
+module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
+
+# video camera support
+VIDEO_CAMERA = "1"
+
+RPI_FT5604 = "1"
+KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
+MACHINE_FEATURES += "pitft"
+
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 040ea9b..e90eeae 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -19,34 +19,10 @@
 ##
 ##############################################################################
 
-DEPLOY_CONF_NAME = "Raspberry Pi 2"
-
-IMAGE_FSTYPES += "ext3 rpi-sdimg"
-
-BOOTFS_CONTENT = "\
-    bcm2835-bootfiles/*: \
-    ${KERNEL_IMAGETYPE}:kernel.img \
-    "
-BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
+include conf/distro/include/raspberrypi.inc
 
-MACHINE_EXTRA_INSTALL = "\
-        userland \
-        omxplayer \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK = " \
-        userland \
-        "
-
-KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
-KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
-module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
+DEPLOY_CONF_NAME = "Raspberry Pi 2"
 
 # additional memory for GPU
 GPU_MEM = "256"
-# video camera support
-VIDEO_CAMERA = "1"
-RPI_FT5604 = "1"
 
-KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
-MACHINE_FEATURES += "pitft"
diff --git a/recipes/wayland/weston_1.%.bbappend b/conf/distro/include/raspberrypi3.conf
index 6e91467..aa76ac5 100644
--- a/recipes/wayland/weston_1.%.bbappend
+++ b/conf/distro/include/raspberrypi3.conf
@@ -19,8 +19,10 @@
 ##
 ##############################################################################
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " \
-file://0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch \
-"
+include conf/distro/include/raspberrypi.inc
+
+DEPLOY_CONF_NAME = "Raspberry Pi 3"
+
+# additional memory for GPU
+GPU_MEM = "256"
 
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
new file mode 100644
index 0000000..12b57d4
--- /dev/null
+++ b/conf/distro/include/tegra-t18x.conf
@@ -0,0 +1,67 @@
+#############################################################################
+##
+## Copyright (C) 2016 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
+DISTRO_FEATURES_DEFAULT += "wayland weston"
+
+MACHINE_EXTRA_INSTALL = "\
+tegra-firmware-fecs \
+tegra-firmware-gmicrocode \
+tegra-firmware-gpccs \
+tegra-firmware-gpmu \
+tegra-firmware-gshader \
+tegra-firmware-pmu \
+tegra-firmware-prod-fuse \
+tegra-firmware-xusb \
+tegra-firmware-vic \
+tegra-firmware-nvdec \
+tegra-firmware-nvenc \
+tegra-firmware-nvjpeg \
+tegra-drivers \
+virtual/libegl \
+virtual/libgles2 \
+libdrm-nv \
+asound-conf \
+"
+
+PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libgles2-dev ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libegl ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libegl-dev ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/egl ?= "tegra-drivers"
+
+PREFERRED_PROVIDER_wayland ?= "wayland-nv"
+PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
+PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
+
+BBMASK ?= " "
+BBMASK .= "\
+|meta-vib4/recipes-connectivity/connman\
+|meta-vib4/recipes-core/busybox\
+|meta-vib4/recipes-core/images\
+|meta-vib4/recipes-core/meta\
+|meta-vib4/recipes-core/packagegroups\
+|meta-vib4/recipes-core/systemd/systemd\
+|meta-vib4/recipes-devtools\
+|meta-vib4/recipes-extended\
+|meta-vib4/recipes-multimedia/audiomanager\
+"
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 7df80e1..cbdfb2f 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -20,4 +20,4 @@
 ##############################################################################
 
 BBMASK ?= " "
-BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|recipes-core/glibc/glibc_linaro-2.20.bbappend"
+BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit"
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.%.bbappend
index df90624..df90624 100644
--- a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend
+++ b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.%.bbappend
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
new file mode 100644
index 0000000..ee61a74
--- /dev/null
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
@@ -0,0 +1,52 @@
+From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+        return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd8..f6aa84d 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-       return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);
+-- 
+1.9.1
+
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
new file mode 100644
index 0000000..66f031f
--- /dev/null
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
@@ -0,0 +1,133 @@
+From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 13 Apr 2016 15:42:49 +0300
+Subject: [PATCH] Change "extern inline" to "static inline"
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). "static inline" is the correct choice
+instead.
+---
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
+ drivers/staging/rtl8712/ieee80211.h            |  4 ++--
+ lib/mpi/mpi-inline.h                           |  2 +-
+ lib/mpi/mpi-internal.h                         | 16 ++++++++--------
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+index 502bfdb..1c8d026 100644
+--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
++++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
+        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+ {
+        /*
+         * It is possible for both access points and our device to support
+@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
+        return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = IEEE80211_3ADDR_LEN;
+ 
+@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
+ 
+ extern const long ieee80211_wlan_frequencies[];
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
+ {
+        ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
+ {
+        return ieee->scans;
+ }
+diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
+index 21515c3..7518061 100644
+--- a/drivers/staging/rtl8712/ieee80211.h
++++ b/drivers/staging/rtl8712/ieee80211.h
+@@ -734,7 +734,7 @@ enum ieee80211_state {
+ #define IEEE_G            (1<<2)
+ #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = 24;
+ 
+diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
+index e2b3985..c245ea3 100644
+--- a/lib/mpi/mpi-inline.h
++++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
++#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 77adcf6..4566d11 100644
+--- a/lib/mpi/mpi-internal.h
++++ b/lib/mpi/mpi-internal.h
+@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
+-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-sub.c --*/
+-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.1
+
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
new file mode 100644
index 0000000..13a89fb
--- /dev/null
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
@@ -0,0 +1,99 @@
+From 376075b9598d602950b73cc78743735585c0a18c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sasha.levin@oracle.com>
+Date: Mon, 13 Oct 2014 15:51:05 -0700
+Subject: [PATCH] kernel: add support for gcc 5
+
+commit 71458cfc782eafe4b27656e078d379a34e472adf upstream.
+
+We're missing include/linux/compiler-gcc5.h which is required now
+because gcc branched off to v5 in trunk.
+
+Just copy the relevant bits out of include/linux/compiler-gcc4.h,
+no new code is added as of now.
+
+This fixes a build error when using gcc 5.
+
+Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 66 insertions(+)
+ create mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+new file mode 100644
+index 0000000..cdd1cc2
+--- /dev/null
++++ b/include/linux/compiler-gcc5.h
+@@ -0,0 +1,66 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used                         __attribute__((__used__))
++#define __must_check                   __attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)      __builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold                 __attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone      __attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ * Fixed in GCC 4.8.2 and later versions.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)        do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
+1.9.1
+
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
index a945ea8..0e6d423 100644
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
@@ -26,6 +26,9 @@ SRC_URI += "\
     file://0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch \
     file://ARM-perf-add-support-for-perf-registers-API.diff \
     file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
+    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
+    file://0001-kernel-add-support-for-gcc-5.patch \
+    file://0001-Change-extern-inline-to-static-inline.patch \
     "
 
 INSANE_SKIP_${PN} = "installed-vs-shipped"
@@ -37,4 +40,5 @@ do_configure_prepend() {
         -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
         -i ${WORKDIR}/defconfig
     echo "CONFIG_FHANDLE=y"  >> ${WORKDIR}/defconfig
+    echo "CONFIG_MOUSE_PS2=n"  >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch
deleted file mode 100644
index 0a3cd76..0000000
--- a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ec1c2b5f637145e2a473820401ab96ecf0f16def Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Mon, 8 Sep 2014 10:23:46 +0300
-Subject: [PATCH] fix glTexImage2D API
-
-internalformat should be GLint and not GLenum.
----
- usr/include/GLES2/gl2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/include/GLES2/gl2.h b/usr/include/GLES2/gl2.h
-index c0e3a44..5aa6c26 100755
---- a/usr/include/GLES2/gl2.h
-+++ b/usr/include/GLES2/gl2.h
-@@ -579,7 +579,7 @@ GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
- GL_APICALL void         GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
--GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels);
-+GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
- GL_APICALL void         GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
- GL_APICALL void         GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
- GL_APICALL void         GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
--- 
-1.8.3.2
-
diff --git a/meta-nuc-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 7bbff62..7bbff62 100644
--- a/meta-nuc-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
diff --git a/meta-nuc-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf
index f0cb66f..3b7be9d 100644
--- a/meta-nuc-extras/conf/layer.conf
+++ b/meta-intel-extras/conf/layer.conf
@@ -27,6 +27,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
             ${LAYERDIR}/recipes*/*/*.bbappend \
             "
 
-BBFILE_COLLECTIONS += "b2qt_nuc"
-BBFILE_PATTERN_b2qt_nuc := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_nuc = "20"
+BBFILE_COLLECTIONS += "b2qt_intel"
+BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_intel = "20"
diff --git a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
index ca53537..ca53537 100644
--- a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg
+++ b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
diff --git a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
index d002240..d002240 100644
--- a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
index 65ac248..65ac248 100644
--- a/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
+++ b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
index 55ac1a2..55ac1a2 100644
--- a/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend
+++ b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
diff --git a/meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
index 2346521..2346521 100644
--- a/meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend
+++ b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
diff --git a/meta-nvidia-logan-extras/conf/layer.conf b/meta-nvidia-extras/conf/layer.conf
index da03f5e..aa447a5 100644
--- a/meta-nvidia-logan-extras/conf/layer.conf
+++ b/meta-nvidia-extras/conf/layer.conf
@@ -27,6 +27,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
             ${LAYERDIR}/recipes*/*/*.bbappend \
 "
 
-BBFILE_COLLECTIONS += "b2qt_nvidia-logan"
-BBFILE_PATTERN_b2qt_nvidia-logan := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_nvidia-logan = "20"
+BBFILE_COLLECTIONS += "b2qt_nvidia"
+BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_nvidia = "20"
diff --git a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
index 86f0571..86f0571 100644
--- a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
diff --git a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf b/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
index a1e45b9..a1e45b9 100644
--- a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
new file mode 100644
index 0000000..f9d9cc6
--- /dev/null
+++ b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
@@ -0,0 +1,28 @@
+do_kernel_defconfig_prepend_tegra-t18x () {
+}
+
+do_install_append_tegra-t18x () {
+    s=$(readlink -m "${S}")
+    kernsrc="${STAGING_KERNEL_DIR}"
+
+    if [ "${s}" != "${kernsrc}" ]; then
+        mkdir -p "${kernsrc}"
+        rm -rf "${kernsrc}"
+        mv "${S}" "${STAGING_KERNEL_DIR}"
+        ln -sf "${kernsrc}" "${s}"
+    fi
+}
+
+do_compile_prepend_tegra-t18x () {
+    if [ -z "${TOOLCHAIN_PATH}" ] ; then
+        echo "TOOLCHAIN_PATH must be set"
+        exit -1
+    fi
+
+    export PATH="${TOOLCHAIN_PATH}/usr/bin/aarch64-gnu-linux:${PATH}"
+
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
+    echo "CONFIG_USB_ACM=m"         >> ${B}/.config
+
+    make olddefconfig
+}
diff --git a/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend b/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend
new file mode 100644
index 0000000..1800e5e
--- /dev/null
+++ b/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend
@@ -0,0 +1,4 @@
+RDEPENDS_${PN}_remove_tegra-t18x = "\
+libgbm-dev \
+"
+
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
index c33ee23..cd74ddf 100644
--- a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
@@ -19,5 +19,5 @@
 ##
 ##############################################################################
 
-DEPENDS += "graphics-headers"
-PACKAGECONFIG += "kms"
+DEPENDS_nvidia-logan += "graphics-headers"
+PACKAGECONFIG_nvidia-logan += "kms"
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
index 7f9ce03..97acf20 100644
--- a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
@@ -20,4 +20,4 @@
 ##############################################################################
 
 CXXFLAGS +=" -DWIN_INTERFACE_CUSTOM"
-
+COMPATIBLE_MACHINE_aarch64 = "(.*)"
diff --git a/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
new file mode 100644
index 0000000..629ccf4
--- /dev/null
+++ b/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 97a29d6..b0e4060 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -208,10 +208,6 @@ AS_CASE([$CC], [*clang*],
+                -Wno-gnu-variable-sized-type-not-at-end \
+         ])])
+ 
+-AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
+-        [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
+-               -flto -ffat-lto-objects])],
+-        [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
+ AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
+ 
+ AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
+-- 
+2.5.0
+
diff --git a/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..d86ee9d
--- /dev/null
+++ b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_tegra-t18x := "${THISDIR}/${PN}:"
diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
new file mode 100644
index 0000000..85a2996
--- /dev/null
+++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
@@ -0,0 +1,12 @@
+GRAPHICS_PACKAGES = " \
+virtual/libgles2 \
+virtual/libegl \
+virtual/egl \
+libgbm \
+libgbm-dev \
+"
+
+PROVIDES_append = " ${GRAPHICS_PACKAGES}"
+RPROVIDES_append_${PN} = " ${GRAPHICS_PACKAGES}"
+CONFLICTS_append_${PN} = " ${GRAPHICS_PACKAGES}"
+REPLACES_append_${PN} = " ${GRAPHICS_PACKAGES}"
diff --git a/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend
new file mode 100644
index 0000000..db0da64
--- /dev/null
+++ b/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend
@@ -0,0 +1,9 @@
+EXTRA_PROVIDES = " \
+virtual/wayland-native \
+wayland-native \
+"
+
+PROVIDES_append = "${EXTRA_PROVIDES}"
+RPROVIDES_append_${PN} = "${EXTRA_PROVIDES}"
+CONFLICTS_append_${PN} = "${EXTRA_PROVIDES}"
+REPLACES_append_${PN} = "${EXTRA_PROVIDES}"
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
new file mode 100644
index 0000000..ee61a74
--- /dev/null
+++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
@@ -0,0 +1,52 @@
+From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+        return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd8..f6aa84d 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-       return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);
+-- 
+1.9.1
+
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch
new file mode 100644
index 0000000..064e28b
--- /dev/null
+++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch
@@ -0,0 +1,59 @@
+From eb38d22ea05961666878dfb88c68629eacfb1399 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Tue, 3 Sep 2013 22:27:26 -0400
+Subject: [PATCH] ARM: LLVMLinux: Change "extern inline" to "static inline" in
+ glue-cache.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). "static inline" is the correct choice
+instead.
+
+Author: Behan Webster <behanw@converseincode.com>
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+---
+ arch/arm/include/asm/glue-cache.h | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
+index c81adc0..a3c24cd 100644
+--- a/arch/arm/include/asm/glue-cache.h
++++ b/arch/arm/include/asm/glue-cache.h
+@@ -130,22 +130,22 @@
+ #endif
+ 
+ #ifndef __ASSEMBLER__
+-extern inline void nop_flush_icache_all(void) { }
+-extern inline void nop_flush_kern_cache_all(void) { }
+-extern inline void nop_flush_kern_cache_louis(void) { }
+-extern inline void nop_flush_user_cache_all(void) { }
+-extern inline void nop_flush_user_cache_range(unsigned long a,
++static inline void nop_flush_icache_all(void) { }
++static inline void nop_flush_kern_cache_all(void) { }
++static inline void nop_flush_kern_cache_louis(void) { }
++static inline void nop_flush_user_cache_all(void) { }
++static inline void nop_flush_user_cache_range(unsigned long a,
+                unsigned long b, unsigned int c) { }
+ 
+-extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
+-extern inline int nop_coherent_user_range(unsigned long a,
++static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
++static inline int nop_coherent_user_range(unsigned long a,
+                unsigned long b) { return 0; }
+-extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
++static inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
+ 
+-extern inline void nop_dma_flush_range(const void *a, const void *b) { }
++static inline void nop_dma_flush_range(const void *a, const void *b) { }
+ 
+-extern inline void nop_dma_map_area(const void *s, size_t l, int f) { }
+-extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
++static inline void nop_dma_map_area(const void *s, size_t l, int f) { }
++static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
+ #endif
+ 
+ #ifndef MULTI_CACHE
+-- 
+1.9.1
+
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
index 330a4f1..4f05ca1 100644
--- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
+++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
@@ -19,6 +19,12 @@
 ##
 ##############################################################################
 
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
+    file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch \
+    "
+
 do_configure_prepend() {
     sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \
         -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
index 49f8f58..49f8f58 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
index 033e534..624fc71 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -9,8 +9,8 @@ inherit cmake_qt5
 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
 
 BRANCH = "2.4"
-SRCREV = "4995051c9d6733ce3eabb486283160bf31c87c10"
-PV = "2.5.50+git${SRCPV}"
+SRCREV = "4cf2c07d9ab6af3f4e0a869749ced1a9d8c86e8e"
+PV = "2.4.1+git${SRCPV}"
 
 DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity"
 
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
index 9d7881c..32e3243 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -3,7 +3,7 @@ Description=Neptune
 After=systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main1280x800.qml
+ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main.qml
 Restart=on-failure
 WorkingDirectory=/opt/neptune
 
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 4dcac1d..5f8d9cf 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -20,17 +20,17 @@
 ##############################################################################
 
 DESCRIPTION = "Neptune IVI UI"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=024d61f4545fb889faa57982553ce094"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c"
 
-inherit qt5-module systemd
+inherit qt5-module sdk-sources systemd
 
 SRC_URI = " \
     git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh \
     file://neptune.service \
     "
 
-SRCREV = "b3f10d156349727310ec30b27d01e639cce4f570"
+SRCREV = "c405b322d773068521855e048f215c6ec59e965f"
 BRANCH = "master"
 
 S = "${WORKDIR}/git"
@@ -48,6 +48,7 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/
 
     install -m 0644 ${S}/Main*.qml ${D}/opt/neptune
+    install -m 0644 ${S}/MainWithCluster.qml ${D}/opt/neptune
     install -m 0644 ${S}/am-config.yaml ${D}/opt/neptune
 }
 
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 502dd06..db16275 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -20,17 +20,17 @@
 ##############################################################################
 
 DESCRIPTION = "Qt component for application lifecycle management"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=311507adb75495acc0b61d69109485ce"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
 
-inherit qmake5
+inherit qmake5 sdk-sources
 
 SRC_URI = " \
     git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh \
     "
 
-SRCREV = "b7578378b578788c2ae9c60708a2908d3b090c16"
-BRANCH = "dev"
+SRCREV = "97530155847257102fe0a159c681857fb9eb1194"
+BRANCH = "5.7"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 038a0c4..88990de 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -20,17 +20,21 @@
 ##############################################################################
 
 DESCRIPTION = "Qt IVI"
-LICENSE = "LGPL-3.0"
-LIC_FILES_CHKSUM = "file://header.LGPL3-PELAGICORE;md5=0f5beb4df202cb6ef5cbc5296f3a3fa4"
+LICENSE = "GFDL-1.3 & BSD & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)"
+LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+                    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+                    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-inherit qt5-module
+inherit qt5-module sdk-sources
 
 SRC_URI = " \
     git://codereview.qt-project.org/qt/qtivi;branch=${BRANCH};protocol=ssh \
     "
 
-SRCREV = "2d378320dc07b8b3ac9a9ce89b7f7a99caa72f8a"
-BRANCH = "dev"
+SRCREV = "b850b82e70e9585097ceb2812002bb4a7ddba06f"
+BRANCH = "5.7"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
index 25494bf..dca7bf9 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -20,21 +20,21 @@
 ##############################################################################
 
 DESCRIPTION = "Qt Web Browser"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://src/main.cpp;md5=e78c6c33aa5ec2464456b72daf61ef9c;beginline=1;endline=36"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
 
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/qtwebbrowser \
+    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Src/qtwebbrowser \
     "
 
-SRCREV = "2e18b419a7084b1e39bf8749855768a1002e34de"
+SRCREV = "7c570ee4297946f3ed70565a630d690070533cbd"
 BRANCH = "dev"
 
 S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative qtwebengine"
 
-FILES_${PN} += "/data/user/qt/qtwebbrowser"
-FILES_${PN}-dbg += "/data/user/qt/qtwebbrowser/.debug"
+FILES_${PN} += "/data/user/qt/qtwebbrowser-app"
+FILES_${PN}-dbg += "/data/user/qt/qtwebbrowser-app/.debug"
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
index cefd3a9..05d666d 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
@@ -2,4 +2,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
index ff4d0da..89e6cd4 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
@@ -4,4 +4,5 @@ env=QSG_RENDER_LOOP=basic
 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
index e3b35f0..29d8b6a 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
@@ -4,4 +4,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QTGLESSTREAM_DISPLAY=192.168.56.1
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
index c8cd106..7105f4b 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
@@ -4,4 +4,5 @@ env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
 env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
index bc143da..200aa90 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
@@ -2,4 +2,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=1
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index 314e491..7a5322d 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -36,7 +36,6 @@ PV = "5.6+git${SRCPV}"
 S = "${WORKDIR}/git/wayland/democompositor/"
 
 DEPENDS = "qtbase qtwayland"
-RDEPENDS_${PN} = "qtwayland (>= 5.7)"
 
 do_install_append() {
     install -d -m0775 ${D}/usr/bin
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
index 004c2e8..bbcb82d 100644
--- a/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -36,6 +36,7 @@ IMAGE_FEATURES += "\
 
 inherit core-image
 inherit bootfs-image
+inherit consistent_timestamps
 
 MACHINE_EXTRA_INSTALL_QT ?= ""
 
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 2909e38..6f82a8b 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -36,6 +36,7 @@ IMAGE_FEATURES += "\
 
 inherit core-image
 inherit bootfs-image
+inherit consistent_timestamps
 
 MACHINE_EXTRA_INSTALL_QT ?= ""
 
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 7e8ce67..edb9625 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -29,7 +29,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     qt3d \
     qtbase \
-    qtbase-fonts \
     qtcanvas3d \
     qtcharts \
     qtconnectivity \
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
index 5162519..de9f504 100644
--- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
+++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
+QT_MODULE_BRANCH = "dev"
 SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"
 
 DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 5b25f39..6b77e36 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -19,7 +19,7 @@
 ##
 ##############################################################################
 
-SRCREV = "8ce657d0279566ef327af1b88339534041ddc012"
+SRCREV = "c327fb79e1a50c825a945e97f2c66d07a1c6d225"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
 
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 318bb1b..4221058 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -25,4 +25,4 @@ SRC_URI_append_class-target = " \
     file://0001-Remove-qgltf.patch \
     "
 
-SRCREV = "9c67288ea4791fee5e28d1b4f2981c232b95c9d0"
+SRCREV = "fae5232d47844c49dc237757e874b1b261240cfe"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index fcbbcf0..c9e1308 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -19,7 +19,7 @@
 ##
 ##############################################################################
 
-SRCREV = "8ce657d0279566ef327af1b88339534041ddc012"
+SRCREV = "c327fb79e1a50c825a945e97f2c66d07a1c6d225"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
 
diff --git a/recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri b/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
index cdb6204..cdb6204 100644
--- a/recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri b/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
new file mode 100644
index 0000000..4597a84
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
@@ -0,0 +1,11 @@
+TEGRA_T18X_CFLAGS       = -DWIN_INTERFACE_CUSTOM
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
+QMAKE_CFLAGS           += $$TEGRA_T18X_CFLAGS
+QMAKE_CXXFLAGS         += $$TEGRA_T18X_CFLAGS
+
+QMAKE_PLATFORM         += boot2qt
+
+QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
+
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index bb778a0..4b2e017 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -45,7 +45,7 @@ do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
 
-SRCREV = "8ce657d0279566ef327af1b88339534041ddc012"
+SRCREV = "c327fb79e1a50c825a945e97f2c66d07a1c6d225"
 
 # Temporarily here, until merged upstream
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index c2ee6e1..d5ce034 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b"
+SRCREV = "32404e27101c5ec81b4ab965faf38263429bbc5a"
diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 5e95d14..f1db6ea 100644
--- a/recipes-qt/qt5-addons/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -20,12 +20,12 @@
 ##############################################################################
 
 DESCRIPTION = "Qt Charts"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3985;beginline=1;endline=17"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599"
+SRCREV = "97bb01ce5d85ac94ed019f0abd7a08917ae4f80a"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 9c4a689..dc570ed 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -19,6 +19,5 @@
 ##
 ##############################################################################
 
-PACKAGECONFIG += "bluez4"
+SRCREV = "f8759f683cfc433c432059e1160d2ab657baaec6"
 
-SRCREV = "80b6557be3a23a5118ddf8c4b68bc28b66f52b49"
diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index a148bdc..fff73e2 100644
--- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -20,12 +20,12 @@
 ##############################################################################
 
 DESCRIPTION = "Qt Data Visualization"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal.h;md5=80b80e41be7c22f5b90fc96163b7d1bf;beginline=1;endline=17"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba"
+SRCREV = "8427634773505f73ce030cf68761c4719eb03e5c"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index f7d8ed7..86d02c4 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "d438b4f4b93d04a841edf031359e26af617d889d"
+SRCREV = "70cb68298ae36e9c8f669182707ac97f8acb0681"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index 6e1888f..79b4872 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf"
+SRCREV = "d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 87a191b..fbc8dec 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f"
+SRCREV = "42b07b2ddf443d3eafd18e169f2e5ab5e36604a5"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index a175291..bd41480 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "f40e92b147560be15e0f53dfd7f6b2d698c00fb9"
+SRCREV = "bae9a0f52eb4c8faab2315dd45757c49544f682c"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index 24f176d..5da4897 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -21,4 +21,4 @@
 
 PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
 
-SRCREV = "3fb3231a9e22dcb780d5b31ec57896429d40b0e5"
+SRCREV = "7f286e0965eb31f29c68b1c1e32d2653ae34014e"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index a80b21f..cb06211 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -31,7 +31,7 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects"
 
-SRCREV = "bed6b3d633d83302a8e2167845db4b36e6847f0b"
+SRCREV = "4ae3a828ad972e24802ea711fc12e12883cc28be"
 
 FILES_${PN}-qmldesigner += " \
     ${OE_QMAKE_PATH_QML}/*/*/*/designer \
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index 29fb136..1dcf121 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "b1d29faf96ee6323bf2dad054291fd7c30a30c05"
+SRCREV = "4b77b044b3e0a27f9f7501e6a78121afc270619c"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index f5301b4..cefbf75 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -22,4 +22,4 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e"
+SRCREV = "33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 484d6ee..fe9c80f 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "04b75569f36eec14662505a08bf8c1d565cb10fe"
+SRCREV = "1675a0d726e5c07c275c0981cc3deb5ffbcc6afc"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index a625d74..5295917 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478"
+SRCREV = "84feab670cce8414ad54f4d19b46291c7fdb14cf"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index beb7513..4b56291 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -19,4 +19,6 @@
 ##
 ##############################################################################
 
-SRCREV = "b722836765dccca04683939d0d4f72a9e2585d88"
+SRCREV = "612c3041475550837dee7149b9f5e9e4f55c17a0"
+
+SRC_URI_remove = "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 31d5773..56652cc 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "aec1d10c66a676781c767099e81871faa040162f"
+SRCREV = "d36d2c3026cae67c119384f47cb2680552c81aaf"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index cfe42a8..a6bc131 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "cbef985e3c3e9af2d124d40959fc674b3b8aa33f"
+SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index f4bdbcc..5835b15 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -20,13 +20,13 @@
 ##############################################################################
 
 DESCRIPTION = "Qt Virtual Keyboard"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e83db02b9629bbd;beginline=1;endline=17"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf"
+SRCREV = "0df8022f93001279d1ca9b76c0df8699bb9fe3fe"
 
 DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
 
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index 66656e6..30c7f3a 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040"
+SRCREV = "15216555593740029f3c25ee16dc4dc248a017b7"
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb
deleted file mode 100644
index 2de879b..0000000
--- a/recipes-qt/qt5/qtwayland_5.7-wip.bb
+++ /dev/null
@@ -1,29 +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$
-##
-##############################################################################
-
-require recipes-qt/qt5/qtwayland_git.bb
-
-SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658"
-PV = "5.7-wip+git${SRCPV}"
-QT_MODULE_BRANCH = "wip-compositor-api"
-EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib"
-
-SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index 66656e6..30c7f3a 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040"
+SRCREV = "15216555593740029f3c25ee16dc4dc248a017b7"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index 49ccceb..ee19a33 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498"
+SRCREV = "a2c3b32d08ed24279609a8c01b09c1147a9ff6b9"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 319a9ad..47d4d4f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \
     file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
     "
 
-SRCREV_qtwebengine = "4ed08bb0a8195746c333dabbdb9da3400d174296"
-SRCREV_chromium = "0a385bb01d9cf060fae4c9d350ee98561654df96"
+SRCREV_qtwebengine = "22a550303618202135e58f5673e7b8935d578687"
+SRCREV_chromium = "349c3122be9f932991f938a33e761b00062a5f5b"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 91881b4..c6cab61 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "3b128f9b45f4fafc305ff0c89cfc2cb665c856d5"
+SRCREV = "00156d63eea2fb7681a8a00a3144392d6325e5cb"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index 28d0211..f3c5e5d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -19,4 +19,4 @@
 ##
 ##############################################################################
 
-SRCREV = "7a8d395a3b1eb5f24aa96509666326bad4218c14"
+SRCREV = "9661c2a29f4bacf77170eb6b3cf016fdb6631f82"
diff --git a/recipes/adbd/files/nuc/defaults b/recipes/adbd/files/intel-corei7-64/defaults
index 0fbba4c..0fbba4c 100644
--- a/recipes/adbd/files/nuc/defaults
+++ b/recipes/adbd/files/intel-corei7-64/defaults
diff --git a/recipes/gdb/gdb-cross-canadian_7.8.1.bbappend b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
index b8a804f..b8a804f 100644
--- a/recipes/gdb/gdb-cross-canadian_7.8.1.bbappend
+++ b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes/gypsy/gypsy_%.bbappend
index 455726a..8d82b6c 100644
--- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
+++ b/recipes/gypsy/gypsy_%.bbappend
@@ -19,10 +19,10 @@
 ##
 ##############################################################################
 
-require recipes-qt/qt5/qtwayland-native_git.bb
+inherit bluetooth
 
-FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:"
+DEPENDS_remove = "bluez4"
+DEPENDS_append := " ${BLUEZ}"
+DEPENDS += "libgudev"
 
-SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2"
-PV = "5.7-wip+git${SRCPV}"
-QT_MODULE_BRANCH = "wip-compositor-api"
+PNBLACKLIST[gypsy] = ""
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend b/recipes/linux-firmware/linux-firmware_git.bbappend
index 102fbfe..ed615cb 100644
--- a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
+++ b/recipes/linux-firmware/linux-firmware_git.bbappend
@@ -19,7 +19,4 @@
 ##
 ##############################################################################
 
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-fix-glTexImage2D-API.patch \
-        "
+LICENSE_CREATE_PACKAGE = "0"
diff --git a/recipes/linux/linux-yocto_3.%.bbappend b/recipes/linux/linux-yocto_4.%.bbappend
index 23b9d3a..23b9d3a 100644
--- a/recipes/linux/linux-yocto_3.%.bbappend
+++ b/recipes/linux/linux-yocto_4.%.bbappend
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 4dbafd5..2cfa4f4 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -19,7 +19,7 @@
 ##
 ##############################################################################
 
-SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees."
+SUMMARY = "Shared library with a reference command line tool for managing bootable, immutable, versioned filesystem trees."
 
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
@@ -28,18 +28,21 @@ inherit autotools pkgconfig systemd
 
 SRC_URI = " \
     git://github.com/GNOME/ostree.git \
-    file://0001-Allow-updating-files-on-the-boot-partition.patch \
-    file://0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
-    file://0003-Allow-updating-files-in-root-of-boot.patch \
-    file://0004-Mount-boot-partition.patch \
-    file://0005-Do-not-use-grub2-mkconfig.patch \
+    file://Fix-enable_rofiles_fuse-no-build.patch \
+    file://Mount-boot-partition.patch \
+    file://Allow-updating-files-in-the-boot-directory.patch \
+    file://u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
+    file://Create-firmware-convenience-symlinks.patch \
     "
 
-SRCREV = "efdb4d8f443768e59529c299290bee8b1f8f93c3"
+SRCREV = "v2016.5"
 
 S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz"
+# 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"
 RRECOMMENDS_${PN} += "gnupg"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
@@ -52,8 +55,10 @@ FILES_${PN} += "${systemd_unitdir}/system/ \
 EXTRA_OECONF = "--with-dracut \
                 --without-selinux \
                 --without-libarchive \
-                --with-grub2=no \
+                --with-builtin-grub2-mkconfig \
+                --enable-rofiles-fuse=no \
                 --enable-gtk-doc-html=no \
+                --enable-man=no \
                 --with-soup \
                 --enable-libsoup-client-certs"
 
diff --git a/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch b/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch
deleted file mode 100644
index 0905cc1..0000000
--- a/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From bbb7a8ce89e3e13672c63fd4f1f19988fdf40014 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 17:37:54 +0100
-Subject: [PATCH 1/2] Allow updating files on the boot partition
-
-Until now OSTree copied only vmlinuz and initramfs
-binaries to the boot partition. This patch adds support
-for copying other files from the /boot directory of the
-tree.
-
-How this works:
-
-Ignore subdirectories, only files in root of the boot
-directory are copied. There is overhead of copying files
-to boot partition, therefore the amount of files in the
-boot/ should be kept to the minimum and subdirectories
-shouldn't really be necessary.
-
-Files on the boot partition are updated only with major
-releases, when kernel/initramfs bootcsum changes. Files
-that require frequent updates should not be stored here.
----
- src/libostree/ostree-sysroot-deploy.c | 53 +++++++++++++++++++++++++++++++++++
- 1 file changed, 53 insertions(+)
-
-diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index f7afe3d..4d6534d 100644
---- a/src/libostree/ostree-sysroot-deploy.c
-+++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -1340,6 +1340,59 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
-         }
-     }
- 
-+  {
-+    /* Copy other files that are stored in the boot directory. Lets keep this simple:
-+     *
-+     * - Ignore subdirectories, only files in root of the boot directory are copied. There is
-+     *   overhead of copying files to boot partition, therefore the amount of files in the boot/
-+     *   should be kept to the minimum and subdirectories shouldn't really be necessary.
-+     * - Files on the boot partition are updated only with major releases, when kernel/initramfs
-+     *   bootcsum changes. Files that require frequent updates should not be stored here.
-+     */
-+    g_autoptr(GFileEnumerator) dir_enum = NULL;
-+    g_autoptr(GFile) deployments_bootdir = g_file_get_child (deployment_dir, "boot");
-+    dir_enum = g_file_enumerate_children (deployments_bootdir, OSTREE_GIO_FAST_QUERYINFO,
-+                                          G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+                                          NULL, error);
-+    while (TRUE)
-+      {
-+        GFileInfo *file_info = NULL;
-+        g_autoptr(GFile) source_file = NULL;
-+        g_autoptr(GFile) dest_file = NULL;
-+        g_autoptr(GFile) symlink_target = NULL;
-+        GFileType type;
-+        const char *name;
-+
-+        if (!gs_file_enumerator_iterate (dir_enum, &file_info, NULL, cancellable, error))
-+          goto out;
-+        if (file_info == NULL)
-+          break;
-+
-+        type = g_file_info_get_file_type (file_info);
-+        name = g_file_info_get_name (file_info);
-+        if (type == G_FILE_TYPE_DIRECTORY)
-+          continue;
-+        if (type == G_FILE_TYPE_SYMBOLIC_LINK)
-+          {
-+            symlink_target = g_file_get_child (bootcsumdir, g_file_info_get_symlink_target(file_info));
-+            if (!g_file_query_exists (symlink_target, NULL))
-+              continue;
-+          }
-+        if (g_str_has_prefix (name, "vmlinuz-") || g_str_has_prefix (name, "initramfs-"))
-+          continue;
-+
-+        dest_file = g_file_get_child (bootcsumdir, name);
-+        if (!g_file_query_exists (dest_file, NULL))
-+          {
-+            source_file = g_file_enumerator_get_child (dir_enum, file_info);
-+            if (!gs_file_linkcopy_sync_data (source_file, dest_file,
-+                                             G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA,
-+                                             cancellable, error))
-+              goto out;
-+          }
-+      }
-+  }
-+
-   if (fstatat (deployment_dfd, "usr/lib/os-release", &stbuf, 0) != 0)
-     {
-       if (errno != ENOENT)
--- 
-2.1.4
-
diff --git a/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch b/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch
deleted file mode 100644
index d93da22..0000000
--- a/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From f5a1391e64d4b17ed05fb47f23d5d35affb9f1fd Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 14:58:56 +0100
-Subject: [PATCH] Allow updating files in root of /boot
-
-It is common for u-boot based systems to search
-top level directory of the boot partiton for
-additional files that are required for booting.
-It can be difficult to change this search logic
-if it is hardcoded somewhere low in the stack or
-in u-boot env that is in read-only memory. To
-allow updating these files you need to add a
-symlink in your ostree sysroot:
-
-cd sysroot/boot
-ln -s loader/my-special-file my-special-file
-
-The bellow code will make sure that loader/my-special-file
-points to the correct target file version.
-
-This does not break the atomic property of update.
----
- src/libostree/ostree-bootloader-uboot.c | 65 +++++++++++++++++++++++++++++++++
- 1 file changed, 65 insertions(+)
-
-diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index be1a40d..779c302 100644
---- a/src/libostree/ostree-bootloader-uboot.c
-+++ b/src/libostree/ostree-bootloader-uboot.c
-@@ -131,6 +131,71 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
-         }
-     }
- 
-+  {
-+       /* It is common for u-boot based systems to search top level directory of the boot
-+        * partiton for additional files that are required for booting. It can be difficult
-+        * to change this search logic if it is hardcoded somewhere low in the stack or in
-+        * u-boot env that is in read-only memory. To allow updating these files you need to
-+        * add a symlink in your ostree sysroot:
-+        *
-+        *    cd sysroot/boot
-+        *    ln -s loader/my-special-file my-special-file
-+        *
-+        * The bellow code will make sure that loader/my-special-file points to the correct
-+        * target file version.
-+        *
-+        */
-+       g_autoptr(GFile) child = NULL;
-+       int loader_fd;
-+       g_autoptr(GFileEnumerator) dir_enum = NULL;
-+       g_autoptr(GFile) real_boot = NULL;
-+       g_autofree char *loader_path = NULL;
-+       char buf[2048];
-+
-+       child = ot_gfile_resolve_path_printf (self->sysroot->path, "boot/loader.%d/", bootversion);
-+       loader_path = g_file_get_path(child);
-+       loader_fd = open (loader_path, O_RDONLY);
-+       if (loader_fd == -1) {
-+         perror("open");
-+         goto out;
-+       }
-+
-+       child = g_file_get_child (self->sysroot->path, "boot");
-+       dir_enum = g_file_enumerate_children (child, OSTREE_GIO_FAST_QUERYINFO,
-+                                             G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+                                             NULL, error);
-+
-+       while (TRUE) {
-+         const char *symlink_target, *name;
-+         GFileInfo *file_info = NULL;
-+
-+         if (!gs_file_enumerator_iterate (dir_enum, &file_info, NULL, cancellable, error)) {
-+           close(loader_fd);
-+           goto out;
-+         }
-+
-+         if (file_info == NULL)
-+           break;
-+
-+         if (g_file_info_get_is_symlink(file_info)) {
-+             symlink_target = g_file_info_get_symlink_target(file_info);
-+             if (g_str_has_prefix(symlink_target, "loader/")) {
-+                 name = g_file_info_get_name(file_info);
-+                 if (g_strcmp0 (name, "uEnv.txt") == 0)
-+                    continue;
-+
-+                 snprintf(buf, sizeof(buf), "%s/%s", loader_path, name);
-+                 remove(buf);
-+                 snprintf(buf, sizeof(buf), "..%s/%s", boot_path, name);
-+                  if (symlinkat(buf, loader_fd, name) == -1)
-+                    perror("symlinkat");
-+             }
-+         }
-+       }
-+
-+       close(loader_fd);
-+   }
-+
-   ret = TRUE;
- out:
-   return ret;
--- 
-2.1.4
-
diff --git a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch b/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
deleted file mode 100644
index 1414ff7..0000000
--- a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b613d60319beffc861f5b1faa906d2ee0c685f52 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Wed, 24 Feb 2016 18:12:27 +0100
-Subject: [PATCH] Do not use grub2-mkconfig.
-
-For details see: https://bugzilla.gnome.org/show_bug.cgi?id=762220
----
- src/libostree/ostree-bootloader-grub2.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
-index 1f89914..7cfb0dc 100644
---- a/src/libostree/ostree-bootloader-grub2.c
-+++ b/src/libostree/ostree-bootloader-grub2.c
-@@ -282,6 +282,8 @@ grub2_child_setup (gpointer user_data)
-     }
- }
- 
-+#define OSTREE_NO_GRUB2_MKCONFIG
-+
- static gboolean
- _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-                                        int                    bootversion,
-@@ -300,6 +302,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-   g_autoptr(GFile) config_path_efi_dir = NULL;
-   g_autofree char *grub2_mkconfig_chroot = NULL;
- 
-+#ifndef OSTREE_NO_GRUB2_MKCONFIG
-   if (ostree_sysroot_get_booted_deployment (self->sysroot) == NULL
-       && g_file_has_parent (self->sysroot->path, NULL))
-     {
-@@ -322,7 +325,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-       tool_deployment_root = ostree_sysroot_get_deployment_directory (self->sysroot, tool_deployment);
-       grub2_mkconfig_chroot = g_file_get_path (tool_deployment_root);
-     }
--
-+#endif
-   if (self->is_efi)
-     {
-       config_path_efi_dir = g_file_get_parent (self->config_path_efi);
-@@ -337,9 +340,16 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-                                                       bootversion);
-     }
- 
-+#ifdef OSTREE_NO_GRUB2_MKCONFIG
-+  procctx = gs_subprocess_context_newv ("ostree-grub-generator", "-o",
-+                                        gs_file_get_path_cached (new_config_path),
-+                                        NULL);
-+#else
-   procctx = gs_subprocess_context_newv ("grub2-mkconfig", "-o",
-                                         gs_file_get_path_cached (new_config_path),
-                                         NULL);
-+#endif
-+
-   child_env = g_environ_setenv (child_env, "_OSTREE_GRUB2_BOOTVERSION", bootversion_str, TRUE);
-   /* We have to pass our state to the child */
-   if (self->is_efi)
--- 
-2.7.0
-
diff --git a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
new file mode 100644
index 0000000..ffcc77c
--- /dev/null
+++ b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
@@ -0,0 +1,99 @@
+From 7f4549c6e94494460be06311c3a4d23ae684ab21 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Wed, 20 Apr 2016 13:58:27 +0200
+Subject: [PATCH 1/3] Allow updating files in the /boot directory.
+
+Until now OSTree copied only the vmlinuz and initramfs
+binaries to the boot/ directory (which in some setups
+might be on a separate partition). This patch adds
+support for copying other files from the deployment's
+/boot directory to the real /boot.
+
+How this works:
+
+Ignore subdirectories, only files in root of the boot
+directory are copied. There is overhead of copying files
+to boot/, therefore the amount of files in boot/ should
+be kept to the minimum and subdirectories shouldn't
+really be necessary.
+
+Files in the boot/ directory are updated only with major
+releases, when kernel/initramfs bootcsum changes. Files
+that require frequent updates should not be stored here.
+---
+ src/libostree/ostree-sysroot-deploy.c | 52 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 8877236..8cf080e 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -1295,6 +1295,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+   g_autofree char *version_key = NULL;
+   g_autofree char *ostree_kernel_arg = NULL;
+   g_autofree char *options_key = NULL;
++  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
+   GString *title_key;
+   __attribute__((cleanup(_ostree_kernel_args_cleanup))) OstreeKernelArgs *kargs = NULL;
+   const char *val;
+@@ -1361,6 +1362,57 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+         }
+     }
+ 
++
++  /* Copy other files that are stored in deployment's /usr/lib/ostree-boot. Lets keep this simple:
++   *
++   * - Ignore subdirectories. Only files in root of the /usr/lib/ostree-boot directory are copied.
++   *   There is an overhead of copying files to boot/, therefore the amount of files in a deployment's
++   *   usr/lib/ostree-boot should be kept to the minimum and subdirectories shouldn't really
++   *   be necessary.
++   *
++   * - Files in /boot are updated only with major releases, when kernel/initramfs
++   *   bootcsum changes. Files that require frequent updates should not be stored here.
++   */
++  if (!glnx_dirfd_iterator_init_take_fd (dup (tree_boot_dfd), &dfd_iter, error))
++    goto out;
++
++  while (TRUE)
++    {
++      struct dirent *dent;
++
++      if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
++        goto out;
++
++      if (dent == NULL)
++        break;
++
++      if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, 0) != 0)
++        {
++          if (errno == ENOENT)
++              continue;
++          glnx_set_error_from_errno (error);
++          goto out;
++        }
++
++      if (g_str_has_prefix (dent->d_name, "vmlinuz-") || g_str_has_prefix (dent->d_name, "initramfs-")
++              || !S_ISREG(stbuf.st_mode))
++        continue;
++
++      if (fstatat (bootcsum_dfd, dent->d_name, &stbuf, 0) != 0)
++        {
++          if (errno != ENOENT)
++            {
++              glnx_set_prefix_error_from_errno (error, "fstat %s", dent->d_name);
++              goto out;
++            }
++          if (!glnx_file_copy_at (tree_boot_dfd, dent->d_name, &stbuf,
++                                  bootcsum_dfd, dent->d_name, 0,
++                                  cancellable, error))
++            goto out;
++        }
++    }
++
++
+   if (fstatat (deployment_dfd, "usr/lib/os-release", &stbuf, 0) != 0)
+     {
+       if (errno != ENOENT)
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
new file mode 100644
index 0000000..960367c
--- /dev/null
+++ b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
@@ -0,0 +1,130 @@
+From 310ddd84dc353d93a2cc118725b459dba643cf0b Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Thu, 21 Apr 2016 16:54:05 +0200
+Subject: [PATCH 3/3] Create firmware convenience symlinks.
+
+Later this could be moved into utils or a similar
+location, if other boot loader backends will need
+this functionality.
+---
+ src/libostree/ostree-bootloader-uboot.c | 97 ++++++++++++++++++++++++++++++++-
+ 1 file changed, 96 insertions(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
+index 9bcde9c..be5e8c5 100644
+--- a/src/libostree/ostree-bootloader-uboot.c
++++ b/src/libostree/ostree-bootloader-uboot.c
+@@ -66,6 +66,100 @@ _ostree_bootloader_uboot_get_name (OstreeBootloader *bootloader)
+   return "U-Boot";
+ }
+ 
++/* It is common for firmware to search / on the boot partition for additional
++ * files that are required for booting. It can be difficult to change this search
++ * logic if it is hardcoded somewhere low in the stack or is in a read-only memory.
++ * This issue can be solved from the OS installer, by creating a symlink in the
++ * following way:
++ *
++ *    cd sysroot/boot
++ *    ln -s loader/second-stage-bootloader second-stage-bootloader
++ *
++ * This function will make sure that loader/second-stage-bootloader points to the
++ * correct target file version. This function does nothing if boot/ does not contain
++ * symlink files pointing into loader/.
++ */
++static gboolean
++create_firmware_convenience_symlinks (OstreeBootloaderUboot     *self,
++                                      char                  *bootcsum_dir,
++                                      int                    bootversion,
++                                      GCancellable          *cancellable,
++                                      GError               **error)
++{
++  gboolean ret = FALSE;
++  glnx_fd_close int loader_dfd = -1;
++  glnx_fd_close int boot_dfd = -1;
++  g_autofree char *loader_dir = NULL;
++  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
++
++  loader_dir = g_strdup_printf ("boot/loader.%d/", bootversion);
++  if (!glnx_opendirat (self->sysroot->sysroot_fd, loader_dir, FALSE, &loader_dfd, error))
++    goto out;
++  if (!glnx_opendirat (self->sysroot->sysroot_fd, "boot", FALSE, &boot_dfd, error))
++    goto out;
++  if (!glnx_dirfd_iterator_init_take_fd (dup (boot_dfd), &dfd_iter, error))
++    goto out;
++
++  while (TRUE) {
++    struct dirent *dent;
++    struct stat stbuf;
++
++    if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
++      goto out;
++    if (dent == NULL)
++      break;
++
++    if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) != 0)
++      {
++        if (errno == ENOENT)
++          continue;
++        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "fstatat");
++        goto out;
++      }
++
++    if (S_ISLNK(stbuf.st_mode))
++      {
++        char path_buffer[PATH_MAX];
++        g_autofree char *symlink_target = NULL;
++        symlink_target = glnx_readlinkat_malloc (boot_dfd, dent->d_name, cancellable, error);
++
++        if (g_str_has_prefix (symlink_target, "loader/"))
++          {
++            if (g_strcmp0 (dent->d_name, "uEnv.txt") == 0)
++              continue;
++
++            snprintf (path_buffer, sizeof(path_buffer), "%s/%s", bootcsum_dir, dent->d_name);
++            if (faccessat (boot_dfd, path_buffer + 1, F_OK, AT_SYMLINK_NOFOLLOW) == -1)
++              {
++                /* This bootcsum dir does not contain the final target, do nothing. */
++                if (errno == ENOENT)
++                  continue;
++                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "faccessat");
++                goto out;
++              }
++
++            /* In case 'ostree admin cleanup' was not run after an interrupted deployment */
++            if (unlinkat (loader_dfd, dent->d_name, 0) == -1 && errno != ENOENT)
++            {
++              g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "unlinkat");
++              goto out;
++            }
++            /* Complete the link chain to the current boot file version */
++            snprintf (path_buffer, sizeof(path_buffer), "..%s/%s", bootcsum_dir, dent->d_name);
++            if (symlinkat (path_buffer, loader_dfd, dent->d_name) == -1)
++              {
++                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "symlinkat");
++                goto out;
++              }
++          }
++      }
++  }
++
++  ret = TRUE;
++out:
++  return ret;
++}
++
+ static gboolean
+ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+                                         int                    bootversion,
+@@ -130,7 +224,8 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+         }
+     }
+ 
+-  ret = TRUE;
++  ret = create_firmware_convenience_symlinks (self, bootdir, bootversion, cancellable, error);
++
+ out:
+   return ret;
+ }
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
new file mode 100644
index 0000000..480fc21
--- /dev/null
+++ b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
@@ -0,0 +1,40 @@
+From b54643153cade28523cccee44fdddea2c94e0684 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Mon, 25 Apr 2016 13:57:03 +0200
+Subject: [PATCH] Fix --enable_rofiles_fuse=no build
+
+---
+ Makefile.am  | 2 ++
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 488d4b6..e49b7c5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -71,7 +71,9 @@ include Makefile-otutil.am
+ include Makefile-libostree.am
+ include Makefile-ostree.am
+ include Makefile-switchroot.am
++if BUILDOPT_FUSE
+ include src/rofiles-fuse/Makefile-inc.am
++endif
+ include Makefile-tests.am
+ include Makefile-boot.am
+ include Makefile-man.am
+diff --git a/configure.ac b/configure.ac
+index dca9f53..6af60e8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,7 +222,7 @@ AC_ARG_ENABLE(rofiles-fuse,
+               [AS_HELP_STRING([--enable-rofiles-fuse],
+                               [generate rofiles-fuse helper [default=yes]])],,
+               enable_rofiles_fuse=yes)
+-AS_IF([ test $enable_rofiles_fuse != xno ], [
++AS_IF([ test x$enable_rofiles_fuse != xno ], [
+     PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY)
+ ], [enable_rofiles_fuse=no])
+ AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes)
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/0004-Mount-boot-partition.patch b/recipes/ostree/ostree/Mount-boot-partition.patch
index a81f731..a81f731 100644
--- a/recipes/ostree/ostree/0004-Mount-boot-partition.patch
+++ b/recipes/ostree/ostree/Mount-boot-partition.patch
diff --git a/recipes/ostree/ostree/0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch b/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
index 08855de..501f8d4 100644
--- a/recipes/ostree/ostree/0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
+++ b/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
@@ -1,18 +1,24 @@
-From 5ee49772b001b9757d6cb21fcc587d5ddc66cdb7 Mon Sep 17 00:00:00 2001
+From 86184e5a266b087ba222b03141b491241e27e284 Mon Sep 17 00:00:00 2001
 From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 17:39:16 +0100
-Subject: [PATCH 2/2] u-boot: Merge ostree's and systems uEnv.txt
+Date: Thu, 21 Apr 2016 14:28:38 +0200
+Subject: [PATCH 2/3] u-boot: Merge ostree's and systems uEnv.txt
 
-This allows for simpler u-boot scripts and is
-a proper fix for:
+This allow for simpler u-boot scripts and is a proper
+fix for: https://bugzilla.gnome.org/show_bug.cgi?id=755787
 
-https://bugzilla.gnome.org/show_bug.cgi?id=755787
+With this patch admin can now:
+
+1) Edit /usr/lib/ostree-boot/uEnv.txt
+
+2) Download the update to a target. And during the deploy
+   process OSTree will prepend its env (loader/uEnv.txt)
+   to the system's uEnv.txt
 ---
- src/libostree/ostree-bootloader-uboot.c | 42 ++++++++++++++++++++++++++++++---
- 1 file changed, 39 insertions(+), 3 deletions(-)
+ src/libostree/ostree-bootloader-uboot.c | 41 ++++++++++++++++++++++++++++++---
+ 1 file changed, 38 insertions(+), 3 deletions(-)
 
 diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index f67e9bd..be1a40d 100644
+index f67e9bd..9bcde9c 100644
 --- a/src/libostree/ostree-bootloader-uboot.c
 +++ b/src/libostree/ostree-bootloader-uboot.c
 @@ -29,6 +29,10 @@
@@ -34,9 +40,9 @@ index f67e9bd..be1a40d 100644
    g_autoptr(GPtrArray) boot_loader_configs = NULL;
    OstreeBootconfigParser *config;
    const char *val;
-+  g_autofree char *boot_path = NULL;
++  g_autofree char *bootdir = NULL;
 +  g_autoptr(GFile) uenv_file = NULL;
-+  char uenv_path[2048];
++  char uenv_path[PATH_MAX];
  
    if (!_ostree_sysroot_read_boot_loader_configs (self->sysroot, bootversion, &boot_loader_configs,
                                                   cancellable, error))
@@ -54,26 +60,25 @@ index f67e9bd..be1a40d 100644
      }
    g_ptr_array_add (new_lines, g_strdup_printf ("kernel_image=%s", val));
  
-+  boot_path = strndup (val, strlen (val) - strlen ("/vmlinuz"));
-+  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s", boot_path));
++  bootdir = strndup (val, strrchr(val, '/') - val);
++  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s/", bootdir));
 +
    val = ostree_bootconfig_parser_get (config, "initrd");
    if (val)
      g_ptr_array_add (new_lines, g_strdup_printf ("ramdisk_image=%s", val));
-@@ -97,7 +108,32 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+@@ -97,7 +108,31 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
    if (val)
      g_ptr_array_add (new_lines, g_strdup_printf ("bootargs=%s", val));
  
 -  return TRUE;
-+  /* Merge with user's uEnv.txt if it exists */
-+  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", boot_path);
++  /* Append user's uEnv.txt if it exists */
++  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", bootdir);
 +  uenv_file = g_file_get_child (self->sysroot->path, uenv_path);
 +  if (g_file_query_exists (uenv_file, cancellable))
 +    {
 +      g_autoptr(GInputStream) instream = NULL;
 +      g_autoptr(GDataInputStream) datastream = NULL;
 +      gsize len;
-+
 +      instream = (GInputStream*)g_file_read (uenv_file, cancellable, error);
 +      if (!instream)
 +        goto out;
@@ -95,5 +100,5 @@ index f67e9bd..be1a40d 100644
  
  static gboolean
 -- 
-2.1.4
+2.7.4
 
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index 13935bd..11fee22 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -24,6 +24,7 @@ PR = "r0"
 LICENSE = "CLOSED"
 
 inherit packagegroup
+inherit bluetooth
 
 RDEPENDS_${PN} += "\
     packagegroup-core-standalone-sdk-target \
@@ -51,6 +52,6 @@ RDEPENDS_${PN} += "\
     libevent-dev \
     ostree-dev \
     ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \
     ${MACHINE_EXTRA_INSTALL_SDK} \
     "
diff --git a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch b/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch
deleted file mode 100644
index 9e5fe4d..0000000
--- a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The wayland-scanner built for the nativesdk cannot be run during the build,
-so instead use the wayland-scanner from native build.
-
-Upstream-Status: Pending
-
-Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
----
- Makefile.am | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/Makefile.am b/Makefile.am
-index c15d8b8..45f7133 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -62,7 +62,7 @@ nodist_libwayland_client_la_SOURCES =         \
- pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
- 
- if ENABLE_SCANNER
--wayland_scanner = $(top_builddir)/wayland-scanner
-+wayland_scanner = wayland-scanner
- bin_PROGRAMS = wayland-scanner
- wayland_scanner_SOURCES = src/scanner.c
- wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
--- 
-1.9.1
-
diff --git a/recipes/wayland/wayland_1.%.bbappend b/recipes/wayland/wayland_1.%.bbappend
deleted file mode 100644
index 4497942..0000000
--- a/recipes/wayland/wayland_1.%.bbappend
+++ /dev/null
@@ -1,31 +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}/${PN}:"
-SRC_URI_append_class-nativesdk = " \
-    file://disable-macro-checks-not-used-for-scanner.patch \
-    file://0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch \
-    "
-
-EXTRA_OECONF_class-nativesdk = "--disable-documentation --enable-scanner"
-DEPENDS_class-nativesdk = "libffi-nativesdk wayland-native"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/wayland/weston/0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch b/recipes/wayland/weston/0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch
deleted file mode 100644
index 1bb9253..0000000
--- a/recipes/wayland/weston/0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c4633014fff25d32926129a8b028124c6338bb2b Mon Sep 17 00:00:00 2001
-From: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
-Date: Wed, 19 Aug 2015 09:04:46 +0300
-Subject: [PATCH 1/1] Adapt changes made in libinput/src/evdev.c for touch
- frame emission.
-
----
- src/evdev.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index 888dfbd..daa5d72 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -359,12 +359,36 @@ evdev_process_absolute(struct evdev_device *device,
-        }
- }
- 
-+static inline int
-+evdev_need_touch_frame(struct evdev_device *device)
-+{
-+       if (!(device->seat_caps & EVDEV_SEAT_TOUCH))
-+               return 0;
-+
-+       switch (device->pending_event) {
-+       case EVDEV_NONE:
-+       case EVDEV_RELATIVE_MOTION:
-+               break;
-+       case EVDEV_ABSOLUTE_MT_DOWN:
-+       case EVDEV_ABSOLUTE_MT_MOTION:
-+       case EVDEV_ABSOLUTE_MT_UP:
-+       case EVDEV_ABSOLUTE_TOUCH_DOWN:
-+       case EVDEV_ABSOLUTE_TOUCH_UP:
-+       case EVDEV_ABSOLUTE_MOTION:
-+               return 1;
-+       }
-+
-+       return 0;
-+}
-+
- static void
- fallback_process(struct evdev_dispatch *dispatch,
-                 struct evdev_device *device,
-                 struct input_event *event,
-                 uint32_t time)
- {
-+       int need_frame = 0;
-+
-        switch (event->type) {
-        case EV_REL:
-                evdev_process_relative(device, event, time);
-@@ -376,7 +400,10 @@ fallback_process(struct evdev_dispatch *dispatch,
-                evdev_process_key(device, event, time);
-                break;
-        case EV_SYN:
-+               need_frame = evdev_need_touch_frame(device);
-                evdev_flush_pending_event(device, time);
-+               if (need_frame)
-+                       notify_touch_frame(device->seat);
-                break;
-        }
- }
--- 
-2.1.4
-
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 5e326c9..28ccfa3 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -17,39 +17,39 @@
 
   <project name="poky"
            remote="yocto"
-           revision="900d7d6b59c36b2bdbd1c85febec99e80ab54f95"
+           revision="b1f23d1254682866236bfaeb843c0d8aa332efc2"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="902964a4da26e46018d2a8d17dcdda1ac4627a39"
+           revision="dc5634968b270dde250690609f0015f881db81f2"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="46817620916ed6d8b8f07c720f29d1faa73eafae"
+           revision="e6897ccd0eec8fb5229e0fdd8f354292e0f49a16"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="0cfd9b1a41b38a2f7c1cfcbc2abe046e3737ae31"/>
+           revision="2844575c17f3875aa2ad0e83d600f52a1893390d"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="c9f259a4bf8472dfa3ff75f1c3fcbe5e0ded7aaf"
+           revision="8d22b44716fa624ff87383c36d222d9e28d0b267"
            path="sources/meta-fsl-arm"
            groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="0a222c70845d19a2213ac36803361e8531768cca"
+           revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
            path="sources/meta-ti"
            groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="a42a1706de91ed03ae8798c7f9e70c30cebcf7de"
+           revision="e82417d33b8147f65141ef937d56735d80ee7207"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="ad90ca98459f5de9483bb3ba5a81be0a67b078c3"
+           revision="8fdde39f732be9e1ee9505a04c579073114459e7"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
@@ -69,9 +69,9 @@
            groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
-           revision="ead0a5c115e632015d8358f4f304ec8908732f5f"
+           revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
            path="sources/meta-intel"
-           groups="notdefault,external,nuc"/>
+           groups="notdefault,external,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_jethro.xml
index be15f02..29b401c 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_jethro.xml
@@ -17,29 +17,29 @@
 
   <project name="poky"
            remote="yocto"
-           revision="fido"
+           revision="jethro"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="master-mingw"
+           revision="5.7"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="fido"/>
+           revision="jethro"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-fsl-arm"
            groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="fido"
+           revision="master"
            path="sources/meta-ti"
            groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
@@ -49,7 +49,7 @@
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
@@ -69,9 +69,9 @@
            groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-intel"
-           groups="notdefault,external,nuc"/>
+           groups="notdefault,external,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 566b708..322792f 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -51,7 +51,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx6|colibri-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)
@@ -66,14 +66,14 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     beaglebone)
       LAYERSCONF="bblayers.conf.bbb.sample"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
-    nuc)
-      LAYERSCONF="bblayers.conf.nuc.sample"
+    intel-corei7-64)
+      LAYERSCONF="bblayers.conf.intel.sample"
     ;;
-    nvidia-logan)
-      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
+    nvidia-logan|tegra-x1|tegra-t18x)
+      LAYERSCONF="bblayers.conf.nvidia.sample"
     ;;
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 2a87217..60e7e14 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -23,7 +23,7 @@
 set -x
 set -e
 
-RELEASE=5.6
+RELEASE=5.7
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
 if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then
@@ -33,7 +33,7 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf
-elif [ ${MACHINE} == "nvidia-logan" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
+elif [ ${MACHINE} == "nvidia-logan" || ${MACHINE} == "tegra-x1" || ${MACHINE} == "tegra-t18x" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \
     $PWD/tmp/deploy/images/${MACHINE}/zImage