From 33fa4e419dc15b86a169851fd4597447f0549ef0 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 21 Mar 2022 17:03:07 -0400 Subject: Restore Qt compositor cluster demo image Changes: - Added the required backend plugin options for running with Qt's compositor to the PACKAGECONFIG variable in the qtbase recipe bbappend. - Restore an updated recipe for the agl-cluster-demo-qtcompositor image, with updates to the associated packagegroups for the app framework removal. - As part of the above, the duplication of the profile-cluster-qt5 package naming has been clarified in the qt5 versus qtcompositor packagegroups with new -wayland and -egl suffixes, with the previous plain -qt5 name aliasing the wayland option to maintain expected behavior. This avoids packaging conflict errors if building both types of cluster demo image in the same tree. - Restore updated cluster-gauges-qtcompositor recipe required for the image. - A simple systemd unit file has been added for the cluster-gauges application and is currently installed as a system session unit. Some rework of the agl-session scheme is required to run as a user unit, the intent is to address that in one of the 13.0.x point releases. Bug-AGL: SPEC-4283 Signed-off-by: Scott Murray Change-Id: Id79484c025fef067d7d47eaf783768e700a9dc8d --- .../packagegroup-agl-cluster-demo-qtcompositor.bb | 32 ++++++++++++++++++++++ .../packagegroup-agl-profile-cluster-qt5.bb | 4 ++- ...ackagegroup-agl-profile-cluster-qtcompositor.bb | 7 ++--- 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb (limited to 'recipes-platform/packagegroups') diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb new file mode 100644 index 000000000..a5c8b78e3 --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb @@ -0,0 +1,32 @@ +SUMMARY = "The software for AGL Cluster Demo Qtwayland Compositor" +DESCRIPTION = "A set of packages belong to AGL Cluster Demo Qtwayland Compositor" + +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-cluster-demo-qtcompositor \ + " + +ALLOW_EMPTY:${PN} = "1" + +RDEPENDS:${PN} += "\ + packagegroup-agl-profile-cluster-qtcompositor \ + packagegroup-agl-ttf-fonts \ + packagegroup-agl-networking \ + " + +AGL_SERVICE = " \ + " + +AGL_APPS = " \ + cluster-gauges-qtcompositor \ + " + +RDEPENDS:${PN}:append = " \ + linux-firmware-ralink \ + can-utils \ + ${AGL_SERVICE} \ + ${AGL_APPS} \ +" diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb index 39b0c3739..1cf20937c 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb @@ -6,6 +6,7 @@ inherit packagegroup PACKAGES = "\ packagegroup-agl-profile-cluster-qt5 \ + profile-cluster-qt5-wayland \ profile-cluster-qt5 \ " @@ -17,4 +18,5 @@ RDEPENDS:${PN} += "\ packagegroup-agl-graphical-weston \ " -RDEPENDS:profile-cluster-qt5 = "${PN}" +RDEPENDS:profile-cluster-qt5-wayland = "${PN}" +RDEPENDS:profile-cluster-qt5 = "profile-cluster-qt5-wayland" diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb index ae1ad96be..ba66b60d5 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb @@ -6,7 +6,7 @@ inherit packagegroup PACKAGES = "\ packagegroup-agl-profile-cluster-qtcompositor \ - profile-cluster-qt5 \ + profile-cluster-qt5-egl \ " ALLOW_EMPTY:${PN} = "1" @@ -23,13 +23,10 @@ QT_LITE = " \ qtwayland \ qtgraphicaleffects-qmlplugins \ qtsvg-plugins \ - qtwebsockets \ - qtwebsockets-qmlplugins \ - qtcompositor-conf \ " RDEPENDS:${PN}:append = " \ ${QT_LITE} \ " -RDEPENDS:profile-cluster-qt5 = "${PN}" +RDEPENDS:profile-cluster-qt5-egl = "${PN}" -- cgit 1.2.3-korg