From a3699c61b3b6d1fbbc234da233d52749bf567e16 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Mon, 24 Jan 2022 16:49:15 +0100
Subject: [PATCH] bblayers.conf.sample: Update for master/kirkstone update

On post dunfell versions, the mixin layers are not needed anymore. Also,
the linaro optee layer is deprecated and the zephyr one was restructured
to include meta-zephyr-bsp.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
 flavours/linux/bblayers.conf.sample | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/flavours/linux/bblayers.conf.sample b/flavours/linux/bblayers.conf.sample
index 48fdbf0d..ecb8e161 100644
--- a/flavours/linux/bblayers.conf.sample
+++ b/flavours/linux/bblayers.conf.sample
@@ -13,10 +13,9 @@ BBLAYERS ?= " \
   ##OEROOT##/../oniro/meta-oniro-staging \
   ##OEROOT##/meta \
   ##OEROOT##/../meta-clang \
-  ##OEROOT##/../meta-zephyr \
-  ##OEROOT##/../meta-zephyr-bsp \
+  ##OEROOT##/../meta-zephyr/meta-zephyr-bsp \
+  ##OEROOT##/../meta-zephyr/meta-zephyr-core \
   ##OEROOT##/../oniro/meta-oniro-core \
-  ##OEROOT##/../meta-arm-mixin/meta-arm \
   ##OEROOT##/../meta-freertos \
   ##OEROOT##/../meta-intel \
   ##OEROOT##/../meta-seco-intel \
@@ -26,10 +25,8 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-openembedded/meta-networking \
   ##OEROOT##/../meta-openembedded/meta-perl \
   ##OEROOT##/../meta-openembedded/meta-python \
-  ##OEROOT##/../meta-python-mixin \
   ##OEROOT##/../meta-raspberrypi \
   ##OEROOT##/../meta-security \
-  ##OEROOT##/../meta-linaro/meta-optee \
   ##OEROOT##/../meta-riscv \
   ##OEROOT##/../meta-rauc \
   "
-- 
GitLab