From a5a575b839677ad949066269035db299f9c5b5d9 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Mon, 25 Oct 2021 23:47:54 +0100
Subject: [PATCH] oniro-linux.conf: Fix wic deploy of overlay_map.dtb
overlay_map.dtb is to be deployed in the overlays subdirectory but
dunfell only decides on what to deploy there based on extension. An
exception for overlay_map.dtb was added in later versions but was never
backported as it only makes sense on newer kernel which dunfell doesn't
support. We fix this manually in IMAGE_BOOT_FILES.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-oniro-core/conf/distro/oniro-linux.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 161bf9e5..bdbd574f 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -128,5 +128,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS_append = " \
overlays/overlay_map.dtb \
overlays/vc4-kms-v3d-pi4.dtbo \
"
+IMAGE_BOOT_FILES_remove_rpi = "overlay_map.dtb"
+IMAGE_BOOT_FILES_append_rpi = " overlay_map.dtb;overlays/overlay_map.dtb"
SPLASH = "psplash-oniro"
--
GitLab