From: Denys Dmytriyenko <[email protected]>
There have been dependencies on meta-python and meta-oe from optee recipes in
meta-arm, but those got moved to oe-core some time ago and the corresponding
layers are no longer needed.
Also, meta-arm gained extra dependency by trusted-firmware-m for baremetal
toolchain from meta-arm-toolchain, so add that layer too.
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
configs/distroless-master-config.txt | 3 +--
configs/poky-master-config.txt | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/distroless-master-config.txt
b/configs/distroless-master-config.txt
index 0c26f7a..c8c400c 100644
--- a/configs/distroless-master-config.txt
+++ b/configs/distroless-master-config.txt
@@ -1,9 +1,8 @@
# This file takes repo entries in the format
# repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
bitbake,git://git.openembedded.org/bitbake,master,HEAD
-meta-openembedded,git://git.openembedded.org/meta-openembedded,dunfell,HEAD,layers=meta-python:meta-oe
meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
-meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm
+meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
OECORELAYERCONF=./sample-files/bblayers.conf.sample
OECORELOCALCONF=./sample-files/local.conf.sample
diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
index 1298a05..1dc261f 100644
--- a/configs/poky-master-config.txt
+++ b/configs/poky-master-config.txt
@@ -2,8 +2,7 @@
# repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
bitbake,git://git.openembedded.org/bitbake,master,HEAD
poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yocto-bsp
-meta-openembedded,git://git.openembedded.org/meta-openembedded,dunfell,HEAD,layers=meta-python:meta-oe
meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
-meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm
+meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
OECORELAYERCONF=./sample-files/bblayers.conf.sample
OECORELOCALCONF=./sample-files/local-poky.conf.sample
