128 files changed, 294 insertions, 1848 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index decc2ec..e90188a 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -130,8 +130,8 @@ get_groups() {
    emulator)
      PROJECT_GROUPS="emulator"
    ;;
-    alt|gose|koelsch|lager|porter|silk|stout)
+    jetson-tx1|jetson-tk1)
-      PROJECT_GROUPS="renesas"
+      PROJECT_GROUPS="jetson"
    ;;
    *)
      echo "Unknown device configuration, including all meta layers"
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index a0563ce..c7a25ae 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -44,15 +44,15 @@ fakeroot do_bootfs () {
        src=`echo $item | awk -F':' '{ print $1 }'`
        dst=`echo $item | awk -F':' '{ print $2 }'`
-        install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst
+        install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/bootfs/$dst
    done
    cd ${S}/bootfs
-    rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz
+    rm -f ${IMGDEPLOYDIR}/${BOOTFS_NAME}.tar.gz ${IMGDEPLOYDIR}/${BOOTFS_LINK_NAME}.tar.gz
-    mkdir -p ${DEPLOY_DIR_IMAGE}
+    mkdir -p ${IMGDEPLOYDIR}
-    tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz .
+    tar czvf ${IMGDEPLOYDIR}/${BOOTFS_NAME}.tar.gz .
-    ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz
+    ln -s ${BOOTFS_NAME}.tar.gz ${IMGDEPLOYDIR}/${BOOTFS_LINK_NAME}.tar.gz
 }
 addtask bootfs before do_rootfs
diff --git a/classes/deploy-conf.bbclass b/classes/deploy-conf.bbclass
index 61df5dc..228b1e2 100644
--- a/classes/deploy-conf.bbclass
+++ b/classes/deploy-conf.bbclass
@@ -33,7 +33,7 @@ DEPLOY_CONF_NAME ?= "${MACHINE}"
 DEPLOY_CONF_TYPE ?= "Boot2Qt"
 IMAGE_CMD_conf() {
-    cat > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.conf <<EOF
+    cat > ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.conf <<EOF
 [${DEPLOY_CONF_TYPE} | ${DEPLOY_CONF_NAME}]
 platform=${MACHINE}
 os=linux
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index 1391be1..d12f3bf 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -36,9 +36,9 @@ SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
 inherit image_types image-vm
 create_hdd_image () {
-    cd ${DEPLOY_DIR_IMAGE}
+    cd ${IMGDEPLOYDIR}
-    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
-    ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
+    ln -s ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
 }
 python do_hddimg() {
diff --git a/classes/image_dd.bbclass b/classes/image_dd.bbclass
index 07cd58f..e0addf7 100644
--- a/classes/image_dd.bbclass
+++ b/classes/image_dd.bbclass
@@ -27,11 +27,11 @@
 ##
 ############################################################################
-# This class is based on meta-fsl-arm/classes/image_types_fsl.bbclass::generate_imx_sdcard()
+# This class is based on meta-freescale/classes/image_types_fsl.bbclass::generate_imx_sdcard()
 DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool."
 inherit image_types
-IMAGE="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+IMAGE="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.img"
 # Boot partition size [in KiB]
 BOOT_SPACE ?= "8192"
@@ -53,7 +53,7 @@ EXPORT_FUNCTIONS do_populate_boot
 IMAGE_CMD_dd() {
-    ROOTFS="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+    ROOTFS="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3"
    # Align boot partition and calculate total binary image size
    BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
@@ -80,7 +80,7 @@ IMAGE_CMD_dd() {
    dd if=${WORKDIR}/boot.img of=${IMAGE} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
    dd if=${ROOTFS} of=${IMAGE} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.rootfs.img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.img ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index e9b07f1..28fe3e1 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -28,22 +28,41 @@
 ############################################################################
 IMAGE_ROOTFS_EXTRA_SPACE = "100000"
-SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+SDCARD_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3"
 SDCARD_GENERATION_COMMAND ?= "generate_imx_sdcard"
 IMAGE_CMD_sdcard_append() {
    parted -s ${SDCARD} set 1 boot on
-    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.rootfs.sdcard ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.sdcard ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
 IMAGE_CMD_rpi-sdimg_append() {
-    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
 build_hddimg_append() {
-    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.hddimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+}
+IMAGE_DEPENDS_tegraflash_append = " parted-native:do_populate_sysroot"
+create_tegraflash_pkg_prepend() {
+    # Create partition table
+    SDCARD=${IMGDEPLOYDIR}/${IMAGE_NAME}.img
+    SDCARD_ROOTFS=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext3
+    SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT})
+    dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE})
+    parted -s ${SDCARD} mklabel msdos
+    parted -s ${SDCARD} unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE})
+    parted ${SDCARD} print
+    dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.img ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass
index 13fb365..9ea3cd8 100644
--- a/classes/qbsp-image.bbclass
+++ b/classes/qbsp-image.bbclass
@@ -40,14 +40,14 @@ fakeroot do_qbsp_image () {
        src=`echo $item | awk -F':' '{ print $1 }'`
        dst=`echo $item | awk -F':' '{ print $2 }'`
-        install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/qbsp/$dst
+        install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst
    done
    cd ${S}/qbsp
-    7zr a ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.7z .
+    7zr a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z .
-    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z
-    ln -s ${IMAGE_NAME}.7z ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z
+    ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z
 }
 IMAGE_POSTPROCESS_COMMAND += "do_qbsp_image;"
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index a13db65..2dd42d0 100644
--- a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -122,7 +122,7 @@ prepare_qbsp() {
    patch_installer_files ${COMPONENT_PATH}/meta
    mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images
-    7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
+    7zr x ${IMGDEPLOYDIR}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
    cd ${B}/images
    7zr a ${COMPONENT_PATH}/data/image.7z *
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 3564ad1..c36e4c4 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -28,6 +28,9 @@
 ############################################################################
 python __anonymous() {
+    if d.getVar('DISABLE_QTQUICKCOMPILER', True) == "1":
+        return
    provider = ""
    sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
    pn = d.getVar("PN", True)
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 61e12fa..389cb82 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -38,8 +38,8 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-fsl-arm \
+  ${BSPDIR}/sources/meta-freescale \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.jetson.sample
index 27f28ae..969f071 100644
--- a/conf/bblayers.conf.rcar-gen2.sample
+++ b/conf/bblayers.conf.jetson.sample
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -36,18 +36,16 @@ BBFILES ?= ""
 BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
 BBLAYERS ?= " \
-  ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-renesas \
-  ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
+  ${BSPDIR}/sources/meta-tegra \
-  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
  "
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
index ec480ef..c1ac918 100644
--- a/conf/bblayers.conf.nvidia-tegra.sample
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -46,8 +46,7 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
  ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-vib4-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-nvidia-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index b10e415..4c634ec 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -38,8 +38,8 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-fsl-arm \
+  ${BSPDIR}/sources/meta-freescale \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
  ${BSPDIR}/sources/meta-smx6 \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 8ad8960..d97a613 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -39,7 +39,7 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-ti \
-  ${BSPDIR}/sources/meta-fsl-arm \
+  ${BSPDIR}/sources/meta-freescale \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 81cc98b..3048fff 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -51,16 +51,14 @@ SANITY_TESTED_DISTROS += " \
 SYSVINIT_ENABLED_GETTYS = ""
-DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs webengine"
+DISTRO_FEATURES_DEFAULT_remove = "irda pcmcia pci 3g nfc zeroconf x11"
-POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
-DISTRO_FEATURES += "gstreamer"
+DISTRO_FEATURES += "gstreamer webengine systemd"
-DISTRO_FEATURES += "systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = ""
 PREFERRED_PROVIDER_udev ?= "systemd"
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 4a4d460..2c3b32a 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -38,4 +38,4 @@ BOOT_SCRIPTS += " \
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine"
+DISTRO_FEATURES_remove = "webengine wayland"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index df71a91..e4c025b 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -39,6 +39,5 @@ BOOT_SCRIPTS += " \
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-PREFERRED_VERSION_linux-toradex = "4.1"
-DISTRO_FEATURES_remove = "webengine"
+DISTRO_FEATURES_remove = "webengine wayland"
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index a5b95b5..21b2e65 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -29,7 +29,7 @@
 IMAGE_CLASSES += "image-hdd"
 IMAGE_ROOTFS_ALIGNMENT = "1048576"
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext3"
 IMAGE_FSTYPES = "ext3"
 QBSP_IMAGE_CONTENT = "${IMAGE_LINK_NAME}.hdd"
@@ -43,7 +43,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client"
 KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
-DISTRO_FEATURES_remove = "webengine opengl"
+DISTRO_FEATURES_remove = "webengine opengl wayland"
 MACHINE_EXTRA_INSTALL += "\
        mount-vboxsf \
diff --git a/conf/distro/include/fsl.inc b/conf/distro/include/fsl.inc
index bdd0b88..32fec1b 100644
--- a/conf/distro/include/fsl.inc
+++ b/conf/distro/include/fsl.inc
@@ -27,7 +27,7 @@
 ##
 ############################################################################
-BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+BBMASK += "meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5"
 IMAGE_FSTYPES += "ext3 sdcard"
 IMAGE_CLASSES += "image_types_fsl"
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 9983af3..683c601 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -32,8 +32,6 @@ include conf/distro/include/opencv.inc
 DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
-DISTRO_FEATURES_DEFAULT += "wayland"
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 # add support for both imx6qsabresd and imx6dlsabresd
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf
index 3b959a4..a72ff0c 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/conf/distro/include/intel-corei7-64.conf
@@ -29,8 +29,6 @@
 DEPLOY_CONF_NAME = "Intel NUC"
-DISTRO_FEATURES_DEFAULT += "wayland"
 DISTRO_FEATURES_remove = "usbgadget"
 IMAGE_CLASSES += "image_dd_efi"
diff --git a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend b/conf/distro/include/jetson-tx1.conf
index 2aec751..80435f3 100644
--- a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
+++ b/conf/distro/include/jetson-tx1.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,10 +27,18 @@
 ##
 ############################################################################
-COMPATIBLE_MACHINE = ""
+DEPLOY_CONF_NAME = "NVIDIA Jetson TX1"
-FILESEXTRAPATHS_prepend := "${THISDIR}/../linux/linux-renesas:"
+# use mmc0
+ROOTFS_DEVICE = "mmcblk1p1"
-SRC_URI += " \
+INITRAMFS_MAXSIZE = "165888"
-    file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \
+IMAGE_CLASSES += "image_types_tegra"
+IMAGE_FSTYPES += "tegraflash"
+IMAGE_ROOTFS_ALIGNMENT = "1024"
+UBOOT_SUFFIX = "bin"
+QBSP_IMAGE_CONTENT = "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
    "
diff --git a/conf/distro/include/koelsch.conf b/conf/distro/include/koelsch.conf
deleted file mode 100644
index e2add8b..0000000
--- a/conf/distro/include/koelsch.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-require rcar-gen2.inc
-DEPLOY_CONF_NAME = "Renesas Koelsch"
diff --git a/conf/distro/include/lager.conf b/conf/distro/include/lager.conf
deleted file mode 100644
index 97e0b14..0000000
--- a/conf/distro/include/lager.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-require rcar-gen2.inc
-DEPLOY_CONF_NAME = "Renesas Lager"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index a8db798..e59faca 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -82,8 +82,6 @@ KERNEL_DEVICETREE += "\
    imx6dl-nit6xlite.dtb \
    "
-DISTRO_FEATURES_DEFAULT += "wayland"
 MACHINE_EXTRA_INSTALL += "\
        bcm4330-nvram-config \
        "
diff --git a/conf/distro/include/porter.conf b/conf/distro/include/porter.conf
deleted file mode 100644
index ef94cf9..0000000
--- a/conf/distro/include/porter.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-require rcar-gen2.inc
-DEPLOY_CONF_NAME = "Renesas Porter"
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
deleted file mode 100644
index 2768f88..0000000
--- a/conf/distro/include/rcar-gen2.inc
+++ /dev/null
@@ -1,139 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# To build for the rcar devices you must install the binary gpu drivers as
-# follows. These are made available under the name R-Car Series Evaluation
-# Software Package for Linux at the following address:
-#
-#   http://www.renesas.com/secret/r_car_download/rcar_demoboard.jsp
-#
-# You need two files named as follows:
-#  - R-Car_Series_Evaluation_Software_Package_for_Linux-<yyyymmdd>.zip
-#  - R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers-<yyyymmdd>.zip
-#
-# You can place them in any location, below ~/Downloads is assumed. Now do
-# the following:
-#
-#   $ mkdir build && cd build
-#   $ export MACHINE=YourMachineHere
-#   $ ~/meta-boot2qt/b2qt-init-build-env init --device $MACHINE
-#   $ cd sources/meta-renesas
-#   $ ./meta-rcar-gen2/docs/sample/copyscript/copy_eva_sw_pkgs.sh ~/Downloads
-#
-# The script takes as the sole argument the location of the two zips. You must
-# be in the right directory when you call the script!
-#
-# You can now build as usual:
-#   $ cd ../..
-#   $ . setup-environment.sh
-#   $ bitbake b2qt-embedded-image
-#
-include conf/distro/include/fsl.inc
-# internal copy of R-Car_Series_Evaluation_Software_Packages used for CI
-FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:"
-KERNEL_MODULE_AUTOLOAD += " \
-    phy-rcar-gen2-usb \
-    hid_multitouch \
-    renesas_usbhs \
-"
-GLES_DRIVER = "sgx"
-GLES_DRIVER_r8a7790 = "rgx"
-DISTRO_FEATURES += "wayland bluetooth bluez5 h264avcenc_lib"
-MACHINE_FEATURES += "multimedia ${GLES_DRIVER}"
-PREFERRED_VERSION_gstreamer1.0-libav = "1.2.3"
-PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
-PREFERRED_PROVIDER_virtual/egl = "libegl"
-PREFERRED_PROVIDER_libgbm = "libgbm"
-PREFERRED_PROVIDER_libgbm-dev = "libgbm-dev"
-MULTIMEDIA_PACKAGES = " \
-    gstreamer1.0-plugins-base-videorate \
-    gstreamer1.0-plugins-base-videotestsrc \
-    gstreamer1.0-plugins-base-audiotestsrc \
-    gstreamer1.0-plugins-base-alsa \
-    gstreamer1.0-plugins-good-autodetect \
-    gstreamer1.0-plugins-good-isomp4 \
-    gstreamer1.0-plugins-good-video4linux2 \
-    gstreamer1.0-plugins-good-videocrop \
-    gstreamer1.0-plugins-bad-asfmux \
-    gstreamer1.0-plugins-bad-fbdevsink \
-    gstreamer1.0-plugins-bad-faad \
-    gstreamer1.0-plugins-bad-videoparsersbad \
-    packagegroup-rcar-gen2-multimedia \
-"
-# Unfortunately several Renesas components suffer from various issues requiring workarounds
-#   libgbm-dev is required as some part of the binary driver stack attempts to dlopen an unversioned so
-#   bash is required as it is hardcoded in a system setup script
-#   libdrm-tests appears to be required (to be confirmed?)
-RENESAS_WORKAROUNGS = " \
-    libgbm-dev \
-    bash \
-    libdrm-tests \
-"
-MACHINE_EXTRA_INSTALL += " \
-    kernel-devicetree \
-    libdrm-kms \
-    libegl \
-    gles-kernel-module \
-    gles-user-module \
-    ${RENESAS_WORKAROUNGS} \
-    ${@base_contains("MACHINE_FEATURES", "multimedia", "${MULTIMEDIA_PACKAGES}", "", d)} \
-"
-MACHINE_EXTRA_INSTALL_append_lcb = " \
-    can-utils \
-    libsocketcan \
-    ${@base_contains("MACHINE_FEATURES", "multimedia", "packagegroup-lcb-oss-codecs", "", d)} \
-"
-BB_MULTIMEDIA_TEST_MODULE = "\
-    fdpm-tp-user-module \
-    mmngr-tp-user-module \
-    mmngrbuf-tp-user-module \
-    s3ctl-tp-user-module \
-    vspm-tp-user-module \
-    "
-BBMASK += "\
-    ${BB_MULTIMEDIA_TEST_MODULE} \
-    dtv-module ssp-module scu-module \
-    gles-test-module \
-    poky/meta/recipes-graphics/mesa \
-    meta-fsl-arm/recipes-graphics/mesa \
-    meta-rcar-gen2/recipes-devtools/file \
-    "
diff --git a/conf/distro/include/silk.conf b/conf/distro/include/silk.conf
deleted file mode 100644
index 85ec4ac..0000000
--- a/conf/distro/include/silk.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-require rcar-gen2.inc
-DEPLOY_CONF_NAME = "Renesas Silk"
diff --git a/conf/distro/include/stout.conf b/conf/distro/include/stout.conf
deleted file mode 100644
index d6a1eb0..0000000
--- a/conf/distro/include/stout.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-require rcar-gen2.inc
-DEPLOY_CONF_NAME = "Renesas Stout"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index 80f4d57..85b0b6c 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -30,7 +30,7 @@
 OLDEST_KERNEL_aarch64 = "3.18"
 TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
-DISTRO_FEATURES_DEFAULT += "wayland"
 IMAGE_FSTYPES += "tar.gz"
 QBSP_IMAGE_CONTENT = "\
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index 4c9f803..80f90f2 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -40,3 +40,4 @@ EXTRA_IMAGEDEPENDS += "u-boot"
 PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/mesa = "ti-sgx-ddk-um"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index f98c43b..81fd5c7 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -283,6 +283,7 @@ INHERIT += "internal-build"
 # Enables use of QtQuickCompiler if you have access to the gerrit project
 #ENABLE_QTQUICKCOMPILER = "1"
+DISABLE_QTQUICKCOMPILER = "1"
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
index b5d96b6..ac70843 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
@@ -50,7 +50,7 @@ do_mkimage () {
    for scr in ${WORKDIR}/*.scr; do
        uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
                  -n "update script" -d ${scr} \
-                  $(basename ${scr} .scr).img
+                  ${S}/$(basename ${scr} .scr).img
    done
 }
diff --git a/meta-vib4-extras/conf/layer.conf b/meta-nvidia-extras/conf/layer.conf
index 525c018..f1717ac 100644
--- a/meta-vib4-extras/conf/layer.conf
+++ b/meta-nvidia-extras/conf/layer.conf
@@ -35,6 +35,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
            ${LAYERDIR}/recipes*/*/*.bbappend \
 "
-BBFILE_COLLECTIONS += "b2qt_vib4"
+BBFILE_COLLECTIONS += "b2qt_nvidia"
-BBFILE_PATTERN_b2qt_vib4 := "^${LAYERDIR}/"
+BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_vib4 = "20"
+BBFILE_PRIORITY_b2qt_nvidia = "20"
diff --git a/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
index 3cfe234..3cfe234 100644
--- a/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
diff --git a/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf b/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf
index a1e45b9..a1e45b9 100644
--- a/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf
diff --git a/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend b/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
index 4314a20..4314a20 100644
--- a/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
+++ b/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
diff --git a/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend b/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend
index d3e2337..d3e2337 100644
--- a/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend
+++ b/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend
diff --git a/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend b/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
index df91dfe..df91dfe 100644
--- a/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
+++ b/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
diff --git a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
index f2bdba1..f2bdba1 100644
--- a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
+++ b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
diff --git a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
index 70ee515..70ee515 100644
--- a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
+++ b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
diff --git a/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
index 8770c65..8770c65 100644
--- a/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
diff --git a/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
index 94178db..94178db 100644
--- a/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
index 53ea1e4..53ea1e4 100644
--- a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
+++ b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
index da1f5f7..da1f5f7 100644
--- a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
+++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
index 2cc22df..2cc22df 100644
--- a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
+++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
diff --git a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch b/meta-nvidia-extras/recipes/wayland/wayland/always-build-scanner.patch
index 5e0e6bf..5e0e6bf 100644
--- a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch
+++ b/meta-nvidia-extras/recipes/wayland/wayland/always-build-scanner.patch
diff --git a/meta-vib4-extras/recipes/wayland/wayland_%.bbappend b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend
index 463d5a1..463d5a1 100644
--- a/meta-vib4-extras/recipes/wayland/wayland_%.bbappend
+++ b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend
diff --git a/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch b/meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
index 062da5c..062da5c 100644
--- a/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
+++ b/meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
diff --git a/meta-vib4-extras/recipes/weston/weston_%.bbappend b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
index cfc286f..cfc286f 100644
--- a/meta-vib4-extras/recipes/weston/weston_%.bbappend
+++ b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
diff --git a/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend b/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
deleted file mode 100644
index bb86181..0000000
--- a/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-SYSTEMD_SERVICE_${PN}_raspberrypi3 = "brcm43438.service bluetooth.service"
diff --git a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend
deleted file mode 100644
index 13ac255..0000000
--- a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-EXTRA_OECONF_append_rpi = " LDFLAGS='-lbcm_host'"
diff --git a/conf/distro/include/alt.conf b/meta-raspberrypi-extras/recipes/wayland/weston_%.bbappend
index 6ae9e1d..25ec264 100644
--- a/conf/distro/include/alt.conf
+++ b/meta-raspberrypi-extras/recipes/wayland/weston_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,5 +27,5 @@
 ##
 ############################################################################
-require rcar-gen2.inc
+# from https://www.mail-archive.com/yocto@yoctoproject.org/msg33193.html
-DEPLOY_CONF_NAME = "Renesas Alt"
+PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', 'kms', d)}"
diff --git a/meta-renesas-extras/classes/renesas-module.bbclass b/meta-renesas-extras/classes/renesas-module.bbclass
deleted file mode 100644
index a0b5014..0000000
--- a/meta-renesas-extras/classes/renesas-module.bbclass
+++ /dev/null
@@ -1,79 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-### Unfortunately the kernel module recipes in meta-renesas/meta-rcar-gen2
-### are fairly broken, as they tend to install their include files into the
-### staging area. That breaks when recompiling the kernel and is just flaky
-### in general. Try to make things work reliably.
-inherit module
-addtask shared_workdir after do_compile
-EXTRA_OEMAKE += "ARCH=${ARCH}"
-export BUILDDIR = "${STAGING_DIR_HOST}"
-export LIBSHARED = "${STAGING_LIBDIR}"
-export KERNELSRC = "${STAGING_KERNEL_DIR}"
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-export KERNELDIR = "${STAGING_KERNEL_BUILDDIR}"
-export LDFLAGS = ""
-export CP = "cp"
-MODULE_SOURCE_DIR ?= "${S}/drv/"
-do_compile() {
-    cd ${MODULE_SOURCE_DIR}
-    module_do_compile
-    cd -
-}
-deploy_build_deps() {
-    targetdir="$1"
-    install -d ${targetdir}/include
-    install ${MODULE_SOURCE_DIR}/Module.symvers $targetdir/include/${MODULE_NAME}.symvers
-    for header in ${MODULE_HEADERS} ; do
-        install -t ${targetdir}/include ${S}/${header}
-    done
-}
-do_shared_workdir () {
-    deploy_build_deps ${STAGING_KERNEL_BUILDDIR}
-}
-do_install() {
-    install -D ${MODULE_SOURCE_DIR}/${MODULE_NAME}${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/extra/${MODULE_NAME}${KERNEL_OBJECT_SUFFIX}
-    deploy_build_deps ${D}/usr/src/kernel
-}
-FILES_${PN}-dev = " \
-    /usr/src/kernel/include/${MODULE_NAME}.symvers \
-    /usr/src/kernel/include/*.h \
-"
diff --git a/meta-renesas-extras/conf/layer.conf b/meta-renesas-extras/conf/layer.conf
deleted file mode 100644
index 4ad824c..0000000
--- a/meta-renesas-extras/conf/layer.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
-            ${LAYERDIR}/recipes*/*/*.bbappend \
-            "
-BBFILE_COLLECTIONS += "b2qt_renesas"
-BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_renesas = "20"
diff --git a/meta-renesas-extras/recipes/adbd/files/defaults b/meta-renesas-extras/recipes/adbd/files/defaults
deleted file mode 100644
index d2a3cc0..0000000
--- a/meta-renesas-extras/recipes/adbd/files/defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-VENDOR=0x18d1
-PRODUCT=0x0000
-SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
-USE_ETHERNET=no
diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb
deleted file mode 100755
index 6b48c83..0000000
--- a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-LICENSE = "GPLv2 & MIT"
-LIC_FILES_CHKSUM = "\
-file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
-file://include/GPL-COPYING;md5=ffa10f40b98be2c2bc9608f56827ed23 \
-file://include/MIT-COPYING;md5=5526ef6e21dc96a1dd89fac4bde9f995 \
-"
-DEPENDS = "mmngr-kernel-module"
-SRC_URI = "file://fdpm-kernel.tar.bz2"
-S = "${WORKDIR}/fdpm"
-do_configure[depends] += "mmngr-kernel-module:do_shared_workdir"
-inherit renesas-module
-FDPM_CFG_r8a7790 = "H2CONFIG"
-FDPM_CFG_r8a7791 = "M2CONFIG"
-FDPM_CFG_r8a7793 = "M2CONFIG"
-FDPM_CFG_r8a7794 = "E2CONFIG"
-MODULE_NAME = "fdpm"
-MODULE_HEADERS = "include/fdpm_drv.h include/fdpm_public.h include/fdpm_api.h"
-do_compile_prepend() {
-    export FDPM_CONFIG=${FDPM_CFG}
-    export FDPM_MMNGRDIR=${STAGING_KERNEL_BUILDDIR}/include
-    export FDPM_MMNGRSYMVERS=mmngr.symvers
-}
diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend
deleted file mode 100644
index 4ffe869..0000000
--- a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/fdpm-module/files:"
diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend b/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend
deleted file mode 100644
index 1704972..0000000
--- a/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-do_compile[depends] += "\
-    fdpm-kernel-module:do_shared_workdir \
-    mmngr-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
deleted file mode 100644
index bc36d70..0000000
--- a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 54bba228ea52d01fd84941d97be23c03f9862b64 Mon Sep 17 00:00:00 2001
-From: Carlos Rafael Giani <dv@pseudoterminal.org>
-Date: Sat, 6 Apr 2013 01:22:22 +0200
-Subject: [PATCH] Disable yasm for libav when --disable-yasm
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Shane Wang <shane.wang@intel.com>
-Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
---
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/configure.ac b/configure.ac
-index 22ede88..ef3c050 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -305,6 +305,12 @@ else
-     emblibav_configure_args="$emblibav_configure_args --enable-gpl"
-   fi
-+  AC_ARG_ENABLE(yasm,
-+              [AC_HELP_STRING([--disable-yasm], [disable use of yasm assembler])])
-+  if test "x$enable_yasm" = "xno"; then
-+    emblibav_configure_args="$emblibav_configure_args --disable-yasm"
-+  fi
-+
-   # if we are cross-compiling, tell libav so
-   case $host in
-       *android*)
-- 
-1.8.2
diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb
deleted file mode 100644
index cfa9a66..0000000
--- a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-include recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
-                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
-                    file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
-                    file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
-                    file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
-SRC_URI = " \
-    http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
-    file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
-    "
-SRC_URI[md5sum] = "58c7998a054d8d8ca041fa35738f72b6"
-SRC_URI[sha256sum] = "ebc7fbe10955f40df6ccc4bf689075e7e296205fc7ecd8ff383d43c5cdf5bcd6"
-LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
-  --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
-  --ranlib='${RANLIB}' \
-  ${GSTREAMER_1_0_DEBUG}"
-S = "${WORKDIR}/gst-libav-${PV}"
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch b/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch
deleted file mode 100644
index b495d39..0000000
--- a/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 57254b6ebce4ceca02d9c8b615f6059c56c19238 Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <list.btrfs@jan-o-sch.net>
-Date: Mon, 6 May 2013 19:14:17 +0000
-Subject: [PATCH] Btrfs: add ioctl to wait for qgroup rescan completion
-btrfs_qgroup_wait_for_completion waits until the currently running qgroup
-operation completes. It returns immediately when no rescan process is in
-progress. This is useful to automate things around the rescan process (e.g.
-testing).
-Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
-Signed-off-by: Josef Bacik <jbacik@fusionio.com>
---
- fs/btrfs/ctree.h           |  2 ++
- fs/btrfs/ioctl.c           | 12 ++++++++++++
- fs/btrfs/qgroup.c          | 21 +++++++++++++++++++++
- include/uapi/linux/btrfs.h |  1 +
- 4 files changed, 36 insertions(+)
-diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
-index a365400..e36e97b 100644
--- a/fs/btrfs/ctree.h
-+++ b/fs/btrfs/ctree.h
-@@ -1613,6 +1613,7 @@ struct btrfs_fs_info {
-        struct mutex qgroup_rescan_lock; /* protects the progress item */
-        struct btrfs_key qgroup_rescan_progress;
-        struct btrfs_workers qgroup_rescan_workers;
-+       struct completion qgroup_rescan_completion;
- 
-        /* filesystem state */
-        unsigned long fs_state;
-@@ -3820,6 +3821,7 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans,
- int btrfs_quota_disable(struct btrfs_trans_handle *trans,
-                        struct btrfs_fs_info *fs_info);
- int btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info);
-+int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info);
- int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
-                              struct btrfs_fs_info *fs_info, u64 src, u64 dst);
- int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,
-diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 0f81d67..1e0dda1 100644
--- a/fs/btrfs/ioctl.c
-+++ b/fs/btrfs/ioctl.c
-@@ -3937,6 +3937,16 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)
-        return ret;
- }
- 
-+static long btrfs_ioctl_quota_rescan_wait(struct file *file, void __user *arg)
-+{
-+       struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;
-+
-+       if (!capable(CAP_SYS_ADMIN))
-+               return -EPERM;
-+
-+       return btrfs_qgroup_wait_for_completion(root->fs_info);
-+}
-+
- static long btrfs_ioctl_set_received_subvol(struct file *file,
-                                            void __user *arg)
- {
-@@ -4179,6 +4189,8 @@ long btrfs_ioctl(struct file *file, unsigned int
-                return btrfs_ioctl_quota_rescan(file, argp);
-        case BTRFS_IOC_QUOTA_RESCAN_STATUS:
-                return btrfs_ioctl_quota_rescan_status(file, argp);
-+       case BTRFS_IOC_QUOTA_RESCAN_WAIT:
-+               return btrfs_ioctl_quota_rescan_wait(file, argp);
-        case BTRFS_IOC_DEV_REPLACE:
-                return btrfs_ioctl_dev_replace(root, argp);
-        case BTRFS_IOC_GET_FSLABEL:
-diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
-index 7f38cce..d059d86 100644
--- a/fs/btrfs/qgroup.c
-+++ b/fs/btrfs/qgroup.c
-@@ -2070,6 +2070,8 @@ out:
-        } else {
-                pr_err("btrfs: qgroup scan failed with %d\n", err);
-        }
-+
-+       complete_all(&fs_info->qgroup_rescan_completion);
- }
- 
- static void
-@@ -2110,6 +2112,7 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)
-        fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_RESCAN;
-        memset(&fs_info->qgroup_rescan_progress, 0,
-                sizeof(fs_info->qgroup_rescan_progress));
-+       init_completion(&fs_info->qgroup_rescan_completion);
- 
-        /* clear all current qgroup tracking information */
-        for (n = rb_first(&fs_info->qgroup_tree); n; n = rb_next(n)) {
-@@ -2126,3 +2129,21 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)
- 
-        return 0;
- }
-+
-+int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info)
-+{
-+       int running;
-+       int ret = 0;
-+
-+       mutex_lock(&fs_info->qgroup_rescan_lock);
-+       spin_lock(&fs_info->qgroup_lock);
-+       running = fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN;
-+       spin_unlock(&fs_info->qgroup_lock);
-+       mutex_unlock(&fs_info->qgroup_rescan_lock);
-+
-+       if (running)
-+               ret = wait_for_completion_interruptible(
-+                                       &fs_info->qgroup_rescan_completion);
-+
-+       return ret;
-+}
-diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
-index 5ef0df5..5b683b5 100644
--- a/include/uapi/linux/btrfs.h
-+++ b/include/uapi/linux/btrfs.h
-@@ -530,6 +530,7 @@ struct btrfs_ioctl_send_args {
-                               struct btrfs_ioctl_quota_rescan_args)
- #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
-                               struct btrfs_ioctl_quota_rescan_args)
-+#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
- #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \
-                                   char[BTRFS_LABEL_SIZE])
- #define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg
deleted file mode 100644
index 1c60d89..0000000
--- a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg
+++ /dev/null
@@ -1,89 +0,0 @@
-# Drivers
-CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_RCAR_GEN2_PHY=m
-CONFIG_USB_RENESAS_USBHS=m
-CONFIG_USB_RENESAS_USBHS_HCD=y
-CONFIG_USB_RENESAS_USBHS_UDC=y
-CONFIG_USB_OTG=y
-# FunctionFS for adb
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_ETH=y
-# Enable USB serial support
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_ACM=m
-# ConfigFS
-CONFIG_USB_CONFIGFS=m
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_LB_SS=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_G_NCM=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MASS_STORAGE=m
-# Newer inits like systemd need cgroup support
-CONFIG_CGROUP_SCHED=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-# Bluetooth bits
-CONFIG_BT_HIDP=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_RFKILL=m
-CONFIG_FHANDLE=y
-CONFIG_USB_NAMESPACES=m
-# HID support
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-# USB HID support
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-# needed for USB touchscreens
-CONFIG_HID_MULTITOUCH=y
-# additional configs needed for Genivi compliance
-CONFIG_EXPERIMENTAL=y
-CONFIG_ECRYPT_FS=y
-CONFIG_QUOTA=y
-CONFIG_BT=y
-# add uinput for automated testing
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend b/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend
deleted file mode 100644
index 0309846..0000000
--- a/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend
+++ /dev/null
@@ -1,35 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += " \
-    file://b2qt.cfg \
-    file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \
-    "
diff --git a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
deleted file mode 100644
index 0dd030a..0000000
--- a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-PROVIDES_remove = "virtual/libgles2 virtual/egl libgbm libgbm-dev"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb
deleted file mode 100755
index b21afe4..0000000
--- a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-LICENSE = "GPLv2 & MIT"
-LIC_FILES_CHKSUM = "\
-file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
-file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
-"
-SRC_URI = "file://mmngr.tar.bz2"
-S = "${WORKDIR}/mmngr"
-inherit renesas-module
-MODULE_NAME = "mmngr"
-MODULE_HEADERS = "include/mmngr_public.h include/mmngr_private.h"
-MMNGR_CFG_r8a7790 = "MMNGR_LAGER"
-MMNGR_CFG_r8a7791 = "MMNGR_KOELSCH"
-MMNGR_CFG_r8a7793 = "MMNGR_GOSE"
-MMNGR_CFG_r8a7794 = "MMNGR_ALT"
-do_compile_prepend() {
-    export MMNGR_CONFIG=${MMNGR_CFG}
-    export MMNGR_SSP_CONFIG="MMNGR_SSP_DISABLE"
-}
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend
deleted file mode 100644
index 23815b7..0000000
--- a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/mmngr-module/files:"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend
deleted file mode 100644
index 411da42..0000000
--- a/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-do_compile[depends] += "mmngr-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb
deleted file mode 100755
index 46718d4..0000000
--- a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-LICENSE = "GPLv2 & MIT"
-SRC_URI = "file://mmngrbuf.tar.bz2"
-LIC_FILES_CHKSUM = "file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
-    file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 "
-inherit renesas-module
-S = "${WORKDIR}/mmngrbuf"
-MODULE_NAME = "mmngrbuf"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend
deleted file mode 100644
index 23815b7..0000000
--- a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/mmngr-module/files:"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend
deleted file mode 100644
index 840e770..0000000
--- a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-do_compile[depends] += "mmngrbuf-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend b/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend
deleted file mode 100644
index 995d265..0000000
--- a/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend
+++ /dev/null
@@ -1,41 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# The recipe adds an unpack_append where it creates the folder, but by then
-# base.bbclass will have reported a non-existent directory warning.
-do_unpack_prepend() {
-    bb.utils.mkdirhier(d.getVar('S', True))
-}
-do_configure[depends] += "\
-    mmngr-kernel-module:do_shared_workdir \
-    vspm-kernel-module:do_shared_workdir \
-    s3ctl-kernel-module:do_shared_workdir \
-    fdpm-kernel-module:do_shared_workdir \
-    uvcs-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch
deleted file mode 100644
index af414ad..0000000
--- a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9966e10f36876daa910ce301a175633771470e82 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 18 Nov 2015 10:14:18 +0200
-Subject: [PATCH] Remove qgltf
-assimp does not compile for ARM because of GCC bug
-(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964)
-Task-number: QTBUG-49153
---
- tools/tools.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tools/tools.pro b/tools/tools.pro
-index 09c7d8e..8f093ce 100644
--- a/tools/tools.pro
-+++ b/tools/tools.pro
-@@ -1,3 +1,3 @@
- TEMPLATE = subdirs
-!android:SUBDIRS += qgltf
-+#!android:SUBDIRS += qgltf
- qgltf.CONFIG += host_build
diff --git a/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend b/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend
deleted file mode 100644
index d32d0e6..0000000
--- a/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend
+++ /dev/null
@@ -1,34 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI_append_class-target = " \
-    file://0001-Remove-qgltf.patch \
-    "
diff --git a/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend b/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend
deleted file mode 100644
index f35b662..0000000
--- a/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-DEPENDS_append_class-target = " virtual/mesa"
diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb
deleted file mode 100755
index 6ff2fb8..0000000
--- a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-LICENSE = "GPLv2 & MIT"
-LIC_FILES_CHKSUM = "file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378"
-SRC_URI = "file://s3ctl-kernel.tar.bz2"
-S = "${WORKDIR}/s3ctl"
-inherit renesas-module
-MODULE_NAME = "s3ctl"
-MODULE_HEADERS = "include/s3ctl_private.h"
diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend
deleted file mode 100644
index 38f22a8..0000000
--- a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/s3ctl-module/files:"
diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend
deleted file mode 100644
index 51b2f42..0000000
--- a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-do_compile[depends] += "s3ctl-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend b/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend
deleted file mode 100644
index f491bc1..0000000
--- a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/uvcs-module/files:"
diff --git a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb
deleted file mode 100755
index ff20028..0000000
--- a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-LICENSE = "GPLv2 & MIT"
-LIC_FILES_CHKSUM = " \
-file://GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
-"
-SRC_URI = " \
-    git://github.com/renesas-devel/vsp2driver.git;protocol=git;branch=RCAR-GEN2/1.0.0 \
-    file://vsp2drv-init \
-"
-SRCREV = "8cc362a6c961661e4655904f8d7731e501529d6c"
-S = "${WORKDIR}/git"
-DEPENDS = "vspm-kernel-module"
-do_configure[depends] += "vspm-kernel-module:do_shared_workdir"
-MODULE_NAME = "vsp2"
-INITSCRIPT_NAME = "vsp2drv"
-INITSCRIPT_PARAMS = "start 8 5 2 . stop 61 0 1 6 ."
-inherit renesas-module update-rc.d
-do_compile_prepend() {
-    export VSP2_VSPMDIR=${STAGING_KERNEL_BUILDDIR}/include
-    export VSP2_VSPMSYMVERS=vspm.symvers
-}
-do_install_append() {
-    install -D -m 0755 ${WORKDIR}/vsp2drv-init ${D}/${sysconfdir}/init.d/vsp2drv
-}
-FILES_${PN} += "/etc/init.d/vsp2drv"
diff --git a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend
deleted file mode 100644
index 509317a..0000000
--- a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/vspm-module/files:"
diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb
deleted file mode 100755
index 05518fa..0000000
--- a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-LICENSE = "GPLv2 & MIT"
-LIC_FILES_CHKSUM = "\
-file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
-"
-SRC_URI = "file://vspm-kernel.tar.bz2"
-S = "${WORKDIR}/vspm"
-inherit renesas-module
-MODULE_NAME = "vspm"
-MODULE_HEADERS = " \
-include/vspm_public.h \
-include/vsp_drv.h \
-include/tddmac_drv.h \
-include/vspm_if.h \
-"
-VSPM_CFG_r8a7790 = "H2CONFIG"
-VSPM_CFG_r8a7791 = "M2CONFIG"
-VSPM_CFG_r8a7793 = "M2CONFIG"
-VSPM_CFG_r8a7794 = "E2CONFIG"
-do_compile_prepend() {
-    export VSPM_CONFIG=${VSPM_CFG}
-}
-do_install_append() {
-    # Copy for vspm-user-module
-    install -t ${STAGING_INCDIR} ${S}/include/vspm_if.h
-}
-FILES_${PN}-dev += "/usr/include/vspm_if.h"
diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend
deleted file mode 100644
index 509317a..0000000
--- a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/vspm-module/files:"
diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend
deleted file mode 100644
index 2c0744f..0000000
--- a/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-do_compile[depends] += "vspm-kernel-module:do_shared_workdir"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
index 7ef6ed9..940c931 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
@@ -27,4 +27,6 @@
 ##
 ############################################################################
-SRCREV = "7d527c1914710a511c06713bbda1572b767cea34"
+do_install_append() {
+    rm -f ${D}${libdir}/libdrm.so.2
+}
diff --git a/meta-renesas-extras/recipes/glibc/glibc_%.bbappend b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend
index e0d6c92..1f375e6 100644
--- a/meta-renesas-extras/recipes/glibc/glibc_%.bbappend
+++ b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,6 +27,17 @@
 ##
 ############################################################################
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa', '', d)}"
+PACKAGES += "${PN}-dev"
+RRECOMMENDS_${PN}-dev += "\
+    libgles1-mesa-dev \
+    libgles2-mesa-dev \
+    libgles3-mesa-dev \
+    libegl-mesa-dev \
+    libgl-mesa-dev \
+    "
 do_install_append() {
-    echo "/usr/local/lib" >> ${D}${sysconfdir}/ld.so.conf
+    install -m 0644 ${DRVROOT}/tegra/libdrm* ${D}${libdir}
 }
diff --git a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
index 84558b4..6079659 100644
--- a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
+++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
@@ -30,6 +30,9 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += "file://99-fb.rules"
+# for supporting weston
+PROVIDES += "virtual/mesa"
 do_install_append() {
    install -d ${D}${base_libdir}/udev/rules.d
    install -m 0644 ${WORKDIR}/99-fb.rules ${D}${base_libdir}/udev/rules.d
@@ -38,3 +41,5 @@ do_install_append() {
 FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
 RRECOMMENDS_${PN} += "ti-sgx-ddk-km"
+INSANE_SKIP_${PN} += "already-stripped"
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
index ca5db11..6317040 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -13,7 +13,7 @@ SRCREV = "a22da6d63cab08f3ef8588611fdbda3f96731efe"
 PV = "${BRANCH}+git${SRCPV}"
 DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \
-           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+           ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 30ead52..ba82524 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -46,7 +46,7 @@ SRCREV = "1770881783025b04ff5b4c7da7810d1648485b92"
 DEPENDS = "qtbase qtdeclarative qttools-native"
 RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \
                  qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \
-                  ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+                  ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 do_install_append() {
    install -m 0755 -d ${D}${systemd_unitdir}/system
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 4e71c85..52ee20e 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -37,13 +37,13 @@ require recipes-qt/qt5/qt5-git.inc
 SRCREV = "f472ef3662cf0a9bc2bf727c7cef18fd884df5a2"
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
-           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+           ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
 RDEPENDS_${PN} = "libcrypto ${PN}-tools"
 RDEPENDS_${PN}_remove_mingw32 = "libcrypto"
 EXTRA_QMAKEVARS_PRE += "\
-    ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
    -config install-prefix=/usr \
    -config systemd-workaround \
    -config hardware-id=neptune \
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index 3fbc0a0..f133352 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -63,7 +63,7 @@ SRC_URI[video2.sha256sum] = "651e0b4d2b3272dc10bfc9edba4f0c1a7084cd087c75e8a098f
 S = "${WORKDIR}/git/basicsuite"
 DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtcanvas3d \
-           ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+           ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 do_install_append() {
    # we only need plugins from the demos
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index c3f4061..32f569b 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -46,7 +46,7 @@ SRC_URI += " \
 SRCREV = "7ff96b74f8721dbaf50722561770815a4530b6a0"
 DEPENDS = "qtbase qtdeclarative \
-           ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+           ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 do_install_append() {
    install -m 0755 -d ${D}${sysconfdir}/init.d
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
index 179831a..67819d7 100644
--- a/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -48,8 +48,8 @@ inherit consistent_timestamps
 IMAGE_INSTALL += "\
    packagegroup-b2qt-embedded-base \
    packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
    packagegroup-b2qt-qt5-modules \
    packagegroup-b2qt-automotive-addons \
    "
diff --git a/recipes-qt/images/b2qt-embedded-ci-image.bb b/recipes-qt/images/b2qt-embedded-ci-image.bb
index 09dbcf8..32773e1 100644
--- a/recipes-qt/images/b2qt-embedded-ci-image.bb
+++ b/recipes-qt/images/b2qt-embedded-ci-image.bb
@@ -44,8 +44,8 @@ inherit core-image
 IMAGE_INSTALL += "\
    packagegroup-b2qt-embedded-base \
    packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
    packagegroup-b2qt-qt5-modules \
    "
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 4d0bfa4..d8743a5 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -48,8 +48,8 @@ inherit consistent_timestamps
 IMAGE_INSTALL += "\
    packagegroup-b2qt-embedded-base \
    packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
    packagegroup-b2qt-qt5-modules \
    packagegroup-b2qt-embedded-addons \
    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index bd7f777..be15207 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -39,7 +39,7 @@ RDEPENDS_${PN} += " \
    qtivi \
    neptune-ui \
    neptune-ui-apps \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
    gammaray \
    qmllive-target \
    multiscreen-demo \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 05dc416..8008c89 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -38,6 +38,6 @@ RDEPENDS_${PN} += " \
    b2qt-appcontroller \
    b2qt-launcher \
    b2qt-demos \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
    ${@bb.utils.contains("ENABLE_QDBD", "1", "qdbd", "", d)} \
    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 48e769a..786b17a 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -68,8 +68,8 @@ RDEPENDS_${PN} += " \
    qttools-dev \
    qttools-staticdev \
    qtvirtualkeyboard-dev \
-    ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
    qtwebsockets-dev \
    qtwebchannel-dev \
    qtxmlpatterns-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 2d9eeb6..17ea74b 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -68,8 +68,8 @@ RDEPENDS_${PN} += " \
    qttranslations-qtserialport \
    qttranslations-qtwebsockets \
    qttranslations-qtxmlpatterns \
-    ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \
    qtwebsockets \
    qtwebchannel \
    qtxmlpatterns \
diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
index d15e167..4d46679 100644
--- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb
+++ b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
@@ -29,7 +29,7 @@
 DESCRIPTION = "QtSimulator"
 LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=eb588a9fa3a2a45f725e9eb9f864e74b;beginline=1;endline=17"
 inherit qt5-module
@@ -37,8 +37,7 @@ SRC_URI = " \
    git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \
    "
-# v1.0.8
+SRCREV = "0307e85a8d3a8b83a346aa3910e88aabb7b7b2ac"
-SRCREV = "faf8ea5cee8a4105b97c3f2ba4a4c828f03a70ab"
 BRANCH = "master"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
index 9f6fdc3..43e1685 100644
--- a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
@@ -3,3 +3,4 @@ QMAKE_LIBS_OPENGL_ES2  = -lQtGlesStreamClient
 QMAKE_PLATFORM         += boot2qt
 QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = none
diff --git a/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri b/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
new file mode 100644
index 0000000..d4c14ca
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
@@ -0,0 +1,4 @@
+QMAKE_PLATFORM         += boot2qt
+QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index 7ee2382..2a949eb 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -27,7 +27,5 @@
 ##
 ############################################################################
-PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
 DEPENDS_append_emulator = " qtsimulator"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index fd2a901..63f0f6a 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -37,7 +37,7 @@ SRC_URI = " \
    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
    "
-SRCREV = "f7d0d43749d9bbd4c695738697ad95998a49956a"
+SRCREV = "8df367f3a7356337dba25666c52e73e3b0480df3"
 S = "${WORKDIR}/git"
diff --git a/recipes/adbd/files/Makefile.adbd b/recipes/adbd/files/Makefile.adbd
index bcbfd7a..753d2d7 100644
--- a/recipes/adbd/files/Makefile.adbd
+++ b/recipes/adbd/files/Makefile.adbd
@@ -25,7 +25,7 @@ LIBCUTILS_SRC_FILES := \
 LIBCUTILS_OBJ_FILES=$(LIBCUTILS_SRC_FILES:%.c=%.o)
 adbd: $(LOCAL_OBJ_FILES) $(LIBCUTILS_OBJ_FILES)
-        $(CC) $^ -o $@ -lcrypto -Wl,--as-needed -ldl -lpthread -lresolv
+        $(CC) $(LDFLAGS) $^ -o $@ -lcrypto -Wl,--as-needed -ldl -lpthread -lresolv
 ../libcutils/%.o: ../libcutils/%.c
        $(CC) -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -D_XOPEN_SOURCE -D_GNU_SOURCE -c $^ -o $@ -I../include/ -DHAVE_TERMIO_H -DHAVE_FORKEXEC
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index dde2927..64d750c 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/recipes/dbus/dbus_%.bbappend
@@ -52,12 +52,12 @@ FILES_${PN}-session-init = " \
 do_install_append_class-target() {
    sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
-    if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
        install -d ${D}${sysconfdir}/init.d
        install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session
    fi
-    if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
        install -m 0755 -d ${D}${bindir}/
        install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/
diff --git a/recipes/gdb/gdb-cross-canadian_7.%.bbappend b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
index bafdcbd..9e3c296 100644
--- a/recipes/gdb/gdb-cross-canadian_7.%.bbappend
+++ b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
-DEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python"
+DEPENDS_append_sdkmingw32 = " nativesdk-prebuild-python"
 RDEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python"
 EXTRA_OECONF_remove_sdkmingw32 = " --without-python"
 EXTRA_OECONF_append_sdkmingw32 = " --with-python"
diff --git a/recipes/gnutls/files/check_SYS_getrandom.patch b/recipes/gnutls/files/check_SYS_getrandom.patch
new file mode 100644
index 0000000..50693bf
--- /dev/null
+++ b/recipes/gnutls/files/check_SYS_getrandom.patch
@@ -0,0 +1,36 @@
+From f26c3979ab0325edb2e410d287bc501cf00e0ac0 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Mon, 22 Aug 2016 16:32:34 +0200
+Subject: [PATCH] rnd-linux: added check for SYS_getrandom being defined
+This allows to compile the getrandom() code in old Linux systems
+which do not have the system call defined.
+---
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+ lib/nettle/rnd-linux.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+diff --git a/lib/nettle/rnd-linux.c b/lib/nettle/rnd-linux.c
+index d7f07a6..7a24d05 100644
+--- a/lib/nettle/rnd-linux.c
+++ b/lib/nettle/rnd-linux.c
+@@ -56,7 +56,11 @@ static dev_t _gnutls_urandom_fd_rdev = 0;
+ # else
+ #  include <sys/syscall.h>
+ #  undef getrandom
+-#  define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags)
+#  if defined(SYS_getrandom)
+#   define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags)
+#  else
+#   define getrandom(dst,s,flags) -1
+#  endif
+ # endif
+ 
+ static unsigned have_getrandom(void)
+--
+libgit2 0.24.0
diff --git a/conf/distro/include/gose.conf b/recipes/gnutls/gnutls_3.%.bbappend
index 3906e76..8d91bb0 100644
--- a/conf/distro/include/gose.conf
+++ b/recipes/gnutls/gnutls_3.%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,5 +27,6 @@
 ##
 ############################################################################
-require rcar-gen2.inc
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-DEPLOY_CONF_NAME = "Renesas Gose"
+SRC_URI += "file://check_SYS_getrandom.patch"
diff --git a/recipes/gypsy/gypsy_%.bbappend b/recipes/gypsy/gypsy_%.bbappend
deleted file mode 100644
index c03c75b..0000000
--- a/recipes/gypsy/gypsy_%.bbappend
+++ /dev/null
@@ -1,36 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-inherit bluetooth
-DEPENDS_remove = "bluez4"
-DEPENDS_append := " ${BLUEZ}"
-DEPENDS += "libgudev"
-PNBLACKLIST[gypsy] = ""
diff --git a/recipes/ninja/ninja-native_git.bb b/recipes/ninja/ninja-native_git.bb
deleted file mode 100644
index e2deb6b..0000000
--- a/recipes/ninja/ninja-native_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Ninja is a small build system with a focus on speed."
-LICENSE = "Apache-2"
-inherit native
-LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
-PV = "1.5.3+gitr${SRCPV}"
-SRCREV="3309498174411e02e7680ea8b470bb7d1d70bdb8"
-SRCBRANCH="release"
-SRC_URI = "git://github.com/martine/ninja.git;branch=${SRCBRANCH}"
-S="${WORKDIR}/git"
-do_compile() {
-    python ${S}/bootstrap.py
-}
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/ninja ${D}${bindir}/ninja
-}
diff --git a/recipes/opengldummy/opengldummy.bb b/recipes/opengldummy/opengldummy.bb
index 94b8e08..3f68b17 100644
--- a/recipes/opengldummy/opengldummy.bb
+++ b/recipes/opengldummy/opengldummy.bb
@@ -37,8 +37,8 @@ PV = "1.0.0"
 require opengldummy.inc
 do_compile() {
-    ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libEGL.so.1 -I${WORKDIR}/headers -o libEGL.so.1 ${WORKDIR}/egl.cpp
+    ${CC} ${LDFLAGS} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libEGL.so.1 -I${WORKDIR}/headers -o libEGL.so.1 ${WORKDIR}/egl.cpp
-    ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libGLESv2.so.2 -I${WORKDIR}/headers -o libGLESv2.so.2 ${WORKDIR}/gles2.cpp
+    ${CC} ${LDFLAGS} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libGLESv2.so.2 -I${WORKDIR}/headers -o libGLESv2.so.2 ${WORKDIR}/gles2.cpp
 }
 do_install_append() {
diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb
index eaeff28..ad33127 100644
--- a/recipes/opengldummy/qtglesstream-dummy-client.bb
+++ b/recipes/opengldummy/qtglesstream-dummy-client.bb
@@ -41,7 +41,7 @@ require opengldummy.inc
 S = "${WORKDIR}"
 do_compile() {
-    ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libQtGlesStreamClient.so.${SOLIBMAJOR} \
+    ${CC} ${LDFLAGS} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libQtGlesStreamClient.so.${SOLIBMAJOR} \
        -I${WORKDIR}/headers -o libQtGlesStreamClient.so.${PV} ${WORKDIR}/egl.cpp ${WORKDIR}/gles2.cpp
 }
diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend
index 9d110a5..bac366d 100644
--- a/recipes/openssl/openssl_1.%.bbappend
+++ b/recipes/openssl/openssl_1.%.bbappend
@@ -32,7 +32,3 @@ SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch"
 PACKAGECONFIG += "perl"
-do_install_append () {
-    rmdir ${D}${libdir}/ssl/certs
-    ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/
-}
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 5de3852..267289a 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -45,6 +45,7 @@ SRC_URI = " \
    file://Create-firmware-convenience-symlinks.patch \
    file://Print-pull-progress-also-when-not-on-console.patch \
    file://Workaround-the-SIGCHLD-handler-issue.patch \
+    file://workaround-gtkdocize-configure-issue-in-autog.patch \
    "
 SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
@@ -57,7 +58,7 @@ DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
 RDEPENDS_${PN} += "bash"
 RRECOMMENDS_${PN} += "gnupg"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,"
 SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
diff --git a/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch b/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
new file mode 100644
index 0000000..5f19007
--- /dev/null
+++ b/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
@@ -0,0 +1,26 @@
+From 0b6711e10d36060d80962472c892c60e8a403422 Mon Sep 17 00:00:00 2001
+From: Mikko Gronoff <mikko.gronoff@qt.io>
+Date: Thu, 2 Feb 2017 13:38:54 +0200
+Subject: [PATCH] ostree: workaround gtkdocize configure issue in autogen.sh
+Building meta-boot2qt morty branch content with poky 2.2.1 causes
+build break in ostree autogen.sh. Called gtkdocize script uses wrong
+docdir thus causing error trying to remove gtk-doc.make in wrong
+location
+---
+ autogen.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/autogen.sh b/autogen.sh
+index 0f32089..f473fdc 100755
+--- a/autogen.sh
+++ b/autogen.sh
+@@ -25,7 +25,7 @@ EXTRA_DIST =
+ CLEANFILES =
+ EOF
+ else
+-        gtkdocize
+        gtkdocize --docdir $srcdir --srcdir $srcdir
+ fi
+ 
+ cd $olddir
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 5e3234f..cc25bd4 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -50,7 +50,7 @@ RDEPENDS_${PN}_append_linux = "\
    nativesdk-python-modules \
    nativesdk-python-misc \
    nativesdk-perl-modules \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \
    "
 RDEPENDS_${PN}_append_mingw32 = "\
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index ecf77fc..65f7f5e 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -52,6 +52,6 @@ RDEPENDS_${PN} = "\
        tzdata-asia \
        tzdata-europe \
        connman \
-        ${@base_contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \
+        ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \
        ${MACHINE_EXTRA_INSTALL} \
        "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 82f67b0..c6361c7 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -43,10 +43,9 @@ RDEPENDS_${PN} = "\
        i2c-tools \
        iproute2 \
        ldd \
-        ntp \
        openssh-sftp-server \
        perf \
        rsync \
        tslib-calibrate \
-        ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
+        ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
        "
diff --git a/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch b/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch
new file mode 100644
index 0000000..17e7975
--- /dev/null
+++ b/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch
@@ -0,0 +1,23 @@
+diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
+index 9ab2eee..96d2794 100644
+--- a/pppd/plugins/rp-pppoe/pppoe.h
+++ b/pppd/plugins/rp-pppoe/pppoe.h
+@@ -47,6 +47,10 @@
+ #include <sys/socket.h>
+ #endif
+ 
+/* This has to be included before Linux 4.8's linux/in.h
+ * gets dragged in. */
+#include <netinet/in.h>
+
+ /* Ugly header files on some Linux boxes... */
+ #if defined(HAVE_LINUX_IF_H)
+ #include <linux/if.h>
+@@ -84,7 +88,6 @@ typedef unsigned long UINT32_t;
+ #include <linux/if_ether.h>
+ #endif
+ 
+-#include <netinet/in.h>
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <sys/types.h>
diff --git a/meta-renesas-extras/recipes/adbd/adbd.bbappend b/recipes/ppp/ppp_2.%.bbappend
index 6f7a3f5..d687518 100644
--- a/meta-renesas-extras/recipes/adbd/adbd.bbappend
+++ b/recipes/ppp/ppp_2.%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
diff --git a/recipes/python/nativesdk-prebuild-python.bb b/recipes/python/nativesdk-prebuild-python.bb
index f09133e..e8edb9e 100644
--- a/recipes/python/nativesdk-prebuild-python.bb
+++ b/recipes/python/nativesdk-prebuild-python.bb
@@ -29,6 +29,8 @@
 LICENSE = "PSFv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Python-2.0;md5=a5c8025e305fb49e6d405769358851f6"
 inherit bin_package nativesdk
 COMPATIBLE_HOST = ".*-mingw.*"
diff --git a/recipes/virtualbox/mount-vboxsf_4.3.30.bb b/recipes/virtualbox/mount-vboxsf_4.3.30.bb
index 71b7595..1eb2652 100644
--- a/recipes/virtualbox/mount-vboxsf_4.3.30.bb
+++ b/recipes/virtualbox/mount-vboxsf_4.3.30.bb
@@ -42,7 +42,7 @@ SRC_URI[sha256sum] = "ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaa
 S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders"
 do_compile() {
-    ${CC} mount.vboxsf.c vbsfmount.c -o mount.vboxsf
+    ${CC} ${LDFLAGS} mount.vboxsf.c vbsfmount.c -o mount.vboxsf
 }
 do_install() {
diff --git a/recipes/virtualbox/virtualbox-guest-additions_5.1.4.bb b/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb
index 3522ed5..00dcaa5 100644
--- a/recipes/virtualbox/virtualbox-guest-additions_5.1.4.bb
+++ b/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb
@@ -38,8 +38,8 @@ PR = "${MACHINE_KERNEL_PR}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2"
-SRC_URI[md5sum] = "e25a6a1f3c113c373dc0433f9c2526f3"
+SRC_URI[md5sum] = "21eaec9f21477d555559a63761779880"
-SRC_URI[sha256sum] = "b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf"
+SRC_URI[sha256sum] = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"
 S = "${WORKDIR}/vbox"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index c157743..644971e 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -11,55 +11,56 @@
  <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
  <remote fetch="git://git.yoctoproject.org" name="intel"/>
  <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
+  <remote fetch="git://github.com/madisongh" name="madisongh"/>
  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
  <project name="poky"
           remote="yocto"
-           revision="fc75bea445bb57e1e942b5049ee2b6e5245649ea"
+           revision="b0f3c0fb99d15b5914ac876b62ff16b3e11d0b80"
           path="sources/poky"/>
  <project name="meta-openembedded"
           remote="oe-mirror"
-           revision="247b1267bbe95719cd4877d2d3cfbaf2a2f4865a"
+           revision="1efa5d623bc64659b57389e50be2568b1355d5f7"
           path="sources/meta-openembedded"/>
  <project name="meta-qt5"
           remote="qtyocto"
-           revision="251beba0ca5f7fae85b8fd9c20851c53347c9722"
+           revision="912db845e563f4df34f3cf761df8c563193c5044"
           path="sources/meta-qt5"/>
  <project name="meta-mingw"
           remote="qtyocto"
           path="sources/meta-mingw"
-           revision="4a877547146f32f4540664b0c677d99b33d12bfd"/>
+           revision="bfda0f040958b3c533123071ff031037389eed62"/>
-  <project name="meta-fsl-arm"
+  <project name="meta-freescale"
-           remote="yocto"
+           remote="freescale"
-           revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b"
+           revision="ec54f623eee97b75b7ad87503477316495c7fc26"
-           path="sources/meta-fsl-arm"
+           path="sources/meta-freescale"
-           groups="notdefault,external,fsl,ti,smx6,renesas"/>
+           groups="notdefault,external,fsl,ti,smx6"/>
  <project name="meta-ti"
           remote="yocto"
-           revision="f807c7185321fb407e82c529ddff310dc037f727"
+           revision="0862a33b8d642e5fad031a78f90410d497453415"
           path="sources/meta-ti"
           groups="notdefault,external,ti"/>
  <project name="meta-raspberrypi"
           remote="yocto"
-           revision="2745399f75d7564fcc586d0365ff73be47849d0e"
+           revision="cce6292e41493158c26f5b1b7fded97faacf10d7"
           path="sources/meta-raspberrypi"
           groups="notdefault,external,rpi"/>
-  <project name="meta-fsl-arm-extra"
+  <project name="meta-freescale-3rdparty"
           remote="freescale"
-           revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e"
+           revision="065228815a7ca5201df1ed4c030b152054a5eda3"
-           path="sources/meta-fsl-arm-extra"
+           path="sources/meta-freescale-3rdparty"
           groups="notdefault,external,fsl,smx6"/>
  <project name="meta-intel"
           remote="intel"
-           revision="b8c199201ffe026485a14e1fcfc398e2b3551512"
+           revision="6add41510412ca196efb3e4f949d403a8b6f35d7"
           path="sources/meta-intel"
           groups="notdefault,external,intel"/>
-  <project name="meta-renesas"
+  <project name="meta-tegra"
-           remote="yocto"
+           remote="madisongh"
-           revision="d20e5bffb582c6bfabdadc22e903df86c8cfd66b"
+           revision="fba09b70a8ac36248e5fcea611e3bb661bb089fc"
-           path="sources/meta-renesas"
+           path="sources/meta-tegra"
-           groups="notdefault,external,renesas"/>
+           groups="notdefault,external,jetson"/>
  <project name="nvidia-layer"
           remote="playground"
@@ -76,11 +77,5 @@
           revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
           path="sources/meta-smx6"
           groups="notdefault,internal"/>
-  <project name="renesas-rcar-gen2"
-           remote="playground"
-           revision="93b2464ca1c6200a1bdf2afcabac0c2c7e9bdf6d"
-           path="sources/renesas-rcar-gen2"
-           groups="notdefault,internal"/>
 </manifest>
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index b6c4710..a556e4f 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -77,12 +77,12 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    tegra-x1|tegra-t18x)
      LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
    ;;
-    alt|gose|koelsch|lager|porter|silk|stout)
-      LAYERSCONF="bblayers.conf.rcar-gen2.sample"
-    ;;
    emulator)
      LAYERSCONF="bblayers.conf.emulator.sample"
    ;;
+    jetson-tx1|jetson-tk1)
+      LAYERSCONF="bblayers.conf.jetson.sample"
+    ;;
    *)
      LAYERSCONF="bblayers.conf.sample"
      echo "Unknown MACHINE, bblayers.conf might need manual editing"
diff --git a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb b/scripts/sstate-cache-cleanup.sh
index 0fe9aad..4eb6aff 100755
--- a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb
+++ b/scripts/sstate-cache-cleanup.sh
@@ -1,6 +1,7 @@
+#!/bin/bash
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,22 +28,29 @@
 ##
 ############################################################################
-LICENSE = "GPLv2 & MIT"
+set -e
-LIC_FILES_CHKSUM = "\
-file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
-"
-SRC_URI = "file://uvcs-kernel.tar.bz2"
+if [ $# -lt 1 ]; then
-S = "${WORKDIR}/uvcs"
+    echo "Usage: $0 <sstate-cache-dir(s)>"
+    echo "Remove all old files from <sstate-cache-dir(s)>"
+    exit 1
+fi
-inherit renesas-module
+DAYS_TO_KEEP=7
+NOW=$(date +%s)
-export UVCS_DRV_SRC_DIR = "${S}/source/uvcs_lkm"
+for cachedir in $@; do
-export UVCS_CMN_SRC_DIR = "${S}/source/uvcs_cmn"
-export UVCS_CMN_INC_DIR = "${S}/include"
-export DRV_CORE_SRC_DIR = "${S}/source/driver_core"
-MODULE_NAME = "uvcs_cmn"
+  if [ ! -d $cachedir ]; then
-MODULE_HEADERS = "include/uvcs_cmn.h include/uvcs_types.h"
+    echo "$cachedir: No such directory"
-MODULE_SOURCE_DIR = "${S}/source/makefile/linaro_4_7_3/"
+    continue
+  fi
+  # find the most recently modified file's timestamp
+  LATEST=$(find $cachedir -type f -printf '%T@\n' | sort -n | tail -1 | cut -f 1 -d'.')
+  # calculate days
+  TIMEOUT=$(( ($NOW - $LATEST) / 3600 / 24 + $DAYS_TO_KEEP ))
+  # delete all files older
+  find ${cachedir} -type f -atime +${TIMEOUT} -delete
+done
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 14d45c8..23b3b16 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,7 +31,7 @@
 set -x
 set -e
-RELEASE=5.8
+RELEASE=5.9
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 UPLOADS="\
    tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \