summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Ferraris <arnaud.ferraris@collabora.com>2021-12-07 19:16:03 +0100
committerArnaud Ferraris <arnaud.ferraris@collabora.com>2021-12-21 09:03:36 +0100
commit71c79debcfb38ed7c20b07a6845806ecc85b83eb (patch)
tree4465ceaf0fab83593da0ce9825efbc37f7f2bdbe
parent477b8e482242db57d9ada3a8c3b2c69c27126ea5 (diff)
agl-demo-platform: add launcher and make it work with new App FW
Through its dependencies, `launcher` pulls all necessary software, including `agl-session`, `homescreen`, `weston-ini-conf`... Make the `agl-demo-platform` packagegroup depend on it for using the new App FW. Moreover, make the `agl-graphical-weston` packagegroup depend on `agl-compositor-init` so we directly install the appfw-provided config and systemd services for `agl-compositor`. Bug-AGL: SPEC-4161 SPEC-4159 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Change-Id: Ifb84b021925e50a7ea977c25eb711ddf0c9b77bd
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb2
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index baffeb29..0276a708 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -35,7 +35,7 @@ DEMO_UNIT_CONF += " demo-i2c-udev-conf "
DEMO_PRELOAD = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", " ${DEMO_UNIT_CONF} poiapp-api-key", "",d)}"
RDEPENDS:${PN}:append = " \
- weston-ini-conf \
+ launcher \
qtquickcontrols2-agl \
qtquickcontrols2-agl-style \
${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
index 9c2feca4..6616e7c3 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
+++ b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
@@ -1,6 +1,6 @@
RDEPENDS:${PN}_remove = "weston-init"
RDEPENDS:${PN} += " \
- agl-compositor \
+ agl-compositor-init \
weston-terminal-conf \
"