1 files changed, 5 insertions, 9 deletions

diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample
index f19b1ea..27f28ae 100644
--- a/conf/bblayers.conf.rcar-gen2.sample
+++ b/conf/bblayers.conf.rcar-gen2.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,12 +37,12 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-renesas \
+  ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
   ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
   ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
   ${BSPDIR}/sources/meta-fsl-arm \
-  ${BSPDIR}/sources/meta-renesas \
-  ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
@@ -51,7 +51,3 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-qt5 \
   ${BSPDIR}/sources/meta-mingw \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "