diff options
author | Scott Murray <scott.murray@konsulko.com> | 2022-03-21 17:03:07 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2022-03-21 17:17:00 -0400 |
commit | bca788b0e5dc96ec8f8d3bf6ddf3fd0fd9c0f92c (patch) | |
tree | d24824809b19e0fb996abc899d175bd5a1b849b2 /recipes-demo | |
parent | fdadccd28a38eb9aae90f2871fbd901ac73613c2 (diff) |
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
Diffstat (limited to 'recipes-demo')
2 files changed, 54 insertions, 0 deletions
diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor.service b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor.service new file mode 100644 index 000000000..cedad0e8a --- /dev/null +++ b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor.service @@ -0,0 +1,14 @@ +[Unit] +Description=cluster-gauges-qtcompositor + +[Service] +Environment=XDG_RUNTIME_DIR=/run/user/0 +ExecStart=/usr/bin/cluster-gauges + +Restart=always + +StandardOutput=journal +StandardError=journal + +[Install] +WantedBy=graphical.target diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb new file mode 100644 index 000000000..4210754f8 --- /dev/null +++ b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb @@ -0,0 +1,40 @@ +SUMMARY = "Minimal cluster demo gauges that can be used standalone" +DESCRIPTION = "AGL HMI Application for demonstrating instrument cluster gauges as a wayland compositor" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-cluster-demo-gauges" +SECTION = "apps" + +LICENSE = "Apache-2.0 & BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ + file://app/cluster-gauges.qml;beginline=10;endline=49;md5=54187d50b29429abee6095fe8b7c1a78" + +DEPENDS = "qtquickcontrols2 qtwebsockets" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-gauges;protocol=https;branch=${AGL_BRANCH} \ + file://cluster-gauges-qtcompositor.service \ +" + +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake_qt5 systemd + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" + +do_install:append() { + install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service +} + +FILES:${PN} += " ${systemd_user_unitdir}" + +RDEPENDS:${PN} += " \ + qtquickcontrols \ + qtquickcontrols-qmlplugins \ + qtquickcontrols2 \ + qtquickcontrols2-qmlplugins \ + qtwebsockets \ + qtwebsockets-qmlplugins \ + kms-conf \ +" |