116 files changed, 1361 insertions, 360 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index a367d31..9c67a64 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -111,6 +111,9 @@ get_groups() {
    raspberrypi|raspberrypi2)
      PROJECT_GROUPS="rpi"
    ;;
+    nuc)
+      PROJECT_GROUPS="nuc"
+    ;;
    emulator)
      PROJECT_GROUPS="emulator"
    ;;
diff --git a/classes/deploy-conf.bbclass b/classes/deploy-conf.bbclass
new file mode 100644
index 0000000..c49c375
--- /dev/null
+++ b/classes/deploy-conf.bbclass
@@ -0,0 +1,37 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+inherit image_types
+DEPLOY_CONF_NAME ?= "${MACHINE}"
+DEPLOY_CONF_TYPE ?= "Boot2Qt"
+IMAGE_CMD_conf() {
+    cat > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.conf <<EOF
+[${DEPLOY_CONF_TYPE} | ${DEPLOY_CONF_NAME}]
+platform=${MACHINE}
+os=linux
+board=
+imagefile=${IMAGE_LINK_NAME}.img
+asroot=true
+EOF
+}
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index d9c8a77..6065cf0 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -20,11 +20,23 @@
 ##
 #############################################################################
-inherit image_types_fsl
+IMAGE_ROOTFS_EXTRA_SPACE = "100000"
-IMAGE_ROOTFS_EXTRA_SPACE = "300000"
 SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+SDCARD_GENERATION_COMMAND_ti33x = "generate_imx_sdcard"
-IMAGE_CMD_sdcard_append () {
+IMAGE_CMD_sdcard_append() {
    parted -s ${SDCARD} set 1 boot on
+    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.sdcard ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+}
+IMAGE_CMD_rpi-sdimg_append() {
+    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+}
+build_hddimg_append() {
+    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
 }
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index 8a0007c..7fb19ea 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -33,6 +33,7 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta-yocto \
  ${BSPDIR}/sources/meta-beagleboard/common-bsp \
  ${BSPDIR}/sources/meta-ti \
+  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.nuc.sample
new file mode 100644
index 0000000..d47b659
--- /dev/null
+++ b/conf/bblayers.conf.nuc.sample
@@ -0,0 +1,48 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/meta-intel \
+  ${BSPDIR}/sources/meta-intel/meta-nuc \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index d9f3d5d..ace52cd 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -32,6 +32,7 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-yocto \
  ${BSPDIR}/sources/meta-ti \
+  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index e551264..76f641f 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -31,9 +31,9 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/meta-toradex \
  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-fsl-arm-extra \
-  ${BSPDIR}/sources/meta-toradex \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/distro/b2qt-auto.conf b/conf/distro/b2qt-auto.conf
new file mode 100644
index 0000000..6ac10cb
--- /dev/null
+++ b/conf/distro/b2qt-auto.conf
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+include conf/distro/b2qt.conf
+PREFERRED_VERSION_qtwayland = "5.5%"
+PREFERRED_VERSION_qtwayland-native = "5.5%"
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index ac635d8..33a335a 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -24,7 +24,6 @@ include conf/distro/poky.conf
 DISTRO = "b2qt"
 DISTRO_NAME = "Boot to Qt for Embedded Linux"
-DISTRO_VERSION = "1.7"
 SDK_VERSION := "${DISTRO_VERSION}"
 MAINTAINER = "B2Qt <B2Qt@digia.com>"
@@ -40,10 +39,16 @@ SYSVINIT_ENABLED_GETTYS = ""
 DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs webengine"
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
-# use GStreamer 0.10, optionally change to "gstreamer" to use GStreamer 1.0
+# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
-DISTRO_FEATURES += "gstreamer010"
+DISTRO_FEATURES += "gstreamer"
+DISTRO_FEATURES += "systemd"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+VIRTUAL-RUNTIME_initscripts = ""
+PREFERRED_PROVIDER_udev ?= "systemd"
+PREFERRED_PROVIDER_udev-utils ?= "systemd"
 PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo"
 PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
@@ -52,7 +57,8 @@ MACHINE_EXTRA_INSTALL ?= ""
 MACHINE_EXTRA_INSTALL_SDK ?= ""
 MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
-IMAGE_FSTYPES = "tar.gz"
+IMAGE_FSTYPES = "tar.gz conf"
+IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index d8ae042..a2300cf 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -20,6 +20,10 @@
 ##
 #############################################################################
+include conf/distro/include/ti.inc
+DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
 BOOTFS_CONTENT = "\
    u-boot-${MACHINE}.img:u-boot.img \
    MLO-${MACHINE}:MLO \
@@ -28,11 +32,13 @@ BOOTFS_DEPENDS = "u-boot:do_deploy"
 DISTRO_FEATURES_remove = "webengine"
+PREFERRED_VERSION_linux-ti-staging = "3.14%"
 PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
-PREFERRED_VERSION_libgles-omap3 = "5.01.01.01"
+PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
-PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.01"
+PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
 MACHINE_EXTRA_INSTALL = "\
        libgles-omap3 \
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 2ceb4fe..0764a81 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -23,6 +23,8 @@
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
+DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 KERNEL_IMAGETYPE = "uImage"
 BOOTFS_CONTENT = "\
@@ -43,7 +45,7 @@ MACHINE_EXTRA_INSTALL = "\
        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
        "
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
        libgal-mx6 \
        libegl-mx6 \
        libegl-mx6-dev \
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index b597481..ab47646 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -20,6 +20,10 @@
 ##
 #############################################################################
+include conf/distro/include/ti.inc
+DEPLOY_CONF_NAME = "BeagleBoard"
 BOOTFS_CONTENT = "\
    u-boot-${MACHINE}.img:u-boot.img \
    MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 93cd569..5e795c6 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -15,6 +15,11 @@
 ## contact form at http://www.qt.io
 ##
 ############################################################################
+include conf/distro/include/ti.inc
+DEPLOY_CONF_NAME = "BeagleBone Black"
 BOOTFS_CONTENT = "\
    u-boot-${MACHINE}.img:u-boot.img \
    MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index f0b6179..0d3037b 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -23,11 +23,14 @@
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
+DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 KERNEL_IMAGETYPE = "uImage"
 BOOTFS_CONTENT = "\
    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE}:${KERNEL_DEVICETREE} \
+    ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \
    u-boot-${MACHINE}.imx:u-boot.imx \
    "
 BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
@@ -41,7 +44,7 @@ MACHINE_EXTRA_INSTALL = "\
        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
        "
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
        libgal-mx6 \
        libegl-mx6 \
        libegl-mx6-dev \
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index d92410c..2911e96 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -22,13 +22,19 @@
 include conf/distro/include/toradex.inc
+DEPLOY_CONF_NAME = "Toradex Colibri VF"
+IMAGE_FSTYPES += "ext3 sdcard"
 BOOTFS_CONTENT = "\
-    u-boot-nand-${MACHINE}.imx:u-boot-nand.imx \
+    u-boot-nand.imx:u-boot-nand.imx \
    flash_mmc-${MACHINE}.img:flash_mmc.img \
    flash_blk-${MACHINE}.img:flash_blk.img \
    "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
+DEFAULTTUNE = "armv7ahf-neon"
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index 0457756..e63d5ff 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,9 +32,9 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 PREFERRED_PROVIDER_virtual/egl = "qtglesstream-dummy-client"
 PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client"
-KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest"
+KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
-DISTRO_FEATURES_remove = "webengine"
+DISTRO_FEATURES_remove = "webengine opengl"
 MACHINE_EXTRA_INSTALL = "\
        mount-vboxsf \
@@ -43,6 +43,7 @@ MACHINE_EXTRA_INSTALL_SDK = "\
        qtglesstream-dummy-client-dev \
        "
 MACHINE_EXTRA_INSTALL_QT = "\
+        qtsystems \
        qtglesstream \
        b2qt-emulator-proxy \
        b2qt-emulator-vinput \
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index 13eb70e..fb90045 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -22,6 +22,8 @@
 include conf/distro/include/imx6.inc
+DEPLOY_CONF_NAME = "Freescale iMX53 Quick Start Board"
 BOOTFS_CONTENT = "\
    u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index 5cb3814..0afaa43 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -1,2 +1,9 @@
 BBMASK ?= " "
 BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+IMAGE_FSTYPES += "ext3 sdcard"
+MACHINE_EXTRA_INSTALL_SDK = " \
+        ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
+        "
diff --git a/conf/distro/include/imx6dlsabresd.conf b/conf/distro/include/imx6dlsabresd.conf
index 7a209ed..0c25c4b 100644
--- a/conf/distro/include/imx6dlsabresd.conf
+++ b/conf/distro/include/imx6dlsabresd.conf
@@ -21,3 +21,5 @@
 #############################################################################
 require imx6qsabresd.conf
+DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Dual"
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index c677500..dae5927 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -22,6 +22,8 @@
 include conf/distro/include/imx6.inc
+DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
 BOOTFS_CONTENT = "\
    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
    ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
@@ -47,7 +49,7 @@ MACHINE_EXTRA_INSTALL = "\
        libopencv-objdetect \
        "
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
        libgal-mx6 \
        libegl-mx6 \
        libegl-mx6-dev \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index f9eb1d2..ce64083 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -22,13 +22,14 @@
 include conf/distro/include/imx6.inc
+DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
 BOOTFS_CONTENT = "\
    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:imx6dl-nitrogen6_max.dtb \
    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \
    6x_bootscript-${MACHINE}:6x_bootscript \
    6x_upgrade-${MACHINE}:6x_upgrade \
@@ -54,7 +55,7 @@ MACHINE_EXTRA_INSTALL = "\
        libopencv-objdetect \
        "
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
        libgal-mx6 \
        libegl-mx6 \
        libegl-mx6-dev \
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/nuc.conf
new file mode 100644
index 0000000..941c3a2
--- /dev/null
+++ b/conf/distro/include/nuc.conf
@@ -0,0 +1,41 @@
+#############################################################################
+##
+## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+DEPLOY_CONF_NAME = "Intel NUC"
+DISTRO_FEATURES_DEFAULT += "wayland weston"
+DISTRO_FEATURES_remove = "usbgadget"
+IMAGE_FSTYPES += " hddimg"
+SYSVINIT_ENABLED_GETTYS = "1"
+MACHINE_EXTRA_INSTALL = "\
+        wayland \
+        mesa-megadriver \
+        "
+MACHINE_EXTRA_INSTALL_SDK = " \
+        mesa-dev \
+        "
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index ec57b19..78730cc 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -20,6 +20,10 @@
 ##
 #############################################################################
+DEPLOY_CONF_NAME = "Raspberry Pi"
+IMAGE_FSTYPES += "ext3 rpi-sdimg"
 BOOTFS_CONTENT = "\
    bcm2835-bootfiles/*: \
    ${KERNEL_IMAGETYPE}:kernel.img \
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 28989aa..497d733 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -20,6 +20,10 @@
 ##
 #############################################################################
+DEPLOY_CONF_NAME = "Raspberry Pi 2"
+IMAGE_FSTYPES += "ext3 rpi-sdimg"
 BOOTFS_CONTENT = "\
    bcm2835-bootfiles/*: \
    ${KERNEL_IMAGETYPE}:kernel.img \
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 8e69ac8..2f931b7 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -22,6 +22,8 @@
 include conf/distro/include/imx6.inc
+DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i"
 KERNEL_IMAGETYPE = "uImage"
 BOOTFS_CONTENT = " "
@@ -35,7 +37,7 @@ MACHINE_EXTRA_INSTALL = "\
        kernel-devicetree \
        "
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
        libgal-mx6 \
        libegl-mx6 \
        libegl-mx6-dev \
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
new file mode 100644
index 0000000..fe1f253
--- /dev/null
+++ b/conf/distro/include/ti.inc
@@ -0,0 +1,30 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+BBMASK ?= " "
+BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+IMAGE_FSTYPES += "ext3 sdcard"
+IMAGE_CLASSES += "image_types_fsl"
+UBOOT_SUFFIX = "img"
+BOOT_SCRIPTS = "${BOOTFS_CONTENT}"
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index cec9fd5..f26efc9 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -22,6 +22,8 @@
 include conf/distro/include/imx6.inc
+DEPLOY_CONF_NAME = "ArchiTech Tibidabo"
 KERNEL_IMAGETYPE = "uImage"
 BOOTFS_CONTENT = "\
@@ -38,7 +40,7 @@ MACHINE_EXTRA_INSTALL = "\
        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
        "
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
        libgal-mx6 \
        libegl-mx6 \
        libegl-mx6-dev \
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 5256eb4..063244e 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -1,2 +1,2 @@
 BBMASK ?= " "
-BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls"
+BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 595aaae..991cefc 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -254,6 +254,19 @@ BB_DISKMON_DIRS = "\
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
+PREMIRRORS = "\
+ftp://.*/.*   http://ci-files01-hki.ci.local/yocto/sources/ \n \
+http://.*/.*  http://ci-files01-hki.ci.local/yocto/sources/ \n \
+https://.*/.* http://ci-files01-hki.ci.local/yocto/sources/ \n \
+bzr://.*/.*   http://ci-files01-hki.ci.local/yocto/sources/ \n \
+cvs://.*/.*   http://ci-files01-hki.ci.local/yocto/sources/ \n \
+git://.*/.*   http://ci-files01-hki.ci.local/yocto/sources/ \n \
+gitsm://.*/.* http://ci-files01-hki.ci.local/yocto/sources/ \n \
+hg://.*/.*    http://ci-files01-hki.ci.local/yocto/sources/ \n \
+osc://.*/.*   http://ci-files01-hki.ci.local/yocto/sources/ \n \
+p4://.*/.*    http://ci-files01-hki.ci.local/yocto/sources/ \n \
+svk://.*/.*   http://ci-files01-hki.ci.local/yocto/sources/ \n \
+svn://.*/.*   http://ci-files01-hki.ci.local/yocto/sources/ \n"
 #
 # Qemu configuration
diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
index 87326af..8a2fd54 100644
--- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
+++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
@@ -34,3 +34,6 @@ do_configure_prepend() {
    echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 }
+# bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
+PRINC = "-1"
diff --git a/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb b/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
index 8c86b4c..b884e43 100644
--- a/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
+++ b/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
@@ -23,3 +23,6 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
                 HOSTSTRIP=true'
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+# bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
+PRINC = "-1"
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
index 54ef15f..3424c27 100644
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
@@ -10,3 +10,4 @@ SRC_URI += "\
 INSANE_SKIP_${PN} = "installed-vs-shipped"
 KERNEL_IMAGETYPE = "zImage"
+B = "${S}"
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend
deleted file mode 100644
index 29b11a3..0000000
--- a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL"
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
index c25739b..c25739b 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
index b6358d7..602c3df 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
@@ -20,12 +20,6 @@
 ##
 #############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:"
-SRC_URI += "\
-    file://ARM-perf-add-support-for-perf-registers-API.diff \
-    file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
-    "
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
index d6e1e21..928fb8c 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -1,68 +1,26 @@
-From ecd64c7926b7aa25b028278666abad582e7cdea8 Mon Sep 17 00:00:00 2001
+From 15ba0d8f9e2ad8f3024734810088e4caddaaec5a Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
 Date: Fri, 9 May 2014 10:23:50 +0300
 Subject: [PATCH] Updated kernel arguments for sabre sd
- detect if hdmi is used and change video arguments accordingly
 - disable blanking and cursor blinking
 ---
- include/configs/mx6sabre_common.h | 21 +++++++++++++++++++++
+ include/configs/mx6sabre_common.h | 2 ++
- 1 file changed, 21 insertions(+)
+ 1 file changed, 2 insertions(+)
 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index c81e9e9..9296b9b 100644
+index a8746a4..251b28b 100644
 --- a/include/configs/mx6sabre_common.h
 +++ b/include/configs/mx6sabre_common.h
-@@ -87,6 +87,13 @@
+@@ -171,6 +171,8 @@
- /* Command definition */
+                "done\0" \
- #include <config_cmd_default.h>
- 
-+/* I2C Configs */
-+#define CONFIG_CMD_I2C
-+#define CONFIG_SYS_I2C
-+#define CONFIG_SYS_I2C_MXC
-+#define CONFIG_SYS_I2C_SPEED           100000
-+#define CONFIG_I2C_EDID
-+
- #define CONFIG_CMD_BMODE
- #define CONFIG_CMD_BOOTZ
- #define CONFIG_CMD_SETEXPR
-@@ -119,6 +126,15 @@
- #define EMMC_ENV ""
- #endif
- 
-+#define VIDEOARGS \
-+       "videoargs=" \
-+       "i2c dev 1 ; " \
-+       "if i2c probe 0x50 ; then " \
-+               "setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
-+       "else " \
-+               "setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
-+       "fi\0"
-+
- #define CONFIG_EXTRA_ENV_SETTINGS \
-        "script=boot.scr\0" \
-        "image=zImage\0" \
-@@ -146,7 +162,11 @@
-                        "fi; "  \
-                "fi\0" \
-        EMMC_ENV          \
-+       VIDEOARGS \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
-+               "video=${video} "\
+                "root=${mmcroot} " \
 +               "consoleblank=0 " \
 +               "vt.global_cursor_default=0 " \
-                "root=${mmcroot}\0" \
+                VIDEO_ARGS "\0" \
        "loadbootscript=" \
                "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-@@ -155,6 +175,7 @@
-        "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-        "mmcboot=echo Booting from mmc ...; " \
-+               "run videoargs; " \
-                "run mmcargs; " \
-                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                        "if run loadfdt; then " \
 -- 
 1.9.1
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
index a1a3b27..a1a3b27 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
diff --git a/meta-nuc-extras/conf/layer.conf b/meta-nuc-extras/conf/layer.conf
new file mode 100644
index 0000000..6eb4d71
--- /dev/null
+++ b/meta-nuc-extras/conf/layer.conf
@@ -0,0 +1,33 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+# 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_nuc"
+BBFILE_PATTERN_b2qt_nuc := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_nuc = "20"
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
new file mode 100644
index 0000000..65ac248
--- /dev/null
+++ b/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
@@ -0,0 +1,9 @@
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_DEBUG=n
+CONFIG_RTL8723AE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8188EE=m
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend
new file mode 100644
index 0000000..d6182fc
--- /dev/null
+++ b/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://wlan-realtek.cfg \
+    "
diff --git a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab b/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab
index e61e3b0..12e0489 100644
--- a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab
+++ b/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab
@@ -4,7 +4,7 @@
 proc                 /proc                proc       defaults              0  0
 debugfs              /sys/kernel/debug    debugfs    defaults              0  0
 devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
-usbfs                /proc/bus/usb        usbfs      defaults              0  0
+usbfs                /proc/bus/usb        usbfs      noauto
 tmpfs                /var/volatile        tmpfs      defaults              0  0
 tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch
deleted file mode 100644
index 719a38d..0000000
--- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7515eb259a380578540323be5d4913245e81c454 Mon Sep 17 00:00:00 2001
-From: Andy Nichols <andy.nichols@theqtcompany.com>
-Date: Mon, 13 Apr 2015 12:54:17 +0200
-Subject: [PATCH] Colibri-iMX6: set 1280x720@16 for HDMI by default
---
- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
-index e638266..dd8b21fc5 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
-@@ -70,12 +70,11 @@
-                compatible = "fsl,mxc_sdc_fb";
-                disp_dev = "hdmi";
-                interface_pix_fmt = "RGB24";
-               mode_str ="1920x1080M@60";
-/*             default_bpp = <16>;*/
-               default_bpp = <24>;
-+               mode_str ="1280x729M@60";
-+               default_bpp = <16>;
-                int_clk = <0>;
-                late_init = <0>;
-               status = "disabled";
-+               status = "okay";
-        };
- 
-        mxcfb2: fb@1 {
-- 
-2.3.5
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
index 7c19d86..3f07de3 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
@@ -26,12 +26,6 @@ SRC_URI += "\
    file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
    "
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch \
-        "
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
@@ -40,3 +34,5 @@ config_script () {
    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
    echo "CONFIG_USB_ACM=m"         >> ${S}/.config
 }
+B = "${S}"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch
index 43edec3..43edec3 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch
+++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
index d92ac62..d92ac62 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
+++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
index fd9ad55..fd9ad55 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
index 60c5171..174f3b0 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
@@ -1,4 +1,4 @@
-From 7538ad166d0fb1999f32f2d80969184484c2ba07 Mon Sep 17 00:00:00 2001
+From 1d5baa56ff177d7858727d1c4428096781e3817c Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
 Date: Mon, 27 Oct 2014 14:53:25 +0200
 Subject: [PATCH] Update default args for apalis imx6
@@ -10,30 +10,30 @@ disable cursor blinking.
 1 file changed, 8 insertions(+), 7 deletions(-)
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 5d32118..289d611 100644
+index 162be2e..f659384 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -212,14 +212,14 @@
+@@ -246,14 +246,14 @@
                "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
 #define SD_BOOTCMD                                             \
 -       "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
 -               "rootwait\0" \
 +       "drive=2\0" \
-        "sdboot=" "run setup; " \
+        "sdboot=run setup; " \
 -               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
 +               "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
 +               "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
                "${vidargs}; echo Booting from SD card in 8bit slot...; " \
-               "run sddtbload; fatload mmc 1:1 ${kernel_addr_r} " \
+-               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-+               "run sddtbload; fatload mmc ${drive}:1 ${kernel_addr_r} " \
+               "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
                "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
-       "sddtbload=setenv dtbparam; fatload mmc 1:1 ${fdt_addr_r} " \
+-       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-+       "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \
+       "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \
                "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
- #ifndef CONFIG_APALIS_IMX6_V1_0
+ #define USB_BOOTCMD \
-@@ -229,7 +229,8 @@
+@@ -273,7 +273,8 @@
 #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb"
 #endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -43,15 +43,15 @@ index 5d32118..289d611 100644
                "run nfsboot ; echo ; echo nfsboot failed ; " \
                "usb start ;" \
                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -242,7 +243,7 @@
+@@ -292,7 +293,7 @@
-        NFS_BOOTCMD \
+                "|| setenv drive 2; load ${interface} ${drive}:1 " \
-        SD_BOOTCMD \
+                "${kernel_addr_r} flash_blk.img\0" \
        "setup=setenv setupargs fec_mac=${ethaddr} " \
 -               "consoleblank=0  no_console_suspend=1 console=tty1 " \
 +               "consoleblank=0  no_console_suspend=1 vt.global_cursor_default=0 " \
                "console=${console},${baudrate}n8\0 " \
-        "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \
+        "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-                "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \
+                " source ${kernel_addr_r}\0" \
 -- 
 1.9.1
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch
index 2e72ff6..bae71d5 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch
@@ -1,45 +1,35 @@
-From a388755704c3f8c4336939f3c868942d68b1e256 Mon Sep 17 00:00:00 2001
+From 878f506e43f40c2667e9e5ae82741d32fc653cac Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Thu, 28 May 2015 09:06:54 +0300
 Subject: [PATCH] colibri vf: enable sdboot by default
-Run sdboot first, update dtb file location to /boot/ and
+Run sdboot first and remove console message from tty1
-remove console message from tty1
 ---
- include/configs/colibri_vf.h | 6 +++---
+ include/configs/colibri_vf.h | 4 ++--
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index feea159..b080510 100644
+index 06caabd..fb9fe41 100644
 --- a/include/configs/colibri_vf.h
 +++ b/include/configs/colibri_vf.h
-@@ -135,7 +135,7 @@
+@@ -174,7 +174,7 @@
-                "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
+        "ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
-                "run sddtbload; bootz ${kernel_addr_r} - ${dtbparam}\0" \
+        "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-        "sddtbload=setenv dtbparam; load mmc 0:2 ${fdt_addr_r} "        \
-               "${soc}-colibri-${fdt_board}.dtb && "                   \
-+               "/boot/${soc}-colibri-${fdt_board}.dtb && "                     \
-                "setenv dtbparam ${fdt_addr_r}\0"
- 
- #define NFS_BOOTCMD                                                    \
-@@ -160,7 +160,7 @@
-                "/boot/${soc}-colibri-${fdt_board}.dtb && "             \
-                "setenv dtbparam ${fdt_addr_r}\0"
 
 -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
 +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
 
 #define DFU_ALT_NAND_INFO      "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
 
-@@ -173,7 +173,7 @@
+@@ -187,7 +187,7 @@
        "defargs=\0" \
        "console=ttyLP0\0" \
-        "setup=setenv setupargs fec_mac=${ethaddr} consoleblank=0 " \
+        "setup=setenv setupargs " \
-               "console=tty1 console=${console},${baudrate}n8 ${memargs}\0" \
+-               "console=tty1 console=${console}" \
-+               "console=${console},${baudrate}n8 ${memargs}\0" \
+               "console=${console}" \
-        "setsdupdate=mmc rescan && set interface mmc && " \
+                ",${baudrate}n8 ${memargs} consoleblank=0\0" \
+        "setsdupdate=mmc rescan && setenv interface mmc && " \
                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
-                "source ${loadaddr}\0" \
 -- 
 1.9.1
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
index 15fe3c0..ea31e21 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
@@ -29,6 +29,7 @@ inherit qt5-module
 SRC_URI = " \
    git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
    file://emulatorproxyd.sh \
+    file://emulatorproxy.service \
    "
 SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5"
@@ -41,9 +42,14 @@ DEPENDS = "qtbase qtsimulator"
 do_install_append() {
    install -m 0755 -d ${D}${sysconfdir}/init.d
    install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/emulatorproxy.service ${D}${systemd_unitdir}/system/
 }
 INITSCRIPT_NAME = "emulatorproxyd.sh"
 INITSCRIPT_PARAMS = "defaults 97 10"
-inherit update-rc.d
+SYSTEMD_SERVICE_${PN} = "emulatorproxy.service"
+inherit update-rc.d systemd
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service
new file mode 100644
index 0000000..7a709fd
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxy.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=QtSimulator Proxy Daemon
+After=systemd-user-sessions.service
+[Service]
+Type=forking
+ExecStart=/usr/bin/emulatorproxyd
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
index 622363d..038c972 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
@@ -29,6 +29,7 @@ inherit qt5-module
 SRC_URI = " \
    git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
    file://sdcardmountd.sh \
+    file://sdcardmount.service \
    "
 SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5"
@@ -41,9 +42,14 @@ DEPENDS = "qtbase qtsimulator"
 do_install_append() {
    install -m 0755 -d ${D}${sysconfdir}/init.d
    install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/sdcardmount.service ${D}${systemd_unitdir}/system/
 }
 INITSCRIPT_NAME = "sdcardmountd.sh"
 INITSCRIPT_PARAMS = "defaults 97 10"
-inherit update-rc.d
+SYSTEMD_SERVICE_${PN} = "sdcardmount.service"
+inherit update-rc.d systemd
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service
new file mode 100644
index 0000000..1171089
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=QtSimulator SD Card Mount Daemon
+After=systemd-user-sessions.service
+[Service]
+ExecStart=/usr/bin/sdcardmountd
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 98de916..ab02d97 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -29,6 +29,8 @@ inherit qmake5 sdk-sources
 SRC_URI = " \
    git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-launcher \
    file://b2qt-startup.sh \
+    file://qtlauncher.service \
+    file://b2qt.service \
    "
 SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4"
@@ -42,11 +44,15 @@ DEPENDS = "qtbase qtdeclarative \
 do_install_append() {
    install -m 0755 -d ${D}${sysconfdir}/init.d
    install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/
-}
-FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h"
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/qtlauncher.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/b2qt.service ${D}${systemd_unitdir}/system/
+}
 INITSCRIPT_NAME = "b2qt-startup.sh"
 INITSCRIPT_PARAMS = "defaults 30"
-inherit update-rc.d
+SYSTEMD_SERVICE_${PN} = "qtlauncher.service b2qt.service"
+inherit update-rc.d systemd
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service
new file mode 100644
index 0000000..f941f91
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=B2Qt user application
+After=systemd-user-sessions.service
+ConditionPathExists=/usr/bin/b2qt
+[Service]
+ExecStart=-/usr/bin/appcontroller /usr/bin/b2qt
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service b/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service
new file mode 100644
index 0000000..7658ca8
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=B2Qt Launcher Demo
+After=systemd-user-sessions.service
+ConditionPathExists=!/usr/bin/b2qt
+[Service]
+ExecStart=-/usr/bin/appcontroller /usr/bin/qtlauncher --applications-root /data/user/qt
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
new file mode 100644
index 0000000..7c3cd0c
--- /dev/null
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -0,0 +1,51 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+DESCRIPTION = "B2Qt Automotive Qt5 image"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+PR = "r0"
+DEPLOY_CONF_TYPE = "Automotive"
+IMAGE_FEATURES += "\
+        package-management \
+        ssh-server-dropbear \
+        tools-debug \
+        debug-tweaks \
+        hwcodecs \
+        "
+inherit core-image
+inherit bootfs-image
+MACHINE_EXTRA_INSTALL_QT ?= ""
+IMAGE_INSTALL += "\
+    ${MACHINE_EXTRA_INSTALL_QT} \
+    packagegroup-b2qt-embedded-base \
+    packagegroup-b2qt-embedded-tools \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@base_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-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 924ba61..bc130fb 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -25,6 +25,8 @@ LICENSE = "QtEnterprise"
 LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
 PR = "r0"
+DEPLOY_CONF_TYPE = "Boot2Qt"
 IMAGE_FEATURES += "\
        package-management \
        ssh-server-dropbear \
@@ -44,6 +46,6 @@ IMAGE_INSTALL += "\
    packagegroup-b2qt-embedded-tools \
    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
-    packagegroup-b2qt-embedded-qt5 \
+    packagegroup-b2qt-qt5-modules \
-    packagegroup-b2qt-embedded-qt5-addons \
+    packagegroup-b2qt-embedded-addons \
    "
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index d92c277..15c8b97 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
@@ -34,6 +34,7 @@ SRC_URI = " \
    file://qmake.conf \
    file://qplatformdefs.h \
    "
+S = "${WORKDIR}"
 SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs"
 SDK_MKSPEC = "devices/linux-oe-generic-g++"
@@ -63,7 +64,11 @@ create_sdk_files_append () {
    qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
    echo 'HostSpec = linux-g++' >> $qtconf
    echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
+    # change staging paths to target sdk paths, so they can be relocated at install time
+    sed -i -e 's:${STAGING_DIR_NATIVE}:${SDKPATHNATIVE}:g' ${SDK_MKSPEC_DIR}/*.pri
+    sed -i -e 's:${STAGING_DIR}/[^/]*:${SDKTARGETSYSROOT}:g' ${SDK_MKSPEC_DIR}/*.pri
 }
 SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
-    $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/qdevice.pri ;"
+    $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/*.pri ;"
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
new file mode 100644
index 0000000..a318d0e
--- /dev/null
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -0,0 +1,32 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+DESCRIPTION = "Automotive specific Qt packages"
+LICENSE = "QtEnterprise"
+inherit packagegroup
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+RDEPENDS_${PN} += " \
+    b2qt-appcontroller \
+    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
new file mode 100644
index 0000000..006702a
--- /dev/null
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -0,0 +1,35 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+DESCRIPTION = "Device Creation specific Qt packages"
+LICENSE = "QtEnterprise"
+inherit packagegroup
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+RDEPENDS_${PN} += " \
+    b2qt-appcontroller \
+    b2qt-utils \
+    b2qt-launcher \
+    b2qt-demos \
+    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 861f61a..8909393 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -32,21 +32,34 @@ RDEPENDS_${PN} += " \
    qtbase \
    qtbase-fonts \
    qtcanvas3d \
+    qtcharts \
    qtconnectivity \
+    qtdatavisualization \
    qtdeclarative \
    qtdeclarative-tools \
    qtgraphicaleffects \
    qtimageformats \
    qtlocation \
    qtmultimedia \
+    qtquickcontrols \
    qtsensors \
    qtserialport \
    qtsvg \
    qttools \
+    qttranslations-qt \
+    qttranslations-qtbase \
+    qttranslations-qtdeclarative \
+    qttranslations-qtconnectivity \
+    qttranslations-qtlocation \
+    qttranslations-qtmultimedia \
+    qttranslations-qtquickcontrols \
+    qttranslations-qtserialport \
+    qttranslations-qtwebsockets \
+    qttranslations-qtxmlpatterns \
    ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \
    qtwebsockets \
    qtwebchannel \
    qtxmlpatterns \
-    qtquickcontrols \
+    qtvirtualkeyboard \
    "
diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb
index b57fc0b..423b215 100644
--- a/recipes-qt/qt5-addons/qtquick2drenderer.bb
+++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb
@@ -22,7 +22,7 @@
 DESCRIPTION = "Qt Quick 2D Rendender"
 LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=d90663d6d3096fe0989549d52fec6554;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=1f253bc897054feebffbaf70ecd49af4;beginline=1;endline=17"
 inherit qt5-module sdk-sources
@@ -30,9 +30,8 @@ SRC_URI = " \
    git://codereview.qt-project.org/qt/tqtc-scenegraph-raster;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \
    "
-# v1.1.1
+SRCREV = "849ee6c976ba3574b1856eb9d16c2bd740a6d2e3"
-SRCREV = "d7de74d6e608fbbd36fc9abad27fa82d095cb692"
+BRANCH = "5.6"
-BRANCH = "master"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
index 6226e6e..1bd37e6 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
@@ -30,9 +30,9 @@ SRC_URI = " \
    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
    "
-# v3.0.0
+# v5.6.0
-SRCREV = "7e29e55c8315cc5e944505f13c24893d0f54efeb"
+SRCREV = "07aeee460cc170eef28c05ce13aa30408f558215"
-BRANCH = "3.0"
+BRANCH = "5.6"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb
index ec29c65..019d29a 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb
@@ -22,20 +22,23 @@
 DESCRIPTION = "Qt Virtual Keyboard"
 LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=e0b36905c697f1be9c35712f4aced6e0;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e83db02b9629bbd;beginline=1;endline=17"
 inherit qt5-module qtquickcompiler sdk-sources
 SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \
+    git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/2.0/Src \
    "
-# v1.3.1
+SRCREV = "296f52c04968a06200f256dfaf58c563bf193f10"
-SRCREV = "c2c362d9f313441351e5e7167e22b4fd1b7012a8"
+BRANCH = "master"
-BRANCH = "1.3"
 S = "${WORKDIR}/git"
-DEPENDS = "qtbase qtdeclarative hunspell"
+DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
-EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop"
+EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop CONFIG+=pinyin CONFIG+=hangul CONFIG+=openwnn CONFIG+=tcime"
+PACKAGES += "${PN}-dictionaries"
+RRECOMMENDS_${PN} += "${PN}-dictionaries"
+FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index e6651e5..4ac7ffc 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -22,3 +22,5 @@
 # Needed by qtxmlpatterns
 EXTRA_QTLIB = "Network Sql"
+SRCREV = "8ff36d48978cbdc848053338a7cec3d990da4ff2"
diff --git a/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch b/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch
new file mode 100644
index 0000000..48a4085
--- /dev/null
+++ b/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch
@@ -0,0 +1,25 @@
+From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 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 055f412..c1eba7f 100644
+--- a/tools/tools.pro
+++ b/tools/tools.pro
+@@ -1,3 +1,3 @@
+ TEMPLATE = subdirs
+-SUBDIRS = qgltf
+#SUBDIRS = qgltf
+ qgltf.CONFIG += host_build
+-- 
+1.9.1
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
new file mode 100644
index 0000000..6b21257
--- /dev/null
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+    file://0001-Remove-qgltf.patch \
+    "
+SRCREV = "6e5c2360c0eda7efb60c9ecf9c88d463384aa53d"
diff --git a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
deleted file mode 100644
index 85e569f..0000000
--- a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 75840ad8b40068b70792a27f1fdc7cccf3d28f7c Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 16 Sep 2015 13:30:38 +0300
-Subject: [PATCH] qdoc: workaround for gcc's ICE
-Remove c++11 option from compilation to prevent gcc's internal compiler error:
-in add_stores, at var-tracking.c:6000
-Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
---
- src/tools/qdoc/qdoc.pro | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
-index f0df113..a847482 100644
--- a/src/tools/qdoc/qdoc.pro
-+++ b/src/tools/qdoc/qdoc.pro
-@@ -4,6 +4,8 @@
-     requires(!contains(QT_DISABLED_FEATURES, dom))
- }
- 
-+QMAKE_CXXFLAGS_CXX11 =
-+
- option(host_build)
- QT = core xml
- 
-- 
-1.9.1
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index adddd94..e85a55b 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -32,15 +32,17 @@ PACKAGECONFIG += " \
    linuxfb \
    sql-sqlite \
    tslib \
+    libinput \
+    xkbcommon-evdev \
    "
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
    file://oe-device-extra.pri \
-    file://0001-qdoc-workaround-for-gcc-s-ICE.patch \
    "
 do_configure_prepend() {
    install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
+SRCREV = "8ff36d48978cbdc848053338a7cec3d990da4ff2"
diff --git a/recipes-qt/qt5/qtsystems_%.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index af270e5..1d2a6ba 100644
--- a/recipes-qt/qt5/qtsystems_%.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -20,5 +20,4 @@
 ##
 #############################################################################
-EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
+SRCREV = "bb1504c271e18a26ad6ac20d55485c167671b1c2"
-DEPENDS_emulator += "qtsimulator"
diff --git a/recipes-qt/qt5/qtconnectivity_%.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 570d54e..cf9b84c 100644
--- a/recipes-qt/qt5/qtconnectivity_%.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -21,3 +21,5 @@
 #############################################################################
 PACKAGECONFIG += "bluez4"
+SRCREV = "b303d2724720f3b8b0639d2d4394447cd5e24be4"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
new file mode 100644
index 0000000..639b9ea
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "805cb851fdd26b30fe2a1ef27e3e429d319ea335"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
new file mode 100644
index 0000000..4a5192a
--- /dev/null
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "5d458e1ef23274921295bfbc20bebf439643d1a2"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
new file mode 100644
index 0000000..0afd426
--- /dev/null
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "67cbcf399aa1a18b9b1dbac0a6572a865687230a"
diff --git a/recipes-qt/qt5/qtlocation_%.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index facd006..30c0d6e 100644
--- a/recipes-qt/qt5/qtlocation_%.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -24,3 +24,5 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
+SRCREV = "83065c750b428c1c695821a4fdc02a259d392645"
diff --git a/recipes-qt/qt5/qtmultimedia_%.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index 0c2560a..85e18d9 100644
--- a/recipes-qt/qt5/qtmultimedia_%.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -21,3 +21,5 @@
 #############################################################################
 PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
+SRCREV = "da0b7aea9adae024d5ea885c7e7589de86ce80f8"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
new file mode 100644
index 0000000..34da645
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "0d2066ff8459f00af8f8195780d064023b8d1c38"
diff --git a/recipes-qt/qt5/qtsensors_%.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index a388c6f..423c501 100644
--- a/recipes-qt/qt5/qtsensors_%.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -22,3 +22,5 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
+SRCREV = "d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
new file mode 100644
index 0000000..337d351
--- /dev/null
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "13fa77f5cbbc7d5d717c3663512b904bba8c106c"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
new file mode 100644
index 0000000..2a9c5c2
--- /dev/null
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "9ee5ee12a7b92a57624dafed935b3ac1fad426d9"
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
new file mode 100644
index 0000000..40fc028
--- /dev/null
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -0,0 +1,32 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
+DEPENDS_emulator += "qtsimulator"
+SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
new file mode 100644
index 0000000..8d6b9cc
--- /dev/null
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "b6ae248bd3a05d123d8dc53fcd773b6a89f12f55"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
new file mode 100644
index 0000000..6c92e7c
--- /dev/null
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -0,0 +1,28 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "2d9a8c83893be4abde136ec87fc3db220ce8a0a5"
+PACKAGES += "${PN}-qtwebengine"
+FILES_${PN}-qtwebengine = " \
+    ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \
+"
diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
new file mode 100644
index 0000000..b1d03c2
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+require recipes-qt/qt5/qtwayland-native_git.bb
+FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:"
+SRCREV = "22caa63a70245087e0fca51f2186597c232e2d21"
+PV = "5.7-wip+git${SRCPV}"
+QT_MODULE_BRANCH = "wip-compositor-api"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
new file mode 100644
index 0000000..ebac13b
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "4d3c3a08eba8d30805f18397c98e19ab9fd40722"
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb
new file mode 100644
index 0000000..6a97e19
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland_5.7-wip.bb
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+require recipes-qt/qt5/qtwayland_git.bb
+SRCREV = "22caa63a70245087e0fca51f2186597c232e2d21"
+PV = "5.7-wip+git${SRCPV}"
+QT_MODULE_BRANCH = "wip-compositor-api"
+SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
new file mode 100644
index 0000000..ebac13b
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "4d3c3a08eba8d30805f18397c98e19ab9fd40722"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
new file mode 100644
index 0000000..53bd939
--- /dev/null
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "97577a0f27a1f427948871ae535645a2e0788bf7"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
new file mode 100644
index 0000000..3fe90cd
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -0,0 +1,24 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV_qtwebengine = "70a376d73718cc4ff8d96f6761b8c1896ca25c23"
+SRCREV_chromium = "ec5b3304fc266dfdec7666b8b73d57a3971ea35f"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
new file mode 100644
index 0000000..eeded12
--- /dev/null
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "469f748515b65cd4c9bec8794ec37ca6cf5df026"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
new file mode 100644
index 0000000..d590866
--- /dev/null
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRCREV = "ee56885f52b63132bffafad1ccc8830a65d129fa"
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index c372755..e32311e 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -38,6 +38,7 @@ SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https;br
           file://Makefile.adbd \
           file://adb-init \
           file://defaults \
+           file://adbd.service \
          "
 S = "${WORKDIR}/git"
@@ -57,15 +58,21 @@ do_compile() {
 do_install() {
    install -m 0755 -d ${D}${bindir}/
    install -m 0755 ${WORKDIR}/git/adb/adbd ${D}${bindir}/
+    install -m 0755 ${WORKDIR}/adb-init ${D}${bindir}/
    install -m 0755 -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/adb-init ${D}${sysconfdir}/init.d/
+    ln -s ${bindir}/adb-init ${D}${sysconfdir}/init.d/
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/adbd.service ${D}${systemd_unitdir}/system/
    install -m 0755 -d ${D}${sysconfdir}/default
-    install -m 0755 ${WORKDIR}/defaults ${D}${sysconfdir}/default/adbd
+    install -m 0644 ${WORKDIR}/defaults ${D}${sysconfdir}/default/adbd
 }
 INITSCRIPT_NAME = "adb-init"
 INITSCRIPT_PARAMS = "defaults 96"
-inherit update-rc.d
+SYSTEMD_SERVICE_${PN} = "adbd.service"
+inherit update-rc.d systemd
diff --git a/recipes/adbd/files/adbd.service b/recipes/adbd/files/adbd.service
new file mode 100644
index 0000000..f8ee77d
--- /dev/null
+++ b/recipes/adbd/files/adbd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=ADB Server Daemon
+After=network.target
+[Service]
+Type=forking
+ExecStart=/usr/bin/adb-init start
+ExecStop=/usr/bin/adb-init stop
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes/adbd/files/nuc/defaults b/recipes/adbd/files/nuc/defaults
new file mode 100644
index 0000000..9b7edf5
--- /dev/null
+++ b/recipes/adbd/files/nuc/defaults
@@ -0,0 +1,5 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=yes
+HOME=/data
diff --git a/recipes/busybox/busybox/busybox-ifplugd.sh b/recipes/busybox/busybox/busybox-ifplugd.sh
deleted file mode 100755
index 9ea40a8..0000000
--- a/recipes/busybox/busybox/busybox-ifplugd.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/ifplugd
-NAME=ifplugd
-DESC="Busybox IFPLUG Server"
-ARGS="-i eth0"
-test -f $DAEMON || exit 1
-set -e
-case "$1" in
-        start)
-                echo -n "starting $DESC: $NAME... "
-                /sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
-                echo "done."
-        ;;
-        stop)
-                echo -n "stopping $DESC: $NAME... "
-                /sbin/start-stop-daemon -K -n $NAME
-                echo "done."
-        ;;
-        restart)
-                echo "restarting $DESC: $NAME... "
-                $0 stop
-                $0 start
-                echo "done."
-        ;;
-        *)
-                echo "Usage: $0 {start|stop|restart}"
-                exit 1
-        ;;
-esac
diff --git a/recipes/busybox/busybox/ifplugd.action b/recipes/busybox/busybox/ifplugd.action
deleted file mode 100755
index 44fe040..0000000
--- a/recipes/busybox/busybox/ifplugd.action
+++ /dev/null
@@ -1,6 +0,0 @@
-#/bin/sh
-if [ "${2}" == "up" ]; then
-    ifup ${1}
-else
-    ifdown ${1}
-fi
diff --git a/recipes/busybox/busybox/network.cfg b/recipes/busybox/busybox/network.cfg
deleted file mode 100644
index f858907..0000000
--- a/recipes/busybox/busybox/network.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IFPLUGD=y
diff --git a/recipes/busybox/busybox_1.%.bbappend b/recipes/busybox/busybox_1.%.bbappend
deleted file mode 100644
index 7a519c6..0000000
--- a/recipes/busybox/busybox_1.%.bbappend
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://network.cfg \
-    file://busybox-ifplugd.sh \
-    file://ifplugd.action \
-    "
-PACKAGES =+ "${PN}-ifplugd"
-FILES_${PN}-ifplugd = "\
-    ${sysconfdir}/init.d/busybox-ifplugd.sh \
-    ${sysconfdir}/etc/ifplugd/ifplugd.action \
-    "
-INITSCRIPT_PACKAGES += "${PN}-ifplugd"
-INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh"
-RRECOMMENDS_${PN} += "${PN}-ifplugd"
-do_install_append () {
-    install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/
-    install -d ${D}${sysconfdir}/ifplugd
-    install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/
-}
diff --git a/recipes/dracut/dracut_git.bbappend b/recipes/dracut/dracut_git.bbappend
index 479e407..3e974cd 100644
--- a/recipes/dracut/dracut_git.bbappend
+++ b/recipes/dracut/dracut_git.bbappend
@@ -1,2 +1,5 @@
 # Upstream recipe mistakenly depends on systemd, we remove that dependency here.
 RDEPENDS_${PN}_remove = "systemd"
+REQUIRED_DISTRO_FEATURES_remove = "systemd"
+# https://bugzilla.yoctoproject.org/show_bug.cgi?id=8522
+RDEPENDS_${PN} +=  "util-linux"
diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb
index fc26e1a..742c001 100644
--- a/recipes/fonts/otf-noto.bb
+++ b/recipes/fonts/otf-noto.bb
@@ -14,6 +14,8 @@ SRC_URI = "https://noto-website.storage.googleapis.com/pkgs/NotoSansCJKSC-hinted
 SRC_URI[md5sum] = "c0fa6153aa826ee96041ba4470a1f51f"
 SRC_URI[sha256sum] = "31459f6d8c36a1136bec3f8d720b2b637e4dded681b7bb610186c9986be25848"
+S = "${WORKDIR}"
 do_install() {
    install -m 0755 -d ${D}${datadir}/fonts/otf/noto
    install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto
diff --git a/recipes/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch b/recipes/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
new file mode 100644
index 0000000..c0ea62f
--- /dev/null
+++ b/recipes/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
@@ -0,0 +1,39 @@
+From b30ffb8097749fdb55704aa7d8307ca1a58255d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
+Date: Tue, 7 Apr 2015 16:15:11 +0200
+Subject: [PATCH] gcc/var-tracking.c: backport from gcc trunk r212178
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+resolves a bug seen on cortexa8 building qt5 libraries.
+2014-06-30  Joseph Myers  <joseph@codesourcery.com>
+    * var-tracking.c (add_stores): Return instead of asserting if old
+    and new values for conditional store are the same.
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212178 138bc75d-0d04-0410-961f-82ee72b054a4
+Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
+---
+ gcc/var-tracking.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
+index 65d8285..7c38910 100644
+--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
+@@ -5997,7 +5997,8 @@ add_stores (rtx loc, const_rtx expr, void *cuip)
+     {
+       cselib_val *oval = cselib_lookup (oloc, GET_MODE (oloc), 0, VOIDmode);
+ 
+-      gcc_assert (oval != v);
+      if (oval == v)
+        return;
+       gcc_assert (REG_P (oloc) || MEM_P (oloc));
+ 
+       if (oval && !cselib_preserved_value_p (oval))
+-- 
+1.9.1
diff --git a/recipes/gcc/gcc-source_4.9.bbappend b/recipes/gcc/gcc-source_4.9.bbappend
new file mode 100644
index 0000000..8702aae
--- /dev/null
+++ b/recipes/gcc/gcc-source_4.9.bbappend
@@ -0,0 +1,27 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+FILESEXTRAPATHS_append := "${THISDIR}/gcc-4.9:"
+SRC_URI += " \
+    file://0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch \
+    "
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
index eee313b..cff6298 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
+++ b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
@@ -1 +1,2 @@
 PACKAGECONFIG_append = " x264"
+FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/*.prs"
diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb
index 2b21d51..1c02de1 100644
--- a/recipes/opengldummy/qtglesstream-dummy-client.bb
+++ b/recipes/opengldummy/qtglesstream-dummy-client.bb
@@ -30,6 +30,8 @@ SOLIBMINOR = "0"
 require opengldummy.inc
+S = "${WORKDIR}"
 do_compile() {
    ${CC} -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/0001-Support-SYSROOT-in-c_rehash.patch b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
index 01775eb..9aa9648 100644
--- a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
+++ b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
@@ -1,4 +1,4 @@
-From 6b833a7767c25b60fb0bb8dcc00484df19946288 Mon Sep 17 00:00:00 2001
+From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Wed, 9 Sep 2015 13:37:28 +0300
 Subject: [PATCH] Support SYSROOT in c_rehash
@@ -10,39 +10,27 @@ environment variable and use it to locate the actual files during image
 creation.
 Upstream-status: Pending
 ---
- tools/c_rehash.in | 28 ++++++++++++++++++----------
+ tools/c_rehash.in | 30 +++++++++++++++++-------------
- 1 file changed, 18 insertions(+), 10 deletions(-)
+ 1 file changed, 17 insertions(+), 13 deletions(-)
 diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index f8d0ce1..e81ec5b 100644
+index 92cb503..f3d2703 100644
 --- a/tools/c_rehash.in
 +++ b/tools/c_rehash.in
-@@ -5,6 +5,7 @@
+@@ -7,6 +7,7 @@ my $dir;
- # and add symbolic links to their hash values.
- 
- my $openssl;
-+my $sysroot;
- 
- my $dir;
 my $prefix;
-@@ -16,6 +17,10 @@ if(defined $ENV{OPENSSL}) {
-        $ENV{OPENSSL} = $openssl;
- }
 
-+if(defined $ENV{SYSROOT}) {
+ my $openssl = $ENV{OPENSSL} || "openssl";
-+       $sysroot = $ENV{SYSROOT};
+my $sysroot = $ENV{SYSROOT} || "";
-+}
-+
 my $pwd;
- eval "require Cwd";
+ my $verbose = 0;
- if (defined(&Cwd::getcwd)) {
+ my $symlink_exists=eval {symlink("",""); 1};
-@@ -76,15 +81,16 @@ sub hash_dir {
+@@ -101,16 +102,17 @@ sub hash_dir {
+                }
        }
-        closedir DIR;
+        FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
-        FILE: foreach $fname (grep {/\.pem$/} @flist) {
+               $fullname = $sysroot . readlink($fname);
-+       $fullname = $sysroot . readlink($fname);
                # Check to see if certificates and/or CRLs present.
 -               my ($cert, $crl) = check_file($fname);
 +               my ($cert, $crl) = check_file($fullname);
@@ -53,27 +41,29 @@ index f8d0ce1..e81ec5b 100644
 -               link_hash_cert($fname) if($cert);
 -               link_hash_cert_old($fname) if($cert);
 -               link_hash_crl($fname) if($crl);
+-               link_hash_crl_old($fname) if($crl);
 +               link_hash_cert($fname, $fullname) if($cert);
 +               link_hash_cert_old($fname, $fullname) if($cert);
 +               link_hash_crl($fname, $fullname) if($crl);
+               link_hash_crl_old($fname, $fullname) if($crl);
        }
 }
 
-@@ -117,9 +123,10 @@ sub check_file {
+@@ -143,9 +145,10 @@ sub check_file {
 
 sub link_hash_cert {
                my $fname = $_[0];
-               my $hashopt = $_[1] || '-subject_hash';
+-               my $x509hash = $_[1] || '-subject_hash';
 -               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`;
+-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
 +               my $fullname = $_[1];
-+               my $hashopt = $_[2] || '-subject_hash';
+               my $x509hash = $_[2] || '-subject_hash';
 +               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fullname"`;
+               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`;
                chomp $hash;
                chomp $fprint;
                $fprint =~ s/^.*=//;
-@@ -150,15 +157,16 @@ sub link_hash_cert {
+@@ -176,11 +179,11 @@ sub link_hash_cert {
 }
 
 sub link_hash_cert_old {
@@ -81,15 +71,23 @@ index f8d0ce1..e81ec5b 100644
 +               link_hash_cert($_[0], $_[1], '-subject_hash_old');
 }
 
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
+ sub link_hash_crl_old {
+-               link_hash_crl($_[0], '-hash_old');
+               link_hash_crl($_[0], $_[1], '-hash_old');
+ }
+ 
+ 
+@@ -188,9 +191,10 @@ sub link_hash_crl_old {
 
 sub link_hash_crl {
                my $fname = $_[0];
+-               my $crlhash = $_[1] || "-hash";
 -               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`;
+-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
 +               my $fullname = $_[1];
+               my $crlhash = $_[2] || "-hash";
 +               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fullname'`;
+               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`;
                chomp $hash;
                chomp $fprint;
                $fprint =~ s/^.*=//;
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index bc13ac2..49060b6 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -25,7 +25,7 @@ SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees."
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-inherit autotools pkgconfig
+inherit autotools pkgconfig systemd
 SRC_URI = " \
    git://github.com/GNOME/ostree.git \
@@ -41,6 +41,12 @@ S = "${WORKDIR}/git"
 DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz"
 RRECOMMENDS_${PN} += "gnupg"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,"
+SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
+FILES_${PN} += "${systemd_unitdir}/system/"
 EXTRA_OECONF = "--with-dracut \
                --without-selinux \
                --without-libarchive \
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index a2d9c72..b6b9d11 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -62,6 +62,7 @@ RDEPENDS_${PN} = "\
        libevent \
        ostree \
        dracut \
+        connman \
        ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
        ${MACHINE_EXTRA_INSTALL} \
        "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index 59fa843..47b7716 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -41,7 +41,7 @@ RDEPENDS_${PN} += "\
    ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-dev gstreamer1.0-plugins-base-dev", "", d)} \
    icu-dev \
    libxslt-dev \
-    udev-dev \
+    ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-dev", "udev-dev", d)} \
    tslib-dev \
    hunspell-dev \
    libcap-dev \
@@ -51,7 +51,7 @@ RDEPENDS_${PN} += "\
    atk-dev \
    libevent-dev \
    ostree-dev \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
    ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \
    ${MACHINE_EXTRA_INSTALL_SDK} \
    "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 351a752..1af3a6b 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -34,4 +34,6 @@ RDEPENDS_${PN} = "\
        perf \
        htop \
        ntp \
+        connman-client \
+        ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
        "
diff --git a/recipes/systemd/systemd_%.bbappend b/recipes/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..be5517d
--- /dev/null
+++ b/recipes/systemd/systemd_%.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+do_install_append() {
+    # remove login from tty1
+    rm -f ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
+}
diff --git a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.service b/recipes/virtualbox/mount-vboxsf/mount-vboxsf.service
new file mode 100644
index 0000000..7c7211f
--- /dev/null
+++ b/recipes/virtualbox/mount-vboxsf/mount-vboxsf.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=QtSimulator Shared Mount Point
+After=systemd-user-sessions.service
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/mount-vboxsf.sh start
+ExecStop=/usr/bin/mount-vboxsf.sh stop
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes/virtualbox/mount-vboxsf_4.3.30.bb b/recipes/virtualbox/mount-vboxsf_4.3.30.bb
index 171ba7e..e84e227 100644
--- a/recipes/virtualbox/mount-vboxsf_4.3.30.bb
+++ b/recipes/virtualbox/mount-vboxsf_4.3.30.bb
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2 \
          file://mount-vboxsf.sh \
+          file://mount-vboxsf.service \
          "
 SRC_URI[md5sum] = "cc053340f88922a11ad9d4fab56557bd"
@@ -40,12 +41,18 @@ do_compile() {
 do_install() {
    install -m 0755 -d ${D}${bindir}/
    install -m 0755 mount.vboxsf ${D}${bindir}/
+    install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${bindir}/
    install -m 0755 -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/
+    ln -s ${bindir}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/mount-vboxsf.service ${D}${systemd_unitdir}/system/
 }
 INITSCRIPT_NAME = "mount-vboxsf.sh"
 INITSCRIPT_PARAMS = "defaults 33"
-inherit update-rc.d
+SYSTEMD_SERVICE_${PN} = "mount-vboxsf.service"
+inherit update-rc.d systemd
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 59c7804..927a2f3 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -10,29 +10,30 @@
  <remote fetch="git://git.toradex.com" name="toradex"/>
  <remote fetch="git://github.com/architech-boards" name="architech"/>
  <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
+  <remote fetch="git://git.yoctoproject.org" name="intel"/>
  <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
  <project name="poky"
           remote="yocto"
-           revision="9c4ff467f66428488b1cd9798066a8cb5d6b4c3b"
+           revision="57eb677f0efe9a4060c764e8e9dfe2440d4e5eb2"
           path="sources/poky"/>
  <project name="meta-openembedded"
           remote="oe-mirror"
-           revision="5b6f39ce325d490fc382d5d59c5b8b9d5fa38b38"
+           revision="214e1801d0efc38d3b6142bdc0d8e58ca593e34c"
           path="sources/meta-openembedded"/>
  <project name="meta-qt5"
           remote="meta-qt5"
-           revision="89038bffd224a0d43aa8627472374503b3023f61"
+           revision="4f208863257768b875378af1421d33f1d6cf8a05"
           path="sources/meta-qt5"/>
  <project name="meta-fsl-arm"
           remote="yocto"
-           revision="db1571f40c375a398a8cdbb42de4c4f272ab0cd1"
+           revision="f30b056c8f1af3f3122f94dbaa4698da5d620a41"
           path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex,architech"/>
+           groups="notdefault,fsl,toradex,architech,ti,bbb"/>
  <project name="meta-ti"
           remote="yocto"
-           revision="6d1c337af7d43953f6d0802ffd0bf1d9d3cfb146"
+           revision="0a222c70845d19a2213ac36803361e8531768cca"
           path="sources/meta-ti"
           groups="notdefault,ti,bbb"/>
  <project name="meta-raspberrypi"
@@ -42,7 +43,7 @@
           groups="notdefault,rpi"/>
  <project name="meta-fsl-arm-extra"
           remote="freescale"
-           revision="794e46e0b0a3e7e270a2f3c217d8fe5751a6b2c6"
+           revision="c0ff75e85bcbd616362c21e501dc6df187612cf9"
           path="sources/meta-fsl-arm-extra"
           groups="notdefault,fsl,toradex,architech"/>
  <project name="meta-beagleboard"
@@ -52,7 +53,7 @@
           groups="notdefault,bbb"/>
  <project name="meta-toradex"
           remote="toradex"
-           revision="36c19b10b340983946f8f52ab7fa91d9aa1e53f6"
+           revision="eb0c16acb10257c60ddbfce8ad71448b2e987fb4"
           path="sources/meta-toradex"
           groups="notdefault,toradex"/>
  <project name="meta-tibidabo"
@@ -60,6 +61,11 @@
           revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
           path="sources/meta-tibidabo"
           groups="notdefault,architech"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="ead0a5c115e632015d8358f4f304ec8908732f5f"
+           path="sources/meta-intel"
+           groups="notdefault,nuc"/>
 </manifest>
diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_fido.xml
index 5b95985..2a1c78e 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_fido.xml
@@ -10,29 +10,30 @@
  <remote fetch="git://git.toradex.com" name="toradex"/>
  <remote fetch="git://github.com/architech-boards" name="architech"/>
  <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
+  <remote fetch="git://git.yoctoproject.org" name="intel"/>
  <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
  <project name="poky"
           remote="yocto"
-           revision="dizzy"
+           revision="fido"
           path="sources/poky"/>
  <project name="meta-openembedded"
           remote="oe-mirror"
-           revision="dizzy"
+           revision="fido"
           path="sources/meta-openembedded"/>
  <project name="meta-qt5"
           remote="meta-qt5"
-           revision="jethro"
+           revision="master"
           path="sources/meta-qt5"/>
  <project name="meta-fsl-arm"
           remote="yocto"
-           revision="dizzy"
+           revision="fido"
           path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex,architech"/>
+           groups="notdefault,fsl,toradex,architech,ti,bbb"/>
  <project name="meta-ti"
           remote="yocto"
-           revision="master"
+           revision="fido"
           path="sources/meta-ti"
           groups="notdefault,ti,bbb"/>
  <project name="meta-raspberrypi"
@@ -42,7 +43,7 @@
           groups="notdefault,rpi"/>
  <project name="meta-fsl-arm-extra"
           remote="freescale"
-           revision="dizzy"
+           revision="fido"
           path="sources/meta-fsl-arm-extra"
           groups="notdefault,fsl,toradex,architech"/>
  <project name="meta-beagleboard"
@@ -52,7 +53,7 @@
           groups="notdefault,bbb"/>
  <project name="meta-toradex"
           remote="toradex"
-           revision="V2.3-next"
+           revision="V2.5"
           path="sources/meta-toradex"
           groups="notdefault,toradex"/>
  <project name="meta-tibidabo"
@@ -60,6 +61,11 @@
           revision="dora"
           path="sources/meta-tibidabo"
           groups="notdefault,architech"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="fido"
+           path="sources/meta-intel"
+           groups="notdefault,nuc"/>
 </manifest>
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 683f19f..da7ec69 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -67,6 +67,9 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    raspberrypi|raspberrypi2)
      LAYERSCONF="bblayers.conf.rpi.sample"
    ;;
+    nuc)
+      LAYERSCONF="bblayers.conf.nuc.sample"
+    ;;
    emulator)
      LAYERSCONF="bblayers.conf.emulator.sample"
    ;;
diff --git a/scripts/upload.sh b/scripts/upload.sh
index f3124ee..f74da52 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -24,9 +24,20 @@
 set -x
 set -e
-RELEASE=5.5
+RELEASE=5.6
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
+if [ ${AUTOMOTIVE} = "true" ]; then
+  scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-x86_64-automotive-toolchain-${MACHINE}.sh
+  if [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.hdd ]; then
+    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.hdd ${UPLOADPATH}/
+  elif [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ]; then
+    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ${UPLOADPATH}/
+    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.conf ${UPLOADPATH}/
+  fi
+  exit 0
+fi
 if [ ${MACHINE} = "emulator" ]; then
  cp tmp/deploy/images/emulator/b2qt-embedded-image-emulator.hdd .
  gzip b2qt-embedded-image-emulator.hdd -f
@@ -46,3 +57,12 @@ else
  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-image-*${MACHINE}.tar.gz ${UPLOADPATH}/
  scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh
 fi
+scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-x86_64-qt5-toolchain-${MACHINE}.sh
+if [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hdd ]; then
+  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hdd ${UPLOADPATH}/
+elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.img ]; then
+  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.img ${UPLOADPATH}/
+  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.conf ${UPLOADPATH}/
+fi