From bca788b0e5dc96ec8f8d3bf6ddf3fd0fd9c0f92c Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
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 <scott.murray@konsulko.com>
Change-Id: Id79484c025fef067d7d47eaf783768e700a9dc8d
---
 .../images/agl-cluster-demo-qtcompositor.bb        | 23 ++++++++++++++++
 .../packagegroup-agl-cluster-demo-qtcompositor.bb  | 32 ++++++++++++++++++++++
 .../packagegroup-agl-profile-cluster-qt5.bb        |  4 ++-
 ...ackagegroup-agl-profile-cluster-qtcompositor.bb |  7 ++---
 4 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 recipes-platform/images/agl-cluster-demo-qtcompositor.bb
 create mode 100644 recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb

(limited to 'recipes-platform')

diff --git a/recipes-platform/images/agl-cluster-demo-qtcompositor.bb b/recipes-platform/images/agl-cluster-demo-qtcompositor.bb
new file mode 100644
index 00000000..a9da9763
--- /dev/null
+++ b/recipes-platform/images/agl-cluster-demo-qtcompositor.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "AGL Cluster Demo Qtwayland Compositor image currently contains a \
+simple cluster interface and some AGL service."
+
+LICENSE = "MIT"
+
+require recipes-platform/images/agl-image-boot.inc
+
+IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
+
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+# add packages for cluster demo qtcompositor
+IMAGE_INSTALL:append = " \
+    packagegroup-agl-cluster-demo-qtcompositor \
+"
+
+# NOTE: This should be revisited after upgrading to hardknott or later,
+#       as it may no longer be required.  However, since Wayland is not
+#       being used, the new "weston" image feature may not be a viable
+#       option.
+SYSTEMD_DEFAULT_TARGET = "graphical.target"
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 00000000..a5c8b78e
--- /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 39b0c373..1cf20937 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 ae1ad96b..ba66b60d 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