258 files changed, 70 insertions, 20 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 064aa278..cb57b61a 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -153,7 +153,7 @@ get_groups() {
 
 list_devices() {
   echo "Available device configurations:"
-  for device in $(ls $DIR/conf/distro/include/*.conf); do
+  for device in $(ls ${DIR}/meta-boot2qt-distro/conf/distro/include/*.conf); do
     echo "  $(basename ${device%%.conf})"
   done
 }
diff --git a/classes/qmake5_paths.bbclass b/meta-boot2qt-distro/classes/qmake5_paths.bbclass
index 32c7716f..32c7716f 100644
--- a/classes/qmake5_paths.bbclass
+++ b/meta-boot2qt-distro/classes/qmake5_paths.bbclass
diff --git a/conf/bblayers.conf.boundary.sample b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
index b5ab9c75..14d9c0bd 100644
--- a/conf/bblayers.conf.boundary.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
@@ -46,7 +46,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.emulator.sample b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample
index 381c4884..bf328877 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample
@@ -43,7 +43,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
index 389cb827..e6afe33f 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
@@ -45,7 +45,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
index e6094d68..efe626ae 100644
--- a/conf/bblayers.conf.intel.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
@@ -44,7 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-intel-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
index 969f071b..eccc371a 100644
--- a/conf/bblayers.conf.jetson.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
@@ -44,7 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample
index c1ac918a..d0428050 100644
--- a/conf/bblayers.conf.nvidia-tegra.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample
@@ -45,7 +45,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-nvidia-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.rcar-gen3.sample b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
index 8f7a3c41..6f502ea9 100644
--- a/conf/bblayers.conf.rcar-gen3.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
@@ -46,7 +46,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
index e376beaf..c701d0e6 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
@@ -44,7 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.sample b/meta-boot2qt-distro/conf/bblayers.conf.sample
index 381c4884..bf328877 100644
--- a/conf/bblayers.conf.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.sample
@@ -43,7 +43,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.smx6.sample b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample
index 4c634ec8..5a09ec96 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample
@@ -46,7 +46,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-smx6-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.ti.sample b/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
index d97a613c..47260a4c 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
@@ -45,7 +45,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.toradex.sample b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
index a8f4f439..f30ba797 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
@@ -47,7 +47,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index 1aa4bd5e..1aa4bd5e 100644
--- a/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
diff --git a/conf/distro/include/am335x-evm.conf b/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
index 4ec3e4de..4ec3e4de 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
diff --git a/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index bdb57d80..bdb57d80 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
diff --git a/conf/distro/include/beagleboard.conf b/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
index d9b92f05..d9b92f05 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
diff --git a/conf/distro/include/beaglebone.conf b/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
index 099be56d..099be56d 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
diff --git a/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index c8f54241..c8f54241 100644
--- a/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
diff --git a/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index 814676b9..814676b9 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
diff --git a/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index 4e0daa77..4e0daa77 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
diff --git a/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
index e4c025ba..e4c025ba 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
diff --git a/conf/distro/include/emulator.conf b/meta-boot2qt-distro/conf/distro/include/emulator.conf
index b6125ae4..b6125ae4 100644
--- a/conf/distro/include/emulator.conf
+++ b/meta-boot2qt-distro/conf/distro/include/emulator.conf
diff --git a/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index 32fec1bd..32fec1bd 100644
--- a/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
diff --git a/conf/distro/include/h3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf
index ddb40e01..ddb40e01 100644
--- a/conf/distro/include/h3ulcb.conf
+++ b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf
diff --git a/conf/distro/include/h3ulcb.pre.inc b/meta-boot2qt-distro/conf/distro/include/h3ulcb.pre.inc
index ad1e9aaf..ad1e9aaf 100644
--- a/conf/distro/include/h3ulcb.pre.inc
+++ b/meta-boot2qt-distro/conf/distro/include/h3ulcb.pre.inc
diff --git a/conf/distro/include/imx6dlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
index af499835..af499835 100644
--- a/conf/distro/include/imx6dlsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
diff --git a/conf/distro/include/imx6qsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
index 683c6018..683c6018 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
diff --git a/conf/distro/include/imx7dsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf
index 962077ce..962077ce 100644
--- a/conf/distro/include/imx7dsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf
diff --git a/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
index 1d304454..1d304454 100644
--- a/conf/distro/include/imx7s-warp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
diff --git a/conf/distro/include/intel-corei7-64.conf b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
index 0c8200ab..0c8200ab 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
diff --git a/conf/distro/include/jetson-tx1.conf b/meta-boot2qt-distro/conf/distro/include/jetson-tx1.conf
index ca82ab0c..ca82ab0c 100644
--- a/conf/distro/include/jetson-tx1.conf
+++ b/meta-boot2qt-distro/conf/distro/include/jetson-tx1.conf
diff --git a/conf/distro/include/jetson-tx2.conf b/meta-boot2qt-distro/conf/distro/include/jetson-tx2.conf
index 7ab3fb0e..7ab3fb0e 100644
--- a/conf/distro/include/jetson-tx2.conf
+++ b/meta-boot2qt-distro/conf/distro/include/jetson-tx2.conf
diff --git a/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index 98c71f4e..98c71f4e 100644
--- a/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
diff --git a/conf/distro/include/m3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf
index cff78935..cff78935 100644
--- a/conf/distro/include/m3ulcb.conf
+++ b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf
diff --git a/conf/distro/include/m3ulcb.pre.inc b/meta-boot2qt-distro/conf/distro/include/m3ulcb.pre.inc
index c0429dbd..c0429dbd 100644
--- a/conf/distro/include/m3ulcb.pre.inc
+++ b/meta-boot2qt-distro/conf/distro/include/m3ulcb.pre.inc
diff --git a/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
index 894d51d0..894d51d0 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
diff --git a/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
index 1614b043..1614b043 100644
--- a/conf/distro/include/nitrogen7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
diff --git a/conf/distro/include/opencv.inc b/meta-boot2qt-distro/conf/distro/include/opencv.inc
index a1d37dfa..a1d37dfa 100644
--- a/conf/distro/include/opencv.inc
+++ b/meta-boot2qt-distro/conf/distro/include/opencv.inc
diff --git a/conf/distro/include/raspberrypi.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
index 4429fa98..4429fa98 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
diff --git a/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index f980e138..f980e138 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
diff --git a/conf/distro/include/raspberrypi0.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
index 647e5973..647e5973 100644
--- a/conf/distro/include/raspberrypi0.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
diff --git a/conf/distro/include/raspberrypi2.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi2.conf
index 93215d34..93215d34 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi2.conf
diff --git a/conf/distro/include/raspberrypi3.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi3.conf
index ef090a10..ef090a10 100644
--- a/conf/distro/include/raspberrypi3.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi3.conf
diff --git a/conf/distro/include/rcar-gen3.inc b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
index 4350ddae..4350ddae 100644
--- a/conf/distro/include/rcar-gen3.inc
+++ b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
diff --git a/conf/distro/include/salvator-x.conf b/meta-boot2qt-distro/conf/distro/include/salvator-x.conf
index c44dbe13..c44dbe13 100644
--- a/conf/distro/include/salvator-x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/salvator-x.conf
diff --git a/conf/distro/include/salvator-x.pre.inc b/meta-boot2qt-distro/conf/distro/include/salvator-x.pre.inc
index e87933ce..e87933ce 100644
--- a/conf/distro/include/salvator-x.pre.inc
+++ b/meta-boot2qt-distro/conf/distro/include/salvator-x.pre.inc
diff --git a/conf/distro/include/smarc-samx6i.conf b/meta-boot2qt-distro/conf/distro/include/smarc-samx6i.conf
index 240e3dd6..240e3dd6 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/meta-boot2qt-distro/conf/distro/include/smarc-samx6i.conf
diff --git a/conf/distro/include/tegra-t18x.conf b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
index 6c79d2cf..6c79d2cf 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
diff --git a/conf/distro/include/ti.inc b/meta-boot2qt-distro/conf/distro/include/ti.inc
index 80f90f27..80f90f27 100644
--- a/conf/distro/include/ti.inc
+++ b/meta-boot2qt-distro/conf/distro/include/ti.inc
diff --git a/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 83b6d458..83b6d458 100644
--- a/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf
new file mode 100644
index 00000000..268f6d37
--- /dev/null
+++ b/meta-boot2qt-distro/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# 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-distro"
+BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt-distro = "20"
diff --git a/conf/local.conf.sample b/meta-boot2qt-distro/conf/local.conf.sample
index ae60ef49..ae60ef49 100644
--- a/conf/local.conf.sample
+++ b/meta-boot2qt-distro/conf/local.conf.sample
diff --git a/conf/machine/emulator.conf b/meta-boot2qt-distro/conf/machine/emulator.conf
index 2ab622ee..2ab622ee 100644
--- a/conf/machine/emulator.conf
+++ b/meta-boot2qt-distro/conf/machine/emulator.conf
diff --git a/conf/machine/qemuarmv7.conf b/meta-boot2qt-distro/conf/machine/qemuarmv7.conf
index 530f8029..530f8029 100644
--- a/conf/machine/qemuarmv7.conf
+++ b/meta-boot2qt-distro/conf/machine/qemuarmv7.conf
diff --git a/recipes/alsa/alsa-state.bbappend b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.bbappend
index dbeb0307..dbeb0307 100644
--- a/recipes/alsa/alsa-state.bbappend
+++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.bbappend
diff --git a/recipes/alsa/alsa-state/emulator/asound.conf b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf
index edd2e82a..edd2e82a 100644
--- a/recipes/alsa/alsa-state/emulator/asound.conf
+++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf
diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf
index 83f7f9a3..83f7f9a3 100644
--- a/recipes/alsa/alsa-state/raspberrypi/asound.conf
+++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf
diff --git a/recipes/v86d/v86d/fbsetup b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup
index 064e0802..064e0802 100755
--- a/recipes/v86d/v86d/fbsetup
+++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup
diff --git a/recipes/v86d/v86d/uvesafb.options.conf b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf
index 7d0dc961..7d0dc961 100644
--- a/recipes/v86d/v86d/uvesafb.options.conf
+++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf
diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend
index bf72dee6..bf72dee6 100644
--- a/recipes/v86d/v86d_0.1.10.bbappend
+++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend
diff --git a/recipes/connman-conf/connman-conf.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend
index 06dc61dd..06dc61dd 100644
--- a/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend
diff --git a/recipes/connman-conf/connman-conf/settings b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf/settings
index edfedd44..edfedd44 100644
--- a/recipes/connman-conf/connman-conf/settings
+++ b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf/settings
diff --git a/recipes/connman/connman_%.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
index fda246ad..fda246ad 100644
--- a/recipes/connman/connman_%.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
index f8937463..f8937463 100644
--- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
index 8b466665..8b466665 100644
--- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
diff --git a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
index 9aa96483..9aa96483 100644
--- a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
+++ b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
diff --git a/recipes/openssl/openssl_1.%.bbappend b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
index bac366db..bac366db 100644
--- a/recipes/openssl/openssl_1.%.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend b/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend
index e8808977..e8808977 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend
+++ b/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend
diff --git a/recipes/base-files/base-files/blacklist.conf b/meta-boot2qt-distro/recipes-core/base-files/base-files/blacklist.conf
index a8b88854..a8b88854 100644
--- a/recipes/base-files/base-files/blacklist.conf
+++ b/meta-boot2qt-distro/recipes-core/base-files/base-files/blacklist.conf
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend
index 1dc55019..1dc55019 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/meta-boot2qt-distro/recipes-core/base-files/base-files_3.0.14.bbappend
diff --git a/recipes/dbus/dbus/dbus-session-address b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session-address
index 3f853064..3f853064 100644
--- a/recipes/dbus/dbus/dbus-session-address
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session-address
diff --git a/recipes/dbus/dbus/dbus-session.init b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.init
index 0690511e..0690511e 100644
--- a/recipes/dbus/dbus/dbus-session.init
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.init
diff --git a/recipes/dbus/dbus/dbus-session.service b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.service
index 8dcf081a..8dcf081a 100644
--- a/recipes/dbus/dbus/dbus-session.service
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus/dbus-session.service
diff --git a/recipes/dbus/dbus_%.bbappend b/meta-boot2qt-distro/recipes-core/dbus/dbus_%.bbappend
index 64d750c6..64d750c6 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/meta-boot2qt-distro/recipes-core/dbus/dbus_%.bbappend
diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend
index e2550b10..e2550b10 100644
--- a/recipes/initscripts/initscripts_1.0.bbappend
+++ b/meta-boot2qt-distro/recipes-core/initscripts/initscripts_1.0.bbappend
diff --git a/recipes/meta/meta-environment.bbappend b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend
index 65cc6b33..65cc6b33 100644
--- a/recipes/meta/meta-environment.bbappend
+++ b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 9f43fff3..9f43fff3 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb
index b6573e2a..b6573e2a 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb
index b1bec0e1..b1bec0e1 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb
index af291c7c..af291c7c 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb
index 7644f6ff..7644f6ff 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb
diff --git a/recipes/systemd/systemd/usb-rndis.network b/meta-boot2qt-distro/recipes-core/systemd/systemd/usb-rndis.network
index d529eebe..d529eebe 100644
--- a/recipes/systemd/systemd/usb-rndis.network
+++ b/meta-boot2qt-distro/recipes-core/systemd/systemd/usb-rndis.network
diff --git a/recipes/systemd/systemd_%.bbappend b/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend
index 96b89100..96b89100 100644
--- a/recipes/systemd/systemd_%.bbappend
+++ b/meta-boot2qt-distro/recipes-core/systemd/systemd_%.bbappend
diff --git a/recipes/binutils/binutils-cross_%.bbappend b/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross_%.bbappend
index 8a069ed5..8a069ed5 100644
--- a/recipes/binutils/binutils-cross_%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross_%.bbappend
diff --git a/recipes/gdb/gdb-cross-canadian_7.%.bbappend b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
index 4e55e66f..4e55e66f 100644
--- a/recipes/gdb/gdb-cross-canadian_7.%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
diff --git a/recipes/gdb/gdb/0001-Do-not-use-win32-specific-filehandling.patch b/meta-boot2qt-distro/recipes-devtools/gdb/gdb/0001-Do-not-use-win32-specific-filehandling.patch
index c9a20edb..c9a20edb 100644
--- a/recipes/gdb/gdb/0001-Do-not-use-win32-specific-filehandling.patch
+++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb/0001-Do-not-use-win32-specific-filehandling.patch
diff --git a/recipes/perl/perl_5.%.bbappend b/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend
index 5f4baf77..5f4baf77 100644
--- a/recipes/perl/perl_5.%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/perl/perl_5.%.bbappend
diff --git a/recipes/python/python3-native_%.bbappend b/meta-boot2qt-distro/recipes-devtools/python/python3-native_%.bbappend
index 9015f3f8..9015f3f8 100644
--- a/recipes/python/python3-native_%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/python/python3-native_%.bbappend
diff --git a/recipes/python/python3-virtualenv.bb b/meta-boot2qt-distro/recipes-devtools/python/python3-virtualenv.bb
index cc091b87..cc091b87 100644
--- a/recipes/python/python3-virtualenv.bb
+++ b/meta-boot2qt-distro/recipes-devtools/python/python3-virtualenv.bb
diff --git a/recipes/python/python3_%.bbappend b/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend
index b3a5eb7e..b3a5eb7e 100644
--- a/recipes/python/python3_%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend
diff --git a/recipes/gperf/gperf_%.bbappend b/meta-boot2qt-distro/recipes-extended/gperf/gperf_%.bbappend
index 6f2651c1..6f2651c1 100644
--- a/recipes/gperf/gperf_%.bbappend
+++ b/meta-boot2qt-distro/recipes-extended/gperf/gperf_%.bbappend
diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/meta-boot2qt-distro/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
index 955c797e..955c797e 100644
--- a/recipes/libsdl/libsdl_1.2.15.bbappend
+++ b/meta-boot2qt-distro/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
diff --git a/recipes/mesa/mesa_%.bbappend b/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend
index 35f66f4d..35f66f4d 100644
--- a/recipes/mesa/mesa_%.bbappend
+++ b/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend
diff --git a/recipes/linux-firmware/linux-firmware_git.bbappend b/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
index 33bcc349..33bcc349 100644
--- a/recipes/linux-firmware/linux-firmware_git.bbappend
+++ b/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
diff --git a/recipes/linux/linux-yocto/snd_intel8x0.cfg b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/snd_intel8x0.cfg
index 6d78f08e..6d78f08e 100644
--- a/recipes/linux/linux-yocto/snd_intel8x0.cfg
+++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/snd_intel8x0.cfg
diff --git a/recipes/linux/linux-yocto_4.%.bbappend b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto_4.%.bbappend
index 3687f9b7..3687f9b7 100644
--- a/recipes/linux/linux-yocto_4.%.bbappend
+++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto_4.%.bbappend
diff --git a/recipes/perf/perf.bbappend b/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend
index f8a95911..f8a95911 100644
--- a/recipes/perf/perf.bbappend
+++ b/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend
diff --git a/recipes/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch
index 2c0530e7..2c0530e7 100644
--- a/recipes/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch
+++ b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch
diff --git a/recipes/alsa-utils/alsa-utils_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend
index ddb5c91e..ddb5c91e 100644
--- a/recipes/alsa-utils/alsa-utils_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
index f42e1214..f42e1214 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
diff --git a/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base/fix-gstvolume.patch
index d229e952..d229e952 100644
--- a/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base/fix-gstvolume.patch
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base_0.10.%.bbappend
index 646faa5e..646faa5e 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base_0.10.%.bbappend
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index f42e1214..f42e1214 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
index e3383161..e3383161 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
diff --git a/recipes/samba/samba_4.%.bbappend b/meta-boot2qt-distro/recipes-networking/samba/samba_4.%.bbappend
index 4a86809e..4a86809e 100644
--- a/recipes/samba/samba_4.%.bbappend
+++ b/meta-boot2qt-distro/recipes-networking/samba/samba_4.%.bbappend
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
index 67819d76..67819d76 100644
--- a/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
diff --git a/recipes-qt/images/b2qt-embedded-ci-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
index 32773e14..32773e14 100644
--- a/recipes-qt/images/b2qt-embedded-ci-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb
index d8743a52..d8743a52 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb
diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index 5595cc63..5595cc63 100644
--- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index dc2873f5..dc2873f5 100644
--- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
index 94bf48d3..94bf48d3 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 65354ada..65354ada 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
index 777bffe4..777bffe4 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
index 7ce53c6e..7ce53c6e 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index 3ce2e790..3ce2e790 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index bb2e4dea..bb2e4dea 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
index 6ae1ef49..6ae1ef49 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 1fdbcf35..1fdbcf35 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 2af00da1..2af00da1 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index a79d596d..a79d596d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 2ae2206f..2ae2206f 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase-native_git.bbappend
index 821c6d3e..821c6d3e 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase-native_git.bbappend
diff --git a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
index ac4fe40a..ac4fe40a 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
diff --git a/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch
index 26c78381..26c78381 100644
--- a/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch
diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
index d29adb27..d29adb27 100644
--- a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
index cdb62045..cdb62045 100644
--- a/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
index d4c14cae..d4c14cae 100644
--- a/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
index d4c14cae..d4c14cae 100644
--- a/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
index f5445e38..f5445e38 100644
--- a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
index 6554742c..6554742c 100644
--- a/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri
index 250c999a..250c999a 100644
--- a/recipes-qt/qt5/qtbase/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
index 9f648081..9f648081 100644
--- a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri
index ae044689..ae044689 100644
--- a/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
index 4597a841..4597a841 100644
--- a/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
index 0a18a5df..0a18a5df 100644
--- a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index e7c7adfe..e7c7adfe 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
index d9144a89..d9144a89 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
diff --git a/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
index ad4c7b8a..ad4c7b8a 100644
--- a/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
index d6ee6a1c..d6ee6a1c 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend
index fbae3ba0..fbae3ba0 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtsystems_git.bbappend
index e8fe1f38..e8fe1f38 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtsystems_git.bbappend
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
index 4f480995..4f480995 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
diff --git a/recipes/rng-tools/rng-tools/rngd.service b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service
index 22c73612..22c73612 100644
--- a/recipes/rng-tools/rng-tools/rngd.service
+++ b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service
diff --git a/recipes/rng-tools/rng-tools_5.bbappend b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
index dedddf0a..dedddf0a 100644
--- a/recipes/rng-tools/rng-tools_5.bbappend
+++ b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
diff --git a/classes/abi-arch.bbclass b/meta-boot2qt/classes/abi-arch.bbclass
index 23b9b1c4..23b9b1c4 100644
--- a/classes/abi-arch.bbclass
+++ b/meta-boot2qt/classes/abi-arch.bbclass
diff --git a/classes/bootfs-image.bbclass b/meta-boot2qt/classes/bootfs-image.bbclass
index c7a25ae7..c7a25ae7 100644
--- a/classes/bootfs-image.bbclass
+++ b/meta-boot2qt/classes/bootfs-image.bbclass
diff --git a/classes/consistent_timestamps.bbclass b/meta-boot2qt/classes/consistent_timestamps.bbclass
index 1f560c21..1f560c21 100644
--- a/classes/consistent_timestamps.bbclass
+++ b/meta-boot2qt/classes/consistent_timestamps.bbclass
diff --git a/classes/deploy-conf.bbclass b/meta-boot2qt/classes/deploy-conf.bbclass
index 228b1e20..228b1e20 100644
--- a/classes/deploy-conf.bbclass
+++ b/meta-boot2qt/classes/deploy-conf.bbclass
diff --git a/classes/image-hdd.bbclass b/meta-boot2qt/classes/image-hdd.bbclass
index d12f3bf7..d12f3bf7 100644
--- a/classes/image-hdd.bbclass
+++ b/meta-boot2qt/classes/image-hdd.bbclass
diff --git a/classes/image_dd.bbclass b/meta-boot2qt/classes/image_dd.bbclass
index e05536b2..e05536b2 100644
--- a/classes/image_dd.bbclass
+++ b/meta-boot2qt/classes/image_dd.bbclass
diff --git a/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass
index 37b1b61c..37b1b61c 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/meta-boot2qt/classes/image_types_sdcard.bbclass
diff --git a/classes/internal-build.bbclass b/meta-boot2qt/classes/internal-build.bbclass
index 64c07bf0..64c07bf0 100644
--- a/classes/internal-build.bbclass
+++ b/meta-boot2qt/classes/internal-build.bbclass
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
index 453d94e7..e98565c1 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
@@ -83,7 +83,7 @@ EOF
 
 create_qtcreator_configure_script () {
     # add qtcreator configuration script
-    install -m 0755 ${B2QTBASE}/scripts/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH}
+    install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH}
     sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
     sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
 }
diff --git a/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
index 8d600d09..8d600d09 100644
--- a/classes/populate_b2qt_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
diff --git a/classes/qbsp-image.bbclass b/meta-boot2qt/classes/qbsp-image.bbclass
index 71d1d455..71d1d455 100644
--- a/classes/qbsp-image.bbclass
+++ b/meta-boot2qt/classes/qbsp-image.bbclass
diff --git a/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index da790bf9..da790bf9 100644
--- a/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
diff --git a/classes/qt5-module.bbclass b/meta-boot2qt/classes/qt5-module.bbclass
index e68f95f5..e68f95f5 100644
--- a/classes/qt5-module.bbclass
+++ b/meta-boot2qt/classes/qt5-module.bbclass
diff --git a/classes/qtquickcompiler.bbclass b/meta-boot2qt/classes/qtquickcompiler.bbclass
index f54887ca..f54887ca 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/meta-boot2qt/classes/qtquickcompiler.bbclass
diff --git a/classes/sdk-sources.bbclass b/meta-boot2qt/classes/sdk-sources.bbclass
index b12f371e..b12f371e 100644
--- a/classes/sdk-sources.bbclass
+++ b/meta-boot2qt/classes/sdk-sources.bbclass
diff --git a/conf/layer.conf b/meta-boot2qt/conf/layer.conf
index 4c8757c9..de3f8366 100644
--- a/conf/layer.conf
+++ b/meta-boot2qt/conf/layer.conf
@@ -31,11 +31,9 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes/*/*.bb \
-            ${LAYERDIR}/recipes/*/*.bbappend \
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
             "
-BBFILES += "${@bb.utils.contains("BBFILE_COLLECTIONS", "qt5-layer", "${LAYERDIR}/recipes-qt/*/*.bb ${LAYERDIR}/recipes-qt/*/*.bbappend" , "", d)}"
-
 BBFILE_COLLECTIONS += "b2qt"
 BBFILE_PATTERN_b2qt := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt = "20"
diff --git a/scripts/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index 7386f704..7386f704 100755
--- a/scripts/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
diff --git a/files/qbsp/NXP-EULA b/meta-boot2qt/files/qbsp/NXP-EULA
index 8acbf5a6..8acbf5a6 100644
--- a/files/qbsp/NXP-EULA
+++ b/meta-boot2qt/files/qbsp/NXP-EULA
diff --git a/files/qbsp/base_package.xml b/meta-boot2qt/files/qbsp/base_package.xml
index 5f16dfab..5f16dfab 100644
--- a/files/qbsp/base_package.xml
+++ b/meta-boot2qt/files/qbsp/base_package.xml
diff --git a/files/qbsp/image_package.xml b/meta-boot2qt/files/qbsp/image_package.xml
index 27e5f2e5..27e5f2e5 100644
--- a/files/qbsp/image_package.xml
+++ b/meta-boot2qt/files/qbsp/image_package.xml
diff --git a/files/qbsp/license_package.xml b/meta-boot2qt/files/qbsp/license_package.xml
index 405ee5c0..405ee5c0 100644
--- a/files/qbsp/license_package.xml
+++ b/meta-boot2qt/files/qbsp/license_package.xml
diff --git a/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 4afab71f..4afab71f 100644
--- a/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
diff --git a/files/qbsp/toolchain_package.xml b/meta-boot2qt/files/qbsp/toolchain_package.xml
index 166e09b9..166e09b9 100644
--- a/files/qbsp/toolchain_package.xml
+++ b/meta-boot2qt/files/qbsp/toolchain_package.xml
diff --git a/licenses/The-Qt-Company-DCLA-2.1 b/meta-boot2qt/licenses/The-Qt-Company-DCLA-2.1
index 5231cb1d..5231cb1d 100644
--- a/licenses/The-Qt-Company-DCLA-2.1
+++ b/meta-boot2qt/licenses/The-Qt-Company-DCLA-2.1
diff --git a/recipes/initramfs-basic/files/init.sh b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
index 3db235b9..3db235b9 100644
--- a/recipes/initramfs-basic/files/init.sh
+++ b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
diff --git a/recipes/initramfs-basic/init-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
index 25039e7b..25039e7b 100644
--- a/recipes/initramfs-basic/init-basic.bb
+++ b/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
diff --git a/recipes/initramfs-basic/initramfs-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
index 31388d35..31388d35 100644
--- a/recipes/initramfs-basic/initramfs-basic.bb
+++ b/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
diff --git a/recipes/ostree/ostree.bb b/meta-boot2qt/recipes-core/ostree/ostree.bb
index e4c80760..e4c80760 100644
--- a/recipes/ostree/ostree.bb
+++ b/meta-boot2qt/recipes-core/ostree/ostree.bb
diff --git a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch b/meta-boot2qt/recipes-core/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
index d416543a..d416543a 100644
--- a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
diff --git a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch b/meta-boot2qt/recipes-core/ostree/ostree/Create-firmware-convenience-symlinks.patch
index 656887dd..656887dd 100644
--- a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Create-firmware-convenience-symlinks.patch
diff --git a/recipes/ostree/ostree/Mount-boot-partition.patch b/meta-boot2qt/recipes-core/ostree/ostree/Mount-boot-partition.patch
index a81f7314..a81f7314 100644
--- a/recipes/ostree/ostree/Mount-boot-partition.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Mount-boot-partition.patch
diff --git a/recipes/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch b/meta-boot2qt/recipes-core/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
index f8e73241..f8e73241 100644
--- a/recipes/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
diff --git a/recipes/ostree/ostree/Support-for-booting-without-initramfs.patch b/meta-boot2qt/recipes-core/ostree/ostree/Support-for-booting-without-initramfs.patch
index 4ec137fd..4ec137fd 100644
--- a/recipes/ostree/ostree/Support-for-booting-without-initramfs.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Support-for-booting-without-initramfs.patch
diff --git a/recipes/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch b/meta-boot2qt/recipes-core/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
index ece69b8a..ece69b8a 100644
--- a/recipes/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
diff --git a/recipes/ostree/ostree/deploy-add-karg-none-argument.patch b/meta-boot2qt/recipes-core/ostree/ostree/deploy-add-karg-none-argument.patch
index 5eaf68f0..5eaf68f0 100644
--- a/recipes/ostree/ostree/deploy-add-karg-none-argument.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/deploy-add-karg-none-argument.patch
diff --git a/recipes/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch b/meta-boot2qt/recipes-core/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
index 28006185..28006185 100644
--- a/recipes/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
diff --git a/recipes/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch b/meta-boot2qt/recipes-core/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
index e8c8f161..e8c8f161 100644
--- a/recipes/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
diff --git a/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch b/meta-boot2qt/recipes-core/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
index 5f19007f..5f19007f 100644
--- a/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
+++ b/meta-boot2qt/recipes-core/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
diff --git a/recipes/python/nativesdk-prebuild-python.inc b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc
index 3d8c083f..3d8c083f 100644
--- a/recipes/python/nativesdk-prebuild-python.inc
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python.inc
diff --git a/recipes/python/nativesdk-prebuild-python_i686.bb b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.bb
index 2ff4f761..2ff4f761 100644
--- a/recipes/python/nativesdk-prebuild-python_i686.bb
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_i686.bb
diff --git a/recipes/python/nativesdk-prebuild-python_x86_64.bb b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb
index 8e69fbd7..8e69fbd7 100644
--- a/recipes/python/nativesdk-prebuild-python_x86_64.bb
+++ b/meta-boot2qt/recipes-devtools/python/nativesdk-prebuild-python_x86_64.bb
diff --git a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.service b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.service
index 7c7211f6..7c7211f6 100644
--- a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.service
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.service
diff --git a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.sh b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.sh
index 80476de4..80476de4 100755
--- a/recipes/virtualbox/mount-vboxsf/mount-vboxsf.sh
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf/mount-vboxsf.sh
diff --git a/recipes/virtualbox/mount-vboxsf_4.3.30.bb b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb
index 1eb2652f..1eb2652f 100644
--- a/recipes/virtualbox/mount-vboxsf_4.3.30.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb
diff --git a/recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.bb
index 752d8cb0..752d8cb0 100644
--- a/recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.bb
diff --git a/recipes/fonts/otf-noto_git.bb b/meta-boot2qt/recipes-graphics/fonts/otf-noto_git.bb
index 093ee338..093ee338 100644
--- a/recipes/fonts/otf-noto_git.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/otf-noto_git.bb
diff --git a/recipes/fonts/ttf-devanagari_2.94.0.bb b/meta-boot2qt/recipes-graphics/fonts/ttf-devanagari_2.94.0.bb
index ee0ea06c..ee0ea06c 100644
--- a/recipes/fonts/ttf-devanagari_2.94.0.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/ttf-devanagari_2.94.0.bb
diff --git a/recipes/fonts/ttf-freefont_20120503.bb b/meta-boot2qt/recipes-graphics/fonts/ttf-freefont_20120503.bb
index abf95627..abf95627 100644
--- a/recipes/fonts/ttf-freefont_20120503.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/ttf-freefont_20120503.bb
diff --git a/recipes/fonts/ttf-opensans.bb b/meta-boot2qt/recipes-graphics/fonts/ttf-opensans.bb
index 1d581acc..1d581acc 100644
--- a/recipes/fonts/ttf-opensans.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/ttf-opensans.bb
diff --git a/recipes/hunspell/hunspell-dicts.bb b/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts.bb
index 92fd300a..92fd300a 100644
--- a/recipes/hunspell/hunspell-dicts.bb
+++ b/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts.bb
diff --git a/recipes/opengldummy/files/egl.cpp b/meta-boot2qt/recipes-graphics/opengldummy/files/egl.cpp
index 7c28b41a..7c28b41a 100644
--- a/recipes/opengldummy/files/egl.cpp
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/egl.cpp
diff --git a/recipes/opengldummy/files/gles2.cpp b/meta-boot2qt/recipes-graphics/opengldummy/files/gles2.cpp
index 3f632a3e..3f632a3e 100644
--- a/recipes/opengldummy/files/gles2.cpp
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/gles2.cpp
diff --git a/recipes/opengldummy/files/headers/EGL/egl.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/egl.h
index 99ea342a..99ea342a 100644
--- a/recipes/opengldummy/files/headers/EGL/egl.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/egl.h
diff --git a/recipes/opengldummy/files/headers/EGL/eglext.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglext.h
index a392b31d..a392b31d 100644
--- a/recipes/opengldummy/files/headers/EGL/eglext.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglext.h
diff --git a/recipes/opengldummy/files/headers/EGL/eglplatform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglplatform.h
index 572c7d5a..572c7d5a 100644
--- a/recipes/opengldummy/files/headers/EGL/eglplatform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/EGL/eglplatform.h
diff --git a/recipes/opengldummy/files/headers/GLES2/gl2.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2.h
index f6bed7d1..f6bed7d1 100644
--- a/recipes/opengldummy/files/headers/GLES2/gl2.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2.h
diff --git a/recipes/opengldummy/files/headers/GLES2/gl2ext.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2ext.h
index 36801bee..36801bee 100644
--- a/recipes/opengldummy/files/headers/GLES2/gl2ext.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2ext.h
diff --git a/recipes/opengldummy/files/headers/GLES2/gl2platform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2platform.h
index 89d4d44d..89d4d44d 100644
--- a/recipes/opengldummy/files/headers/GLES2/gl2platform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES2/gl2platform.h
diff --git a/recipes/opengldummy/files/headers/GLES3/gl3.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3.h
index 81b63bd0..81b63bd0 100644
--- a/recipes/opengldummy/files/headers/GLES3/gl3.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3.h
diff --git a/recipes/opengldummy/files/headers/GLES3/gl31.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl31.h
index 6fe473d8..6fe473d8 100644
--- a/recipes/opengldummy/files/headers/GLES3/gl31.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl31.h
diff --git a/recipes/opengldummy/files/headers/GLES3/gl3platform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3platform.h
index b1e869dd..b1e869dd 100644
--- a/recipes/opengldummy/files/headers/GLES3/gl3platform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/GLES3/gl3platform.h
diff --git a/recipes/opengldummy/files/headers/KHR/khrplatform.h b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/KHR/khrplatform.h
index d976ab54..d976ab54 100644
--- a/recipes/opengldummy/files/headers/KHR/khrplatform.h
+++ b/meta-boot2qt/recipes-graphics/opengldummy/files/headers/KHR/khrplatform.h
diff --git a/recipes/opengldummy/opengldummy.bb b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.bb
index 3f68b177..3f68b177 100644
--- a/recipes/opengldummy/opengldummy.bb
+++ b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.bb
diff --git a/recipes/opengldummy/opengldummy.inc b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.inc
index 720b310c..720b310c 100644
--- a/recipes/opengldummy/opengldummy.inc
+++ b/meta-boot2qt/recipes-graphics/opengldummy/opengldummy.inc
diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/meta-boot2qt/recipes-graphics/opengldummy/qtglesstream-dummy-client.bb
index 1d4e2237..1d4e2237 100644
--- a/recipes/opengldummy/qtglesstream-dummy-client.bb
+++ b/meta-boot2qt/recipes-graphics/opengldummy/qtglesstream-dummy-client.bb
diff --git a/recipes-qt/automotive/gammaray_git.bb b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
index 7466822d..7466822d 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
diff --git a/recipes-qt/automotive/multiscreen-demo/automotivedemo.service b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
index af232136..af232136 100644
--- a/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
+++ b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/automotivedemo.service
diff --git a/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
index 1025cc17..1025cc17 100644
--- a/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
+++ b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo/tegra-t18x/automotivedemo.service
diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo_git.bb
index c81adeed..c81adeed 100644
--- a/recipes-qt/automotive/multiscreen-demo_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/multiscreen-demo_git.bb
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/meta-boot2qt/recipes-qt/automotive/neptune-ui/neptune.service
index 16b6a1f0..16b6a1f0 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/meta-boot2qt/recipes-qt/automotive/neptune-ui/neptune.service
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune-ui_git.bb
index 58984249..58984249 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune-ui_git.bb
diff --git a/recipes-qt/automotive/qmllive-target/qmllive-target.patch b/meta-boot2qt/recipes-qt/automotive/qmllive-target/qmllive-target.patch
index e3f81fac..e3f81fac 100644
--- a/recipes-qt/automotive/qmllive-target/qmllive-target.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive-target/qmllive-target.patch
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive-target_git.bb
index 54f11887..54f11887 100644
--- a/recipes-qt/automotive/qmllive-target_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive-target_git.bb
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index ae66e8a8..ae66e8a8 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
diff --git a/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
index 9f6c0c02..9f6c0c02 100644
--- a/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
diff --git a/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index 5cbf1316..5cbf1316 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb
index 9cc0d37b..9cc0d37b 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index 9c526068..9c526068 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
index 1ef37328..1ef37328 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
index 4fa19318..4fa19318 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
index 2bc6ecab..2bc6ecab 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
index 4e3415f5..4e3415f5 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
index b27315e7..b27315e7 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
index 09153436..09153436 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
index 21bb44cd..21bb44cd 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf
index 37284def..37284def 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-demos.bb
index 3726482f..3726482f 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-demos.bb
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 225079dc..225079dc 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher.bb
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
index 89e4bbb8..89e4bbb8 100755
--- a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service
index f941f91b..f941f91b 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service
index cdf6480e..cdf6480e 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service
index 10946756..10946756 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service
index 65fba924..65fba924 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service
index 2b02c87c..2b02c87c 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service
index 7658ca86..7658ca86 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/meta-boot2qt/recipes-qt/b2qt-addons/democompositor_git.bb
index 3d9a196e..3d9a196e 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/democompositor_git.bb
diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd.bb
index 8057e19f..8057e19f 100644
--- a/recipes-qt/b2qt-addons/qdbd.bb
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd.bb
diff --git a/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh
index 3161db70..3161db70 100755
--- a/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh
diff --git a/recipes-qt/b2qt-addons/qdbd/defaults b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/defaults
index 5ced90d9..5ced90d9 100644
--- a/recipes-qt/b2qt-addons/qdbd/defaults
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/defaults
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
index 15981b06..15981b06 100755
--- a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd.service b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd.service
index be8e701c..be8e701c 100644
--- a/recipes-qt/b2qt-addons/qdbd/qdbd.service
+++ b/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd.service
diff --git a/recipes-qt/qt5-addons/installer-framework-native_3.0.1.bb b/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb
index 5bc09c03..5bc09c03 100644
--- a/recipes-qt/qt5-addons/installer-framework-native_3.0.1.bb
+++ b/meta-boot2qt/recipes-qt/qt5/installer-framework-native_3.0.1.bb
diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities.bb
index 7405424d..7405424d 100644
--- a/recipes-qt/qt5/qtdeviceutilities.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities.bb
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/meta-boot2qt/recipes-qt/qt5/qtglesstream.bb
index 0f942e7c..0f942e7c 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtglesstream.bb
diff --git a/recipes-qt/qt5/qtotaupdate.bb b/meta-boot2qt/recipes-qt/qt5/qtotaupdate.bb
index 495598a4..495598a4 100644
--- a/recipes-qt/qt5/qtotaupdate.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtotaupdate.bb
diff --git a/recipes-qt/qt5-addons/qtsimulator/custom.target b/meta-boot2qt/recipes-qt/qt5/qtsimulator/custom.target
index 05b22684..05b22684 100644
--- a/recipes-qt/qt5-addons/qtsimulator/custom.target
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/custom.target
diff --git a/recipes-qt/qt5-addons/qtsimulator/emulator b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator
index aa4a7187..aa4a7187 100644
--- a/recipes-qt/qt5-addons/qtsimulator/emulator
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator
diff --git a/recipes-qt/qt5-addons/qtsimulator/emulator-hostname.sh b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator-hostname.sh
index c1a6954b..c1a6954b 100644
--- a/recipes-qt/qt5-addons/qtsimulator/emulator-hostname.sh
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulator-hostname.sh
diff --git a/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxy.service
index baf02960..baf02960 100644
--- a/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxy.service
diff --git a/recipes-qt/qt5-addons/qtsimulator/emulatorproxyd.sh b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxyd.sh
index d73f1e74..d73f1e74 100755
--- a/recipes-qt/qt5-addons/qtsimulator/emulatorproxyd.sh
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator/emulatorproxyd.sh
diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/meta-boot2qt/recipes-qt/qt5/qtsimulator_1.0.bb
index c4c8d216..c4c8d216 100644
--- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtsimulator_1.0.bb
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 1fa2014a..f948ba0a 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -96,14 +96,14 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   esac
 
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
-  cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
+  cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
   if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
     QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi
 
-export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
+export TEMPLATECONF="${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf"
 . sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 
 # use sources from Qt SDK if that is available