From 4d96d82f42e51414f936345e2fe861149888000f Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Mon, 1 Mar 2021 12:34:02 +0100
Subject: [PATCH] flavours: unify and symlink bblayers between different
flavours
Our bblayers file diverged between the different flavours and e.g. the
meta-ohos-foundation was still present for zephyr and freertos.
We enable all layers on all flavours. The only overhead should be in
parsing the recipes. If something else breaks we consider this a bug
worth fixing.
The usage of symlinks should be safe here. Yocto buildhost will almost
always be Linux based, but it this should even work on Windows by now.
If we run into trouble with this we can always got back to three files.
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
flavours/freertos/bblayers.conf.sample | 15 +--------------
flavours/linux/bblayers.conf.sample | 2 ++
flavours/zephyr/bblayers.conf.sample | 16 +---------------
3 files changed, 4 insertions(+), 29 deletions(-)
mode change 100644 => 120000 flavours/freertos/bblayers.conf.sample
mode change 100644 => 120000 flavours/zephyr/bblayers.conf.sample
diff --git a/flavours/freertos/bblayers.conf.sample b/flavours/freertos/bblayers.conf.sample
deleted file mode 100644
index 6688bf72..00000000
--- a/flavours/freertos/bblayers.conf.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
- ##OEROOT##/meta \
- ##OEROOT##/meta-poky \
- ##OEROOT##/meta-yocto-bsp \
- ##OEROOT##/../meta-freertos \
- ##OEROOT##/../meta-ohos/meta-ohos-foundation \
- "
diff --git a/flavours/freertos/bblayers.conf.sample b/flavours/freertos/bblayers.conf.sample
new file mode 120000
index 00000000..d59afbf8
--- /dev/null
+++ b/flavours/freertos/bblayers.conf.sample
@@ -0,0 +1 @@
+../linux/bblayers.conf.sample
\ No newline at end of file
diff --git a/flavours/linux/bblayers.conf.sample b/flavours/linux/bblayers.conf.sample
index 64033fb5..2c7ff8d0 100644
--- a/flavours/linux/bblayers.conf.sample
+++ b/flavours/linux/bblayers.conf.sample
@@ -9,6 +9,8 @@ BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
##OEROOT##/meta-yocto-bsp \
+ ##OEROOT##/../meta-freertos \
+ ##OEROOT##/../meta-zephyr \
##OEROOT##/../meta-ohos/meta-ohos-core \
##OEROOT##/../meta-ohos/meta-ohos-acts \
##OEROOT##/../meta-intel \
diff --git a/flavours/zephyr/bblayers.conf.sample b/flavours/zephyr/bblayers.conf.sample
deleted file mode 100644
index 5b5f14f2..00000000
--- a/flavours/zephyr/bblayers.conf.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
- ##OEROOT##/meta \
- ##OEROOT##/../meta-openembedded/meta-oe \
- ##OEROOT##/../meta-openembedded/meta-python \
- ##OEROOT##/../meta-zephyr \
- ##OEROOT##/../meta-ohos/meta-ohos-core \
- ##OEROOT##/../meta-ohos/meta-ohos-foundation \
- "
diff --git a/flavours/zephyr/bblayers.conf.sample b/flavours/zephyr/bblayers.conf.sample
new file mode 120000
index 00000000..d59afbf8
--- /dev/null
+++ b/flavours/zephyr/bblayers.conf.sample
@@ -0,0 +1 @@
+../linux/bblayers.conf.sample
\ No newline at end of file
--
GitLab