X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=templates%2Fbase%2Fbblayers.conf.sample;h=350ae9131ca6fcfcf3709409d1ca4d7293aeccc5;hb=91196d832c0848f094d5472a91f3988c67d793a6;hp=d86954698384970c679276638b476dad889fc2bc;hpb=5757de20d2e23f99c659c888e3f32105369c4899;p=AGL%2Fmeta-agl.git

diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index d86954698..350ae9131 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -8,50 +8,64 @@ BBFILES ?= ""
 # Convenience variables usable in various configuration fragments
 #----------------------------------
 BCONFDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)))}"
-METADIR  := "${@os.path.abspath('##OEROOT##/..')}"
+METADIR  := "${@os.path.abspath('##OEROOT##/../..')}"
 
 # These are the core OE + YP Layers
 #----------------------------------
 YOCTO_LAYERS = " \
-  ${METADIR}/poky/meta \
-  ${METADIR}/poky/meta-poky \
+  ${METADIR}/external/poky/meta \
+  ${METADIR}/external/poky/meta-poky \
   "
 #  this is added for the boards where necessary, not globally
-#  ${METADIR}/poky/meta-yocto-bsp \
+#  ${METADIR}/external/poky/meta-yocto-bsp \
 #
 # These are the AGL CORE Layers that make up the basis
 # - they create a minimal bootable filesystem
 #   with some automotive tools/libraries
 #-----------------------------------------------------
 AGL_CORE_LAYERS = " \
-  ${METADIR}/meta-agl/meta-ivi-common \
-  ${METADIR}/meta-agl/meta-agl \
-  ${METADIR}/meta-agl/meta-agl-distro \
+  ${METADIR}/meta-agl/meta-agl-core \
   ${METADIR}/meta-agl/meta-agl-bsp \
   "
 
 # These are the direct dependencies of the AGL CORE Layers
 #---------------------------------------------------------
 AGL_CORE_DEPENDENCY_LAYERS = " \
-  ${METADIR}/meta-openembedded/meta-oe \
-  ${METADIR}/meta-openembedded/meta-multimedia \
-  ${METADIR}/meta-openembedded/meta-networking \
-  ${METADIR}/meta-openembedded/meta-python \
-  ${METADIR}/meta-openembedded/meta-filesystems \
+  ${METADIR}/external/meta-openembedded/meta-oe \
   "
 
+# 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_OTHER_DEPENDENCY_LAYERS = " \
+    ${AGL_META_NETWORKING} \
+    ${AGL_META_PYTHON} \
+    ${AGL_META_FILESYSTEMS} \
+    ${AGL_META_MULTIMEDIA} \
+    ${AGL_META_VIRTUALIZATION} \
+    ${AGL_META_CLANG} \
+    "
+
 ####################
 # Combine the layers
 BBLAYERS ?= " \
+  ${AGL_OTHER_DEPENDENCY_LAYERS} \
   ${AGL_CORE_DEPENDENCY_LAYERS} \
   ${AGL_CORE_LAYERS} \
   ${YOCTO_LAYERS} \
   "
 
 BBLAYERS_NON_REMOVABLE ?= " \
-  ${METADIR}/poky/meta \
-  ${METADIR}/poky/meta-poky \
-  ${METADIR}//meta-agl/meta-agl \
+  ${METADIR}/external/poky/meta \
+  ${METADIR}/external/poky/meta-poky \
+  ${METADIR}/meta-agl/meta-agl-core \
   "
 
 
+