diff options
| author |   Arnaud Ferraris <arnaud.ferraris@collabora.com> | 2021-12-07 19:15:50 +0100 |
|---|---|---|
| committer | Arnaud Ferraris <arnaud.ferraris@collabora.com> | 2021-12-21 09:01:58 +0100 |
| commit | 5d603679f32614ced2569a860d310a67c8ce98f9 (patch) | |
| tree | df41ab3a8365ddc73fb53ff3da0e06a8427c2bd5 | |
| parent | dd3f596c7962ada1d42a54c091edf6df372d6687 (diff) | |
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>
| -rw-r--r-- | recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc | 2 | ||||
| -rw-r--r-- | templates/feature/agl-demo/included.dep | 2 |
2 files changed, 3 insertions, 1 deletions
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 |