1 files changed, 25 insertions, 9 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 2f8e47d84..52d4acb78 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -25,12 +25,28 @@ ${IMX_MIRROR}   http://download.ossystems.com.br/bsp/freescale/source/ \n \
 ${QORIQ_MIRROR} http://download.ossystems.com.br/bsp/freescale/source/ \n \
 "
 
-# The dynamic-layers directory hosts the extensions and layer specific
-# modifications related to Freescale products.
-#
-# The .bbappend and .bb files are included if the respective layer
-# collection is available.
-BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % layer \
-               for layer in BBFILE_COLLECTIONS.split())}"
-BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \
-               for layer in BBFILE_COLLECTIONS.split())}"
+BBFILES_DYNAMIC += " \
+    browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*/*.bb \
+    browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*/*.bbappend \
+    \
+    efl-layer:${LAYERDIR}/dynamic-layers/efl-layer/*/*/*.bb \
+    efl-layer:${LAYERDIR}/dynamic-layers/efl-layer/*/*/*.bbappend \
+    \
+    filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bb \
+    filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bbappend \
+    \
+    networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
+    networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
+    \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
+    \
+    qt4-layer:${LAYERDIR}/dynamic-layers/qt4-layer/*/*/*.bb \
+    qt4-layer:${LAYERDIR}/dynamic-layers/qt4-layer/*/*/*.bbappend \
+    \
+    qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \
+    qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \
+    \
+    virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bb \
+    virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bbappend \
+"