45 files changed, 836 insertions, 95 deletions
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index 22d16ba..06d12de 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -30,14 +30,16 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-yocto \
-  ${BSPDIR}/sources/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-vib3 \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-vib3-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-tegra-extras \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
index f0dfbb7..2d1d18f 100644
--- a/conf/bblayers.conf.nvidia-tegra.sample
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -30,17 +30,18 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-vib4 \
  ${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-multimedia \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
-  ${BSPDIR}/sources/nvidia-layer/meta-vib4 \
  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-vib4-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-tegra-extras \
  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
  "
 BBLAYERS_NON_REMOVABLE ?= " \
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 21dd305..5849cfd 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/conf/distro/include/nvidia-logan.conf
@@ -19,7 +19,13 @@
 ##
 ##############################################################################
-DISTRO_FEATURES_remove += "wayland"
+TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
+DEFAULTTUNE = "cortexa15hf-neon"
+KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
+NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 MACHINE_EXTRA_INSTALL = "\
        libegl \
@@ -36,3 +42,17 @@ MACHINE_EXTRA_INSTALL_SDK = "\
        libdrm-nv-dev \
 "
+PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
+PREFERRED_PROVIDER_drm ?= "libdrm-nv"
+BBMASK ?= " "
+BBMASK .= "\
+|meta-vib3/recipes-kernel/linux-libc-headers\
+|meta-vib3/recipes-devtools/binutils\
+|meta-vib3/recipes-core/eglibc\
+|meta-vib3/recipes-core/systemd\
+|meta-vib3/recipes-connectivity\
+|meta-vib3/recipes-multimedia/pulseaudio\
+|meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\
+|meta-vib3/recipes-core/packagegroups\
+"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index 12b57d4..baf7f5c 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -20,34 +20,43 @@
 ##
 #############################################################################
+include conf/distro/include/tegra.inc
 TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
-DISTRO_FEATURES_DEFAULT += "wayland weston"
+DISTRO_FEATURES_DEFAULT += "wayland"
+KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}'
+NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 MACHINE_EXTRA_INSTALL = "\
-tegra-firmware-fecs \
+    tegra-firmware-fecs \
-tegra-firmware-gmicrocode \
+    tegra-firmware-gmicrocode \
-tegra-firmware-gpccs \
+    tegra-firmware-gpccs \
-tegra-firmware-gpmu \
+    tegra-firmware-gpmu \
-tegra-firmware-gshader \
+    tegra-firmware-gshader \
-tegra-firmware-pmu \
+    tegra-firmware-pmu \
-tegra-firmware-prod-fuse \
+    tegra-firmware-prod-fuse \
-tegra-firmware-xusb \
+    tegra-firmware-xusb \
-tegra-firmware-vic \
+    tegra-firmware-vic \
-tegra-firmware-nvdec \
+    tegra-firmware-nvdec \
-tegra-firmware-nvenc \
+    tegra-firmware-nvenc \
-tegra-firmware-nvjpeg \
+    tegra-firmware-nvjpeg \
-tegra-drivers \
+    tegra-drivers \
-virtual/libegl \
+    virtual/libegl \
-virtual/libgles2 \
+    virtual/libgles2 \
-libdrm-nv \
+    libdrm-nv \
-asound-conf \
+    asound-conf \
-"
+    "
 PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libgles2-dev ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libegl ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libegl-dev ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/egl ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers"
 PREFERRED_PROVIDER_wayland ?= "wayland-nv"
 PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
@@ -64,4 +73,7 @@ BBMASK .= "\
 |meta-vib4/recipes-devtools\
 |meta-vib4/recipes-extended\
 |meta-vib4/recipes-multimedia/audiomanager\
+|meta-vib4/recipes-core/glibc\
+|meta-vib4/recipes-support/lvm2\
+|meta-vib4/recipes-kernel/linux-libc-headers\
 "
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc
new file mode 100644
index 0000000..618a634
--- /dev/null
+++ b/conf/distro/include/tegra.inc
@@ -0,0 +1,17 @@
+python set_nv_drv_version () {
+    # Boiler plate code to setup bitbake objects
+    d = e.data
+    nv_drv_version = d.getVar('NV_DRV_VER', True)
+    if nv_drv_version != "ignore":
+        # FIXME: When we add support to internal builds, both debug and release
+        # builds will need to be considered
+        path = d.getVar('PLATFORM_TOPDIR', True)
+        get_nv_drv_cmd = "strings " + path + "/lib-target/nvidia_drv.so \
+| grep -o -P '(?<=Driver ).*(?=Release)' | awk {'print $1'}"
+        # Execute cmd
+        nv_drv_version = bb.process.run(get_nv_drv_cmd)[0].strip()
+        # Store returned value in NV_DRV_VER
+        d.setVar('NV_DRV_VER', nv_drv_version)
+}
diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
deleted file mode 100644
index f9d9cc6..0000000
--- a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
+++ /dev/null
@@ -1,28 +0,0 @@
-do_kernel_defconfig_prepend_tegra-t18x () {
-}
-do_install_append_tegra-t18x () {
-    s=$(readlink -m "${S}")
-    kernsrc="${STAGING_KERNEL_DIR}"
-    if [ "${s}" != "${kernsrc}" ]; then
-        mkdir -p "${kernsrc}"
-        rm -rf "${kernsrc}"
-        mv "${S}" "${STAGING_KERNEL_DIR}"
-        ln -sf "${kernsrc}" "${s}"
-    fi
-}
-do_compile_prepend_tegra-t18x () {
-    if [ -z "${TOOLCHAIN_PATH}" ] ; then
-        echo "TOOLCHAIN_PATH must be set"
-        exit -1
-    fi
-    export PATH="${TOOLCHAIN_PATH}/usr/bin/aarch64-gnu-linux:${PATH}"
-    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
-    echo "CONFIG_USB_ACM=m"         >> ${B}/.config
-    make olddefconfig
-}
diff --git a/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend b/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend
deleted file mode 100644
index 1800e5e..0000000
--- a/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-RDEPENDS_${PN}_remove_tegra-t18x = "\
-libgbm-dev \
-"
diff --git a/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
deleted file mode 100644
index d86ee9d..0000000
--- a/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_tegra-t18x := "${THISDIR}/${PN}:"
diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
deleted file mode 100644
index 85a2996..0000000
--- a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-GRAPHICS_PACKAGES = " \
-virtual/libgles2 \
-virtual/libegl \
-virtual/egl \
-libgbm \
-libgbm-dev \
-"
-PROVIDES_append = " ${GRAPHICS_PACKAGES}"
-RPROVIDES_append_${PN} = " ${GRAPHICS_PACKAGES}"
-CONFLICTS_append_${PN} = " ${GRAPHICS_PACKAGES}"
-REPLACES_append_${PN} = " ${GRAPHICS_PACKAGES}"
diff --git a/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend
deleted file mode 100644
index db0da64..0000000
--- a/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-EXTRA_PROVIDES = " \
-virtual/wayland-native \
-wayland-native \
-"
-PROVIDES_append = "${EXTRA_PROVIDES}"
-RPROVIDES_append_${PN} = "${EXTRA_PROVIDES}"
-CONFLICTS_append_${PN} = "${EXTRA_PROVIDES}"
-REPLACES_append_${PN} = "${EXTRA_PROVIDES}"
diff --git a/meta-nvidia-extras/conf/layer.conf b/meta-tegra-extras/conf/layer.conf
index aa447a5..b4a9671 100644
--- a/meta-nvidia-extras/conf/layer.conf
+++ b/meta-tegra-extras/conf/layer.conf
@@ -27,6 +27,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
            ${LAYERDIR}/recipes*/*/*.bbappend \
 "
-BBFILE_COLLECTIONS += "b2qt_nvidia"
+BBFILE_COLLECTIONS += "b2qt_tegra"
-BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/"
+BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_nvidia = "20"
+BBFILE_PRIORITY_b2qt_tegra = "20"
diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend b/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend
index 86f0571..86f0571 100644
--- a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend
diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf b/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf
index a1e45b9..a1e45b9 100644
--- a/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
+++ b/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf
diff --git a/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend b/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
new file mode 100644
index 0000000..9544e7b
--- /dev/null
+++ b/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
@@ -0,0 +1,25 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+PROVIDES = "virtual/egl virtual/libgles2"
+RPROVIDES_${PN} = "libegl libegl-dev libgles2 libgles2-dev"
+RCONFLICTS_${PN} = "libegl-mesa libegl-mesa-dev libgles2-mesa libgles2-mesa-dev"
+RREPLACES_${PN} = "libegl-mesa lbegl-mesa-dev libgles2-mesa libgles2-mesa-dev"
diff --git a/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend b/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend
new file mode 100644
index 0000000..5d0b777
--- /dev/null
+++ b/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend
@@ -0,0 +1,27 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+# WARNING: FILESEXTRAPATHS-variable, must always use _prepend (or _append)
+FILESEXTRAPATHS_tegra-x1_prepend = "__default:"
+FILESEXTRAPATHS_tegra-t18x_prepend = "__default:"
+# ERROR: QA Issue: Files/directories were installed but not shipped in any package
+FILES_${PN}-gk20a = "${FILES__${PN}-gk20a}"
diff --git a/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend b/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
new file mode 100644
index 0000000..4c839e2
--- /dev/null
+++ b/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
@@ -0,0 +1,22 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc
new file mode 100644
index 0000000..6fe139e
--- /dev/null
+++ b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Name: libdrm
+Description: Userspace interface to kernel DRM services
+Version: 2.4.66
+Libs: -L${libdir} -ldrm
+Cflags: -I${includedir} -I${includedir}/libdrm
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend
new file mode 100644
index 0000000..fdef52d
--- /dev/null
+++ b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend
@@ -0,0 +1,32 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " file://libdrm.pc"
+SRC_URI_remove_nvidia-logan = "file://${PLATFORM_TOPDIR}/include/drm_fourcc.h"
+do_install_append() {
+    install -d ${D}/usr/lib/pkgconfig
+    install -m 0776 ${WORKDIR}/libdrm.pc ${D}/usr/lib/pkgconfig/libdrm.pc
+}
+PACKAGES += "${PN}-dev"
diff --git a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend
index 97acf20..97acf20 100644
--- a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
+++ b/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
new file mode 100644
index 0000000..da1f5f7
--- /dev/null
+++ b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: egl
+Description: Mesa EGL library
+Requires.private:  libdrm >= 2.4.24   
+Version: 9.1.6
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} 
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
new file mode 100644
index 0000000..fbee576
--- /dev/null
+++ b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
@@ -0,0 +1,41 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " file://egl.pc"
+FILES_${PN} += "egl.pc"
+GRAPHICS_PACKAGES = " \
+    virtual/libgles2 \
+    virtual/libegl \
+    virtual/egl \
+    virtual/libgl \
+    virtual/libgles1 \
+    virtual/mesa \
+    libgbm \
+    libgbm-dev \
+    "
+do_install_append_tegra-t18x() {
+    install -d ${D}/usr/lib/pkgconfig
+    install -m 0775 ${WORKDIR}/egl.pc ${D}/${libdir}/pkgconfig
+}
diff --git a/meta-vib3-extras/conf/layer.conf b/meta-vib3-extras/conf/layer.conf
new file mode 100644
index 0000000..8a3341f
--- /dev/null
+++ b/meta-vib3-extras/conf/layer.conf
@@ -0,0 +1,32 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+# 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_vib3"
+BBFILE_PATTERN_b2qt_vib3 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_vib3 = "20"
diff --git a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
new file mode 100644
index 0000000..6080c3f
--- /dev/null
+++ b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
@@ -0,0 +1,26 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+SRC_URI_remove = " \
+    file://${PLATFORM_TOPDIR}/lib-target/NETB_img.bin \
+    file://${PLATFORM_TOPDIR}/lib-target/nvhost_msenc031.fw \
+    file://${PLATFORM_TOPDIR}/lib-target/vic03_ucode.bin \
+"
diff --git a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
new file mode 100644
index 0000000..3ff042b
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
@@ -0,0 +1,9 @@
+# Use our kernel instead of yocto which defaults to mainline 3.10.
+# Commit id of our kernel's include/uapi directory in kernel tree -
+# 8c37e1bfe7dd26a9d4cf4510460a75264c906444
+SRC_URI = "file://${KERN_DIR}/linux.tar.bz2"
+# Extracting linux.tar.bz2 creates directories
+# <top>/vibrante-oss-src/kernel
+S = "${WORKDIR}/vibrante-oss-src/kernel"
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
new file mode 100644
index 0000000..ee61a74
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
@@ -0,0 +1,52 @@
+From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
+static inline void *return_address(unsigned int level)
+ {
+        return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd8..f6aa84d 100644
+--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-       return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);
+-- 
+1.9.1
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
new file mode 100644
index 0000000..66f031f
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
@@ -0,0 +1,133 @@
+From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 13 Apr 2016 15:42:49 +0300
+Subject: [PATCH] Change "extern inline" to "static inline"
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). "static inline" is the correct choice
+instead.
+---
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
+ drivers/staging/rtl8712/ieee80211.h            |  4 ++--
+ lib/mpi/mpi-inline.h                           |  2 +-
+ lib/mpi/mpi-internal.h                         | 16 ++++++++--------
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+index 502bfdb..1c8d026 100644
+--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
+        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+ {
+        /*
+         * It is possible for both access points and our device to support
+@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
+        return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
+static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = IEEE80211_3ADDR_LEN;
+ 
+@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
+ 
+ extern const long ieee80211_wlan_frequencies[];
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
+static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
+ {
+        ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
+static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
+ {
+        return ieee->scans;
+ }
+diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
+index 21515c3..7518061 100644
+--- a/drivers/staging/rtl8712/ieee80211.h
+++ b/drivers/staging/rtl8712/ieee80211.h
+@@ -734,7 +734,7 @@ enum ieee80211_state {
+ #define IEEE_G            (1<<2)
+ #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
+static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = 24;
+ 
+diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
+index e2b3985..c245ea3 100644
+--- a/lib/mpi/mpi-inline.h
+++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
+#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 77adcf6..4566d11 100644
+--- a/lib/mpi/mpi-internal.h
+++ b/lib/mpi/mpi-internal.h
+@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
+-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
+//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-sub.c --*/
+-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
+//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.1
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
new file mode 100644
index 0000000..8bbc38b
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
@@ -0,0 +1,20 @@
+--- a/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 13:05:46.897056724 +0300
+++ b/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 12:55:28.053751626 +0300
+@@ -1021,7 +1021,7 @@
+ 
+ static void cl_dvfs_calibrate(struct tegra_cl_dvfs *cld)
+ {
+-       u32 val, data;
+       u32 val=0, data=0;
+        ktime_t now;
+        unsigned long rate;
+        unsigned long step = RATE_STEP(cld);
+@@ -3303,7 +3303,7 @@
+ 
+ static int monitor_get(void *data, u64 *val)
+ {
+-       u32 v, s;
+       u32 v=0, s=0;
+        unsigned long flags;
+        struct clk *c = (struct clk *)data;
+        struct tegra_cl_dvfs *cld = ((struct clk *)data)->u.dfll.cl_dvfs;
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
new file mode 100644
index 0000000..fc8fe9f
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
@@ -0,0 +1,11 @@
+--- a/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:34.912235128 +0300
+++ b/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:55.739478254 +0300
+@@ -1331,7 +1331,7 @@
+  */
+ static void tegra12_cpu_clk_init(struct clk *c)
+ {
+-       c->state = (!is_lp_cluster() == (c->u.cpu.mode == MODE_G))? ON : OFF;
+       c->state = ((!is_lp_cluster()) == (c->u.cpu.mode == MODE_G))? ON : OFF;
+ }
+ 
+ static int tegra12_cpu_clk_enable(struct clk *c)
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
new file mode 100644
index 0000000..5d4b59a
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
@@ -0,0 +1,57 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+FILESEXTRAPATHS_prepend := "__default:${THISDIR}/${PN}:"
+DEPENDS_remove = "external-tegra-toolchain"
+do_kernel_defconfig[depends] = "kern-tools-native:do_populate_sysroot"
+SRC_URI += "\
+    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
+    file://0001-Change-extern-inline-to-static-inline.patch \
+    file://Fix_compile_error_in_tegra_drivers.patch \
+    file://Fix_compiler_error_in_tegra12_lock.patch \
+    "
+do_compile_prepend () {
+    # Cross compiling exports
+    export ARCH=${TARGET_ARCH}
+    export CROSS_COMPILE=${CROSS_COMPILE}
+    echo "CONFIG_FHANDLE=y" >> ${B}/.config
+    make olddefconfig
+}
+do_install_append() {
+    s=$(readlink -m "${S}")
+    kernsrc="${STAGING_KERNEL_DIR}"
+    if [ "${s}" != "${kernsrc}" ]; then
+        mkdir -p "${kernsrc}"
+        rm -rf "${kernsrc}"
+        mv "${S}" "${STAGING_KERNEL_DIR}"
+        ln -sf "${kernsrc}" "${s}"
+    fi
+}
+python do_patch () {
+    bb.build.exec_func('patch_do_patch', d)
+}
diff --git a/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend
index cd74ddf..c33ee23 100644
--- a/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend
@@ -19,5 +19,5 @@
 ##
 ##############################################################################
-DEPENDS_nvidia-logan += "graphics-headers"
+DEPENDS += "graphics-headers"
-PACKAGECONFIG_nvidia-logan += "kms"
+PACKAGECONFIG += "kms"
diff --git a/meta-vib4-extras/conf/layer.conf b/meta-vib4-extras/conf/layer.conf
new file mode 100644
index 0000000..89fb47e
--- /dev/null
+++ b/meta-vib4-extras/conf/layer.conf
@@ -0,0 +1,32 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+# 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_vib4"
+BBFILE_PATTERN_b2qt_vib4 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_vib4 = "20"
diff --git a/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend b/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend
new file mode 100644
index 0000000..d7353bc
--- /dev/null
+++ b/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend
@@ -0,0 +1,15 @@
+# Append --enable-kernel flag to configure flags
+# only for target build case.
+# We are setting this to kernel 3.18 to keep glibc
+# compatbile across all 3.18 series
+# We will not support < 3.18 for V4L:
+EXTRA_OECONF_append_class-target = " \
+    --enable-kernel=3.18 \
+"
+# Search $PWD/eglibc-2.18 for additional patches
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+# Placeholder for patches
+SRC_URI_append_class-target = " \
+"
diff --git a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
new file mode 100644
index 0000000..f2bdba1
--- /dev/null
+++ b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
@@ -0,0 +1,7 @@
+# Use our kernel instead of yocto which defaults to mainline 3.18
+SRC_URI = "file://${KERN_DIR}/linux.tar.bz2"
+PV = "3.18"
+# Extracting linux.tar.bz2 creates directories
+# <top>/vibrante-oss-src/kernel
+S = "${WORKDIR}/vibrante-oss-src/kernel"
diff --git a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
new file mode 100644
index 0000000..8861fc3
--- /dev/null
+++ b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
@@ -0,0 +1,57 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+do_kernel_defconfig_prepend () {
+}
+do_compile_prepend () {
+    # cross_compile_exports
+    export ARCH=${KERNEL_ARCH}
+    export CROSS_COMPILE=${CROSS_COMPILE}
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
+    echo "CONFIG_USB_ACM=m"         >> ${B}/.config
+    make olddefconfig
+}
+do_install () {
+    kernel_do_install
+    s=$(readlink -m "${S}")
+    kernsrc="${STAGING_KERNEL_DIR}"
+    if [ "${s}" != "${kernsrc}" ]; then
+        mkdir -p "${kernsrc}"
+        rm -rf "${kernsrc}"
+        mv "${S}" "${STAGING_KERNEL_DIR}"
+        ln -sf "${kernsrc}" "${s}"
+    fi
+}
+do_deploy() {
+    kernel_do_deploy
+}
+do_compile () {
+    kernel_do_compile
+}
diff --git a/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
index 629ccf4..629ccf4 100644
--- a/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
+++ b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..9b56df1
--- /dev/null
+++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
@@ -0,0 +1,22 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend
new file mode 100644
index 0000000..2c46f2d
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend
@@ -0,0 +1,41 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+    file://wayland-client.pc \
+    file://wayland-cursor.pc \
+    file://wayland-egl.pc \
+    file://wayland-server.pc \
+    file://${PLATFORM_TOPDIR}/include/wayland-egl-core.h \
+    "
+FILES_${PN} += "${libdir}/pkgconfig"
+WAYLAND_PACKAGES += "wayland-dev"
+do_install_append() {
+    install -d ${D}${libdir}/pkgconfig
+    install -m 0776 ${WORKDIR}/*.pc ${D}${libdir}/pkgconfig
+    install -d ${D}${includedir}
+    install -m 0775 ${PLATFORM_TOPDIR}/include/wayland-egl-core.h ${D}${includedir}
+}
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc
new file mode 100644
index 0000000..e639768
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
+datarootdir=${prefix}/share
+pkgdatadir=/usr/share/wayland
+libdir=/usr/lib
+includedir=/usr/include
+Name: Wayland Client
+Description: Wayland client side library
+Version: 1.6.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lwayland-client
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc
new file mode 100644
index 0000000..36538ad
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+Name: Wayland Cursor
+Description: Wayland cursor helper library
+Version: 1.6.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lwayland-cursor
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc
new file mode 100644
index 0000000..dc8393f
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+Name: wayland-egl
+Description: wayland-egl library
+Version: 9.1.6
+Libs: -L${libdir} -lwayland-egl
+Cflags: -I${includedir}
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc
new file mode 100644
index 0000000..dab87b9
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
+datarootdir=${prefix}/share
+pkgdatadir=/usr/share/wayland
+libdir=/usr/lib
+includedir=/usr/include
+Name: Wayland Server
+Description: Server side implementation of the Wayland protocol
+Version: 1.6.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lwayland-server
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 28ccfa3..4c1e70f 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -73,16 +73,21 @@
           path="sources/meta-intel"
           groups="notdefault,external,intel"/>
-  <project name="meta-tegra"
+  <project name="nvidia-layer"
           remote="playground"
-           revision="3125d29a5c58a471b67104d1bff965df38eb3115"
+           revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7"
-           path="sources/meta-tegra"
+           path="sources/nvidia-layer"
           groups="notdefault,internal"/>
  <project name="jetson-tk1-pro"
           remote="playground"
           revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
           path="sources/jetson-tk1-pro"
           groups="notdefault,internal"/>
+  <project name="vibrante-t186"
+           remote="playground"
+           revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f"
+           path="sources/vibrante-t186"
+           groups="notdefault,internal"/>
  <project name="meta-smx6"
           remote="playground"
           revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index 29b401c..6044ae5 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -73,16 +73,21 @@
           path="sources/meta-intel"
           groups="notdefault,external,intel"/>
-  <project name="meta-tegra"
+  <project name="nvidia-layer"
           remote="playground"
           revision="master"
-           path="sources/meta-tegra"
+           path="sources/nvidia-layer"
           groups="notdefault,internal"/>
  <project name="jetson-tk1-pro"
           remote="playground"
           revision="master"
           path="sources/jetson-tk1-pro"
           groups="notdefault,internal"/>
+  <project name="vibrante-t186"
+           remote="playground"
+           revision="master"
+           path="sources/vibrante-t186"
+           groups="notdefault,internal"/>
  <project name="meta-smx6"
           remote="playground"
           revision="fido"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 19f7ffa..1fb4d89 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -72,8 +72,11 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    intel-corei7-64)
      LAYERSCONF="bblayers.conf.intel.sample"
    ;;
-    nvidia-logan|tegra-x1|tegra-t18x)
+    nvidia-logan)
-      LAYERSCONF="bblayers.conf.nvidia.sample"
+      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
+    ;;
+    tegra-x1|tegra-t18x)
+      LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
    ;;
    emulator)
      LAYERSCONF="bblayers.conf.emulator.sample"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 60e7e14..fc9c837 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -33,10 +33,11 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img
  7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
    $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \
    $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf
-elif [ ${MACHINE} == "nvidia-logan" || ${MACHINE} == "tegra-x1" || ${MACHINE} == "tegra-t18x" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
+elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \
+    && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
  7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
    $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \
-    $PWD/tmp/deploy/images/${MACHINE}/zImage
+    $PWD/tmp/deploy/images/${MACHINE}/*Image
 fi
 if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then