From 6cce1d8fcff72bd429a6f0aea23fc5666fd67878 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 7 Mar 2022 16:21:05 -0500 Subject: Restore cluster and telematics demo images Changes: - Restore the image recipes for the agl-cluster-demo-platform and agl-telematics-demo-platform images, with updates to them and their associated packagegroups for the app framework removal. - Restore updated recipes required for the above, including: * cluster-dashboard * cluster-receiver * qt-cluster-receiver * tbtnavi - Simple systemd unit files have been added for the cluster applications and are installed as user session units. Starting of cluster-dashboard (the XDG version) and cluster-receiver in the AGL user session is enabled by default. - The recipes to install the dedicated network configuration for the cluster demo have been restored so that the agl-cluster-demo-support and agl-demo-preload features will do what is expected again. Known outstanding issues: - The previous signal-composer binding support has been removed from cluster-dashboard, so related functionality (i.e. driving it from CAN) is disabled until replacement is worked out. - While tbtnavi builds, the previous use of the navigation binding is stubbed out in libqtappfw, so it will not receive location and route information from ondemandnavi. - Nothing has been added yet to start tbtnavi in the AGL user session, the plan is to do so with a systemd user unit once a new mechanism for controlling it from ondemandnavi has been implemented. - The telematics-recorder application has not yet been updated to replace its signal-composer, gps, and network binding use. The intent is to address these issues in the 13.0.x point releases. Bug-AGL: SPEC-4283 Signed-off-by: Scott Murray Change-Id: I520c23775b21504cb7dd92538319cc5bf826ff64 --- .../images/agl-cluster-demo-platform.bb | 18 +++++++++++++ .../images/agl-telematics-demo-platform.bb | 13 ++++++++++ .../packagegroup-agl-cluster-demo-platform.bb | 30 ++++++++++++++++++++++ .../packagegroup-agl-demo-platform.bb | 8 ++++++ .../packagegroup-agl-profile-cluster-qt5.bb | 1 - .../packagegroup-agl-telematics-demo-platform.bb | 1 - 6 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 recipes-platform/images/agl-cluster-demo-platform.bb create mode 100644 recipes-platform/images/agl-telematics-demo-platform.bb create mode 100644 recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb (limited to 'recipes-platform') diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb new file mode 100644 index 00000000..d5c92742 --- /dev/null +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "AGL Cluster Demo Platform image currently contains a simple cluster interface." + +LICENSE = "MIT" + +require recipes-platform/images/agl-image-boot.inc + +IMAGE_FEATURES += "splash package-management ssh-server-openssh" + +inherit features_check + +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", "weston-ini-conf-landscape-inverted", "weston-ini-conf-landscape", d)} \ + " diff --git a/recipes-platform/images/agl-telematics-demo-platform.bb b/recipes-platform/images/agl-telematics-demo-platform.bb new file mode 100644 index 00000000..b8a99617 --- /dev/null +++ b/recipes-platform/images/agl-telematics-demo-platform.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "AGL Telematics Demo Platform image." + +LICENSE = "MIT" + +require recipes-platform/images/agl-image-boot.inc + +inherit features_check + +REQUIRED_DISTRO_FEATURES = "3g" + +IMAGE_INSTALL:append = " \ + packagegroup-agl-telematics-demo-platform \ +" diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb new file mode 100644 index 00000000..c414adf4 --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb @@ -0,0 +1,30 @@ +SUMMARY = "The software for demo platform of AGL cluster profile" +DESCRIPTION = "A set of packages belong to AGL Cluster Demo Platform" + +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-cluster-demo-platform \ + " + +ALLOW_EMPTY:${PN} = "1" + +RDEPENDS:${PN} += "\ + packagegroup-agl-profile-cluster-qt5 \ + packagegroup-agl-ttf-fonts \ + packagegroup-agl-source-han-sans-ttf-fonts \ + packagegroup-agl-networking \ + " + +AGL_APPS = " \ + cluster-dashboard \ + cluster-receiver \ + qt-cluster-receiver \ + " + +RDEPENDS:${PN}:append = " \ + can-utils \ + ${AGL_APPS} \ +" diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index a86da2e2..9c4553f2 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -34,6 +34,13 @@ AGL_APPS = " \ radio \ " +# Cluster demo support. +CLUSTER_SUPPORT_PACKAGES = " \ + tbtnavi \ + cluster-demo-network-config \ +" +CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}" + # Hook for demo platform configuration # ATM used for: # 1) Adding udev configuration and scripts for supporting USB attached @@ -49,5 +56,6 @@ RDEPENDS:${PN}:append = " \ qtquickcontrols2-agl-style \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip mpc' , '', d)} \ ${AGL_APPS} \ + ${CLUSTER_SUPPORT} \ ${DEMO_PRELOAD} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb index aeef45da..39b0c373 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb @@ -15,7 +15,6 @@ RDEPENDS:${PN} += "\ packagegroup-agl-image-boot \ packagegroup-agl-core-security \ packagegroup-agl-graphical-weston \ - packagegroup-agl-appfw-native-qt5 \ " RDEPENDS:profile-cluster-qt5 = "${PN}" diff --git a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb index 17b5c8b2..d598de4e 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb @@ -30,4 +30,3 @@ RDEPENDS:${PN}:append = " \ ${AGL_APPS} \ ${AGL_APIS} \ " -# packagegroup-agl-core-navigation? (brings in geoclue...) -- cgit 1.2.3-korg