From f31def71fdfcb013717768a18a632fad82717321 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 6 Sep 2021 09:33:42 +0200
Subject: [PATCH] meta-st-stm32mp: Move .bbappend files to dynamic-layers
This allows use of meta-ohos-staging without meta-st-stm32mp layer, without
changing behaviour when used together with meta-st-stm32mp.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
meta-ohos-staging/conf/layer.conf | 6 ++++++
.../recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend | 0
.../recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend | 0
3 files changed, 6 insertions(+)
rename meta-ohos-staging/{ => dynamic-layers/meta-st-stm32mp}/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend (100%)
rename meta-ohos-staging/{ => dynamic-layers/meta-st-stm32mp}/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend (100%)
diff --git a/meta-ohos-staging/conf/layer.conf b/meta-ohos-staging/conf/layer.conf
index eac42889..010a1d54 100644
--- a/meta-ohos-staging/conf/layer.conf
+++ b/meta-ohos-staging/conf/layer.conf
@@ -9,6 +9,12 @@ BBPATH .= ":${LAYERDIR}"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
+# We have .bbappend files to recipes in layers that we want to have as optional
+BBFILES_DYNAMIC += "\
+ stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bb \
+ stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bbappend \
+"
+
BBFILE_COLLECTIONS += "meta-ohos-staging"
BBFILE_PATTERN_meta-ohos-staging = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-ohos-staging = "5"
diff --git a/meta-ohos-staging/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend b/meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend
similarity index 100%
rename from meta-ohos-staging/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend
rename to meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bbappend
diff --git a/meta-ohos-staging/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend b/meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend
similarity index 100%
rename from meta-ohos-staging/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend
rename to meta-ohos-staging/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.12.0.bbappend
--
GitLab