Merge "feature/agl-ci-*: include agl-pipewire instead of agl-audio-4a-framework"

[AGL/meta-agl.git] / templates / base / bblayers.conf.sample

diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index d869546..653f6db 100644 (file)
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -8,36 +8,43 @@ 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-profile-core \
   ${METADIR}/meta-agl/meta-agl-distro \
   ${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}/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 \
   "
 
 ####################
@@ -45,13 +52,16 @@ AGL_CORE_DEPENDENCY_LAYERS = " \
 BBLAYERS ?= " \
   ${AGL_CORE_DEPENDENCY_LAYERS} \
   ${AGL_CORE_LAYERS} \
+  ${AGL_APPFW_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-profile-core \
+  ${METADIR}/meta-agl/meta-agl-distro \
   "
 
 
+