From d595a2e3b50faef74bc2eee72164e816d7d89c60 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 20 Dec 2024 11:07:59 +0100 Subject: [PATCH] connectcore-demo-example: restructure multimedia dependencies At the moment, we provide four versions of the connectcore demo package: * webkit + multimedia: we include this one in webkit images * webkit (no multimedia): used in cases where the platform supports webkit, but video/webgl performance isn't optimal * regular: only contains the demo server and basic assets, we include it in non-webkit images * regular + multimedia: contains the regular package plus video/webgl web content This last version doesn't make a lot of sense because video/webgl content is meant to showcase the target's VPU/GPU capabilities, and that can only be done when running the demo on the target via webkit. Besides, even though we don't include this version of the package in our default non-webkit images, the runtime dependencies in the .inc file make bitbake generate the video-examples and webglsamples packages during the image builds, even if they don't end up in the final image. This is true even for platforms that don't support webkit, such as the ccimx6ul, ccimx91 and ccimx93. Initially, I tried making the -multimedia package exclusive to the webkit recipe, but this causes its contents to be bundled with the base (regular) package. To avoid this, define the -multimedia package in the .inc file, and move its dependency with video-examples and webglsamples to the webkit recipe. This way, the regular + multimedia version of the package still exists, but it no longer causes bitbake to generate video/webgl packages when not needed. Signed-off-by: Gabriel Valcazar --- .../connectcore-demo-example-webkit.bb | 5 +++++ .../recipes-digi/dey-examples/connectcore-demo-example.inc | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb index 11b390e98..89cc68506 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb @@ -55,3 +55,8 @@ SYSTEMD_SERVICE:${PN} = "connectcore-demo-example.service" RREPLACES:${PN} = "connectcore-demo-example" RCONFLICTS:${PN} = "connectcore-demo-example" + +RDEPENDS:${PN}-multimedia += " \ + video-examples \ + webglsamples \ +" diff --git a/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc b/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc index f522c515a..2925c1604 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc @@ -86,11 +86,7 @@ FILES:${PN}-server = " \ " RDEPENDS:${PN} = "${PN}-server" -RDEPENDS:${PN}-multimedia = " \ - ${PN} \ - video-examples \ - webglsamples \ -" +RDEPENDS:${PN}-multimedia = "${PN}" INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME:${PN}-server = "connectcore-demo-server"