From 998c52fbddd40e25d41d172ccd290c211f4d58d8 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 6 Sep 2021 09:33:56 +0200
Subject: [PATCH] meta-intel: Move .bbappend file to dynamic-layers
This allows use of meta-ohos-staging without meta-intel layer, without
changing behaviour when used together with meta-intel.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
meta-ohos-staging/conf/layer.conf | 2 ++
.../meta-intel}/recipes-kernel/linux/linux-intel_5.10.bbappend | 0
.../meta-intel}/recipes-kernel/linux/linux/misc.cfg | 0
3 files changed, 2 insertions(+)
rename meta-ohos-staging/{ => dynamic-layers/meta-intel}/recipes-kernel/linux/linux-intel_5.10.bbappend (100%)
rename meta-ohos-staging/{ => dynamic-layers/meta-intel}/recipes-kernel/linux/linux/misc.cfg (100%)
diff --git a/meta-ohos-staging/conf/layer.conf b/meta-ohos-staging/conf/layer.conf
index 010a1d54..44b166a0 100644
--- a/meta-ohos-staging/conf/layer.conf
+++ b/meta-ohos-staging/conf/layer.conf
@@ -13,6 +13,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
BBFILES_DYNAMIC += "\
stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bb \
stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bbappend \
+ intel:${LAYERDIR}/dynamic-layers/meta-intel/recipes-*/*/*.bb \
+ intel:${LAYERDIR}/dynamic-layers/meta-intel/recipes-*/*/*.bbappend \
"
BBFILE_COLLECTIONS += "meta-ohos-staging"
diff --git a/meta-ohos-staging/recipes-kernel/linux/linux-intel_5.10.bbappend b/meta-ohos-staging/dynamic-layers/meta-intel/recipes-kernel/linux/linux-intel_5.10.bbappend
similarity index 100%
rename from meta-ohos-staging/recipes-kernel/linux/linux-intel_5.10.bbappend
rename to meta-ohos-staging/dynamic-layers/meta-intel/recipes-kernel/linux/linux-intel_5.10.bbappend
diff --git a/meta-ohos-staging/recipes-kernel/linux/linux/misc.cfg b/meta-ohos-staging/dynamic-layers/meta-intel/recipes-kernel/linux/linux/misc.cfg
similarity index 100%
rename from meta-ohos-staging/recipes-kernel/linux/linux/misc.cfg
rename to meta-ohos-staging/dynamic-layers/meta-intel/recipes-kernel/linux/linux/misc.cfg
--
GitLab