Resolve multiple conflicts of NXP layers with usrmerge

Signed-off-by: Eugene Smirnov <evgenii.smirnov@here.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 035a46b..44db931 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -21,3 +21,14 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   aktualizr-shared-prov-creds->aktualizr \
   aktualizr-uboot-env-rollback->aktualizr \
 "
+
+BBFILES_DYNAMIC += " \
+    virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bb \
+    virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bbappend \
+    \
+    freescale-layer:${LAYERDIR}/dynamic-layers/freescale-layer/*/*/*.bb \
+    freescale-layer:${LAYERDIR}/dynamic-layers/freescale-layer/*/*/*.bbappend \
+    \
+    qoriq-demos:${LAYERDIR}/dynamic-layers/qoriq-demos/*/*/*.bb \
+    qoriq-demos:${LAYERDIR}/dynamic-layers/qoriq-demos/*/*/*.bbappend \
+"