From 32c9f3f9c795b6508a8b76d1f00da25f556ca180 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 20 Dec 2022 14:24:30 -0500 Subject: Rework cluster demo configuration Changes: - Rename cluster-dashboard-demo-config to cluster-demo-config since the installed AGL.conf will also be used for receiver configuration now. - Add a Flutter cluster version of AGL.conf that configures the receiver window geometry as required. The alternative mechanism is used to generate separate packages with the different AGL.conf files. - Update the package names installed by agl-demo-preload in the Qt and Flutter cluster demo images. It may make sense to do further rework in the dashboard and receiver apps post-CES to split things into separate configuration files, but this seems the most straightforward way to do things for now. Bug-AGL: SPEC-4640 Change-Id: If8a65228c75f28a53ef32a49be90f75a85d60a16 Signed-off-by: Scott Murray --- recipes-platform/images/agl-cluster-demo-platform-flutter.bb | 1 + recipes-platform/images/agl-cluster-demo-platform.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes-platform') diff --git a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb index cb088ee88..a0314f2f4 100644 --- a/recipes-platform/images/agl-cluster-demo-platform-flutter.bb +++ b/recipes-platform/images/agl-cluster-demo-platform-flutter.bb @@ -33,6 +33,7 @@ IMAGE_INSTALL:append = "\ # Flutter IMAGE_INSTALL:append = "\ flutter-cluster-dashboard \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-demo-config-flutter", "", d)} \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "flutter-cluster-dashboard-conf-demo", "flutter-cluster-dashboard-conf", d)} \ flutter-auto-runtimerelease \ " diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb index d5c92742f..f11d883c3 100644 --- a/recipes-platform/images/agl-cluster-demo-platform.bb +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -13,6 +13,6 @@ REQUIRED_DISTRO_FEATURES = "wayland" # add packages for cluster demo platform (include demo apps) here IMAGE_INSTALL:append = " \ packagegroup-agl-cluster-demo-platform \ - ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-dashboard-demo-config", "", d)} \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-demo-config", "", d)} \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "weston-ini-conf-landscape-inverted", "weston-ini-conf-landscape", d)} \ " -- cgit 1.2.3-korg