From ecb0823615d6119220180497d8b43c1fbaad8613 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 6 Sep 2022 12:48:42 +0200
Subject: [PATCH] crank images: fix build on ccmp15

The crank storyboard engine is provided in binary format. The RPM
package manager that creates the rootfs needs and explicit runtime
provider for 'libEGL.so', which in the ccmp15 is provided by the
'libegl-gcnano' runtime package.

Fix build failure:

--> Finished dependency resolution
Error:
 Problem: package packagegroup-dey-crank-1.0-r0.0.ccmp15_dvk requires crank-sbengine, but none of the providers can be installed
  - conflicting requests
  - nothing provides libEGL.so needed by crank-sbengine-7.1-r0.3.ccmp15_dvk

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../gcnano-userland-multi-binary-stm32mp.bbappend            | 5 +++++
 .../recipes-crank/crank-sbengine/crank-sbengine_7.1.bb       | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/gcnano-userland/gcnano-userland-multi-binary-stm32mp.bbappend

diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/gcnano-userland/gcnano-userland-multi-binary-stm32mp.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/gcnano-userland/gcnano-userland-multi-binary-stm32mp.bbappend
new file mode 100644
index 000000000..3a986479d
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/gcnano-userland/gcnano-userland-multi-binary-stm32mp.bbappend
@@ -0,0 +1,5 @@
+# Copyright (C) 2022, Digi International Inc.
+
+# Workaround for crank storyboard engine which is provided in binary format,
+# and needs an explicit 'libEGL.so' runtime provides.
+RPROVIDES:libegl-gcnano:prepend = "libEGL.so "
diff --git a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine_7.1.bb b/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine_7.1.bb
index 12c0f563f..7a39ab385 100644
--- a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine_7.1.bb
+++ b/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine_7.1.bb
@@ -87,5 +87,10 @@ RDEPENDS:${PN}:append:ccimx6 = " \
     mtdev \
     tslib \
 "
+RDEPENDS:${PN}:append:ccmp15 = " \
+    libegl-gcnano \
+    libgles2-gcnano \
+    wayland \
+"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"