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

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index baffeb2..0276a70 100644 (file)
--- 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 9c2feca..6616e7c 100644 (file)
--- 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 \
                   "