From 5d603679f32614ced2569a860d310a67c8ce98f9 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Tue, 7 Dec 2021 19:15:50 +0100 Subject: [PATCH] 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 --- .../packagegroups/packagegroup-agl-graphical-weston_agldemo.inc | 2 ++ templates/feature/agl-demo/included.dep | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc index c2250c6f2..7db76c6d3 100644 --- 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 d0b204176..4f4e49ec1 100644 --- a/templates/feature/agl-demo/included.dep +++ b/templates/feature/agl-demo/included.dep @@ -1 +1 @@ -agl-pipewire +agl-pipewire agl-app-framework -- 2.16.6