X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=templates%2Fbase%2Fbblayers.conf.sample;h=653f6dbe89f8dd5a59cbeccc0d4018319a178d88;hb=40bdea4f047cc82a085a3dceff3d893582c0b206;hp=0c3114f8c6807dd211981339e513a22c18599e16;hpb=bb0882c5dad030f676e424265ebcd869bb3ff899;p=AGL%2Fmeta-agl.git

diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index 0c3114f8c..653f6dbe8 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -8,16 +8,16 @@ 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
@@ -30,8 +30,8 @@ AGL_CORE_LAYERS = " \
   "
 
 AGL_APPFW_LAYERS = " \
-  ${METADIR}/meta-security \
-  ${METADIR}/meta-openembedded/meta-perl \
+  ${METADIR}/external/meta-security \
+  ${METADIR}/external/meta-openembedded/meta-perl \
   ${METADIR}/meta-agl/meta-security \
   ${METADIR}/meta-agl/meta-app-framework \
     "
@@ -40,33 +40,25 @@ AGL_APPFW_LAYERS = " \
 # 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 \
+  ${METADIR}/external/meta-openembedded/meta-multimedia \
+  ${METADIR}/external/meta-openembedded/meta-networking \
+  ${METADIR}/external/meta-openembedded/meta-python \
+  ${METADIR}/external/meta-openembedded/meta-filesystems \
   "
 
-# temporary ... to avoid build breakage. To move to upper layers.
-AGL_TEMP_GFX_LAYERS = " \
-  ${METADIR}/meta-agl/meta-agl-profile-graphical \
-  ${METADIR}/meta-agl/meta-agl-profile-demo \
-  "
-
-
 ####################
 # Combine the layers
 BBLAYERS ?= " \
   ${AGL_CORE_DEPENDENCY_LAYERS} \
   ${AGL_CORE_LAYERS} \
   ${AGL_APPFW_LAYERS} \
-  ${AGL_TEMP_GFX_LAYERS} \
   ${YOCTO_LAYERS} \
   "
 
 BBLAYERS_NON_REMOVABLE ?= " \
-  ${METADIR}/poky/meta \
-  ${METADIR}/poky/meta-poky \
+  ${METADIR}/external/poky/meta \
+  ${METADIR}/external/poky/meta-poky \
   ${METADIR}/meta-agl/meta-agl-profile-core \
   ${METADIR}/meta-agl/meta-agl-distro \
   "