X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=templates%2Fbase%2Fbblayers.conf.sample;h=0dd28da0353d0b6fc8edbae9fad6d7175b61c5b5;hb=1c3c06842ac1b9c089d0a08e91c60f44e4844fac;hp=d86954698384970c679276638b476dad889fc2bc;hpb=e33131d0f4e3f4cbc35f2727802acc486e1b0f95;p=AGL%2Fmeta-agl.git

diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index d86954698..0dd28da03 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -8,36 +8,31 @@ 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-core-test \
   ${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 \
   "
 
 ####################
@@ -49,9 +44,10 @@ BBLAYERS ?= " \
   "
 
 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 \
   "
 
 
+