From 78f7e7c68af1ad9e4aecf149f2c913abd86212c7 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 13 Sep 2021 10:18:25 +0200
Subject: [PATCH] meta-networking: Move .bbappend file to dynamic-layers
The recently introduced fixes for networkmanager introduced an implicit
dependency on meta-networking.
This change allows use of meta-ohos-staging without meta-networking layer,
without changing behaviour when used together with meta-networking.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
meta-ohos-staging/conf/layer.conf | 2 ++
.../networkmanager-1.22.10/fix-reallocarray-check.patch | 0
.../networkmanager-1.22.10/fix-reallocarray-check.patch.license | 0
.../networkmanager/networkmanager-1.22.10/fix-strerror_r.patch | 0
.../networkmanager-1.22.10/fix-strerror_r.patch.license | 0
.../networkmanager/networkmanager_1.22.10.bbappend | 0
6 files changed, 2 insertions(+)
rename meta-ohos-staging/{ => dynamic-layers/meta-networking}/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch (100%)
rename meta-ohos-staging/{ => dynamic-layers/meta-networking}/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license (100%)
rename meta-ohos-staging/{ => dynamic-layers/meta-networking}/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch (100%)
rename meta-ohos-staging/{ => dynamic-layers/meta-networking}/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license (100%)
rename meta-ohos-staging/{ => dynamic-layers/meta-networking}/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend (100%)
diff --git a/meta-ohos-staging/conf/layer.conf b/meta-ohos-staging/conf/layer.conf
index 1d22bd72..b0837f04 100644
--- a/meta-ohos-staging/conf/layer.conf
+++ b/meta-ohos-staging/conf/layer.conf
@@ -11,6 +11,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
# We have .bbappend files to recipes in layers that we want to have as optional
BBFILES_DYNAMIC += "\
+ networking-layer:${LAYERDIR}/dynamic-layers/meta-networking/recipes-*/*/*.bb \
+ networking-layer:${LAYERDIR}/dynamic-layers/meta-networking/recipes-*/*/*.bbappend \
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 \
diff --git a/meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch b/meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch
similarity index 100%
rename from meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch
rename to meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch
diff --git a/meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license b/meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license
similarity index 100%
rename from meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license
rename to meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license
diff --git a/meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch b/meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch
similarity index 100%
rename from meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch
rename to meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch
diff --git a/meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license b/meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license
similarity index 100%
rename from meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license
rename to meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license
diff --git a/meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend b/meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend
similarity index 100%
rename from meta-ohos-staging/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend
rename to meta-ohos-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend
--
GitLab