bblayer.conf syntax changed

Change-Id: I39f87fc49e1a9c1b4f5498fbaf8acfd044b0aeb8
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/conf/bblayers.conf.intel.sample b/conf/bblayers.conf.intel.sample
index c03ad50..e6094d6 100644
--- a/conf/bblayers.conf.intel.sample
+++ b/conf/bblayers.conf.intel.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
 
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
   ${BSPDIR}/sources/meta-intel \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
@@ -49,7 +49,3 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "