From 604487f1c7c27465cec704bef025bfff0f4915f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
 <bernhard.rosenkraenzer.ext@huawei.com>
Date: Fri, 19 Aug 2022 00:49:09 +0200
Subject: [PATCH] edk2-firmware: Move meta-oniro-staging bbappend to dynamic
 layers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes building without meta-arm (e.g. meta-openharmony CI)

Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
---
 meta-oniro-staging/conf/layer.conf                              | 2 ++
 .../0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch         | 0
 .../meta-arm}/recipes-bsp/uefi/edk2-firmware_%.bbappend         | 0
 3 files changed, 2 insertions(+)
 rename meta-oniro-staging/{ => dynamic-layers/meta-arm}/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch (100%)
 rename meta-oniro-staging/{ => dynamic-layers/meta-arm}/recipes-bsp/uefi/edk2-firmware_%.bbappend (100%)

diff --git a/meta-oniro-staging/conf/layer.conf b/meta-oniro-staging/conf/layer.conf
index b9e137c5..139b954c 100644
--- a/meta-oniro-staging/conf/layer.conf
+++ b/meta-oniro-staging/conf/layer.conf
@@ -19,6 +19,8 @@ BBFILES_DYNAMIC += "\
     intel:${LAYERDIR}/dynamic-layers/meta-intel/recipes-*/*/*.bbappend \
     meta-java:${LAYERDIR}/dynamic-layers/meta-java/recipes-*/*/*.bb \
     meta-java:${LAYERDIR}/dynamic-layers/meta-java/recipes-*/*/*.bbappend \
+    meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/recipes-*/*/*.bb \
+    meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/recipes-*/*/*.bbappend \
 "
 
 BBFILE_COLLECTIONS += "oniro-staging"
diff --git a/meta-oniro-staging/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch b/meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch
similarity index 100%
rename from meta-oniro-staging/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch
rename to meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-Respect-BUILD_CFLAGS-in-GCC_ALL_CC_FLAGS.patch
diff --git a/meta-oniro-staging/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
similarity index 100%
rename from meta-oniro-staging/recipes-bsp/uefi/edk2-firmware_%.bbappend
rename to meta-oniro-staging/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
-- 
GitLab