1 files changed, 24 insertions, 17 deletions
diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index 653f6dbe8..e3c5fcc65 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -15,6 +15,7 @@ METADIR  := "${@os.path.abspath('##OEROOT##/../..')}"
 YOCTO_LAYERS = " \
   ${METADIR}/external/poky/meta \
   ${METADIR}/external/poky/meta-poky \
+  ${METADIR}/external/meta-lts-mixins_rust \
   "
 #  this is added for the boards where necessary, not globally
 #  ${METADIR}/external/poky/meta-yocto-bsp \
@@ -24,43 +25,49 @@ YOCTO_LAYERS = " \
 #   with some automotive tools/libraries
 #-----------------------------------------------------
 AGL_CORE_LAYERS = " \
-  ${METADIR}/meta-agl/meta-agl-profile-core \
-  ${METADIR}/meta-agl/meta-agl-distro \
+  ${METADIR}/meta-agl/meta-agl-core \
   ${METADIR}/meta-agl/meta-agl-bsp \
   "
 
-AGL_APPFW_LAYERS = " \
-  ${METADIR}/external/meta-security \
-  ${METADIR}/external/meta-openembedded/meta-perl \
-  ${METADIR}/meta-agl/meta-security \
-  ${METADIR}/meta-agl/meta-app-framework \
-    "
-
-
 # These are the direct dependencies of the AGL CORE Layers
 #---------------------------------------------------------
 AGL_CORE_DEPENDENCY_LAYERS = " \
   ${METADIR}/external/meta-openembedded/meta-oe \
-  ${METADIR}/external/meta-openembedded/meta-multimedia \
-  ${METADIR}/external/meta-openembedded/meta-networking \
-  ${METADIR}/external/meta-openembedded/meta-python \
-  ${METADIR}/external/meta-openembedded/meta-filesystems \
   "
 
+# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
+# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base
+AGL_META_NETWORKING ?= ""
+AGL_META_PYTHON ?= ""
+AGL_META_FILESYSTEMS ?= ""
+AGL_META_MULTIMEDIA ?= ""
+AGL_META_VIRTUALIZATION ?= ""
+AGL_META_CLANG ?= ""
+AGL_META_QT5 ?= ""
+
+AGL_OTHER_DEPENDENCY_LAYERS = " \
+    ${AGL_META_NETWORKING} \
+    ${AGL_META_PYTHON} \
+    ${AGL_META_FILESYSTEMS} \
+    ${AGL_META_MULTIMEDIA} \
+    ${AGL_META_VIRTUALIZATION} \
+    ${AGL_META_CLANG} \
+    ${AGL_META_QT5} \
+    "
+
 ####################
 # Combine the layers
 BBLAYERS ?= " \
+  ${AGL_OTHER_DEPENDENCY_LAYERS} \
   ${AGL_CORE_DEPENDENCY_LAYERS} \
   ${AGL_CORE_LAYERS} \
-  ${AGL_APPFW_LAYERS} \
   ${YOCTO_LAYERS} \
   "
 
 BBLAYERS_NON_REMOVABLE ?= " \
   ${METADIR}/external/poky/meta \
   ${METADIR}/external/poky/meta-poky \
-  ${METADIR}/meta-agl/meta-agl-profile-core \
-  ${METADIR}/meta-agl/meta-agl-distro \
+  ${METADIR}/meta-agl/meta-agl-core \
   "