templates: feature: ensure agl-demo uses agl-app-framework

Also, due to changes in meta-agl-app-framework, `weston-init` now
conflicts with `agl-compositor-init`, so remove it from the
`agl-graphical-weston` package group dependencies so the demo images
can build.

Bug-AGL: SPEC-4161
Change-Id: I1dc9a60445fc3a97531449bfcc3496ce05357e36
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
index c2250c6..7db76c6 100644 (file)
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
+++ b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
@@ -1,3 +1,5 @@
+RDEPENDS:${PN}_remove = "weston-init"
+
 RDEPENDS:${PN} += " \
                   agl-compositor \
                   "

diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
index d0b2041..4f4e49e 100644 (file)
--- a/templates/feature/agl-demo/included.dep
+++ b/templates/feature/agl-demo/included.dep
@@ -1 +1 @@
-agl-pipewire
+agl-pipewire agl-app-framework