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 --- .../cluster-dashboard/cluster-dashboard.service | 20 ++++++++++ .../cluster-dashboard/cluster-dashboard_git.bb | 46 ++++++++++++++++++++++ .../cluster-receiver/cluster-receiver.service | 20 ++++++++++ .../cluster-receiver/cluster-receiver_git.bb | 38 ++++++++++++++++++ .../qt-cluster-receiver.service | 20 ++++++++++ .../cluster-receiver/qt-cluster-receiver_git.bb | 40 +++++++++++++++++++ recipes-demo/navigation/tbtnavi_git.bb | 36 +++++++++++++++++ 7 files changed, 220 insertions(+) create mode 100644 recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.service create mode 100644 recipes-demo/cluster-dashboard/cluster-dashboard_git.bb create mode 100644 recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service create mode 100644 recipes-demo/cluster-receiver/cluster-receiver_git.bb create mode 100644 recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service create mode 100644 recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb create mode 100644 recipes-demo/navigation/tbtnavi_git.bb (limited to 'recipes-demo') diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.service b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.service new file mode 100644 index 00000000..d96c738b --- /dev/null +++ b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.service @@ -0,0 +1,20 @@ +[Unit] +Description=cluster-dashboard + +Requires=agl-compositor.service +After=agl-compositor.service + +# Since we are part of the agl session, make sure we are started before +# it is complete. +Before=agl-session.target + +[Service] +ExecStart=/usr/bin/cluster-dashboard + +Restart=always + +StandardOutput=journal +StandardError=journal + +[Install] +WantedBy=agl-session.target diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb new file mode 100644 index 00000000..2f5bbecf --- /dev/null +++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb @@ -0,0 +1,46 @@ +SUMMARY = "Instrument Cluster Dashboard application" +DESCRIPTION = "AGL demonstration instrument cluster dashboard application" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-cluster-demo-dashboard" +SECTION = "apps" + +LICENSE = "Apache-2.0 & BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ + file://app/cluster-gauges.qml;beginline=9;endline=48;md5=54187d50b29429abee6095fe8b7c1a78" + +DEPENDS = " \ + qtquickcontrols2 \ + libqtappfw \ + glib-2.0 \ + wayland wayland-native \ + qtwayland qtwayland-native \ +" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-dashboard;protocol=https;branch=${AGL_BRANCH} \ + file://cluster-dashboard.service \ +" +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake_qt5 + +do_install:append() { + install -d ${D}${systemd_user_unitdir}/agl-session.target.wants + install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_user_unitdir}/${BPN}.service + ln -s ../${BPN}.service ${D}${systemd_user_unitdir}/agl-session.target.wants/${BPN}.service +} + +FILES:${PN} += " ${systemd_user_unitdir}" + +RDEPENDS:${PN} += " \ + qtwayland \ + qtbase-qmlplugins \ + qtquickcontrols \ + qtquickcontrols-qmlplugins \ + qtquickcontrols2 \ + qtquickcontrols2-qmlplugins \ + qtgraphicaleffects-qmlplugins \ + qtsvg-plugins \ +" diff --git a/recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service b/recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service new file mode 100644 index 00000000..e544e25f --- /dev/null +++ b/recipes-demo/cluster-receiver/cluster-receiver/cluster-receiver.service @@ -0,0 +1,20 @@ +[Unit] +Description=cluster-receiver + +Requires=agl-compositor.service +After=agl-compositor.service + +# Since we are part of the agl session, make sure we are started before +# it is complete. +Before=agl-session.target + +[Service] +ExecStart=/usr/bin/xdg-cluster-receiver + +Restart=always + +StandardOutput=journal +StandardError=journal + +[Install] +WantedBy=agl-session.target diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb new file mode 100644 index 00000000..3b1dd6a0 --- /dev/null +++ b/recipes-demo/cluster-receiver/cluster-receiver_git.bb @@ -0,0 +1,38 @@ +SUMMARY = "Instrument Cluster receiver application" +DESCRIPTION = "AGL demonstration instrument cluster XDG remote display application" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-cluster-demo-receiver" +SECTION = "apps" + +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=374fee6a7817f1e1a5a7bfb7b7989553" + +DEPENDS = " \ + wayland wayland-native \ + agl-compositor \ + gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \ +" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH} \ + file://cluster-receiver.service \ +" +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +do_install:append() { + install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_user_unitdir}/${BPN}.service + install -d ${D}${systemd_user_unitdir}/agl-session.target.wants + ln -s ../${BPN}.service ${D}${systemd_user_unitdir}/agl-session.target.wants/${BPN}.service +} + +FILES:${PN} += " ${systemd_user_unitdir}" + +RDEPENDS:${PN} += " \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad \ +" diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service b/recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service new file mode 100644 index 00000000..bc328f9e --- /dev/null +++ b/recipes-demo/cluster-receiver/qt-cluster-receiver/qt-cluster-receiver.service @@ -0,0 +1,20 @@ +[Unit] +Description=qt-cluster-receiver + +Requires=agl-compositor.service +After=agl-compositor.service + +# Since we are part of the agl session, make sure we are started before +# it is complete. +Before=agl-session.target + +[Service] +ExecStart=/usr/bin/qt-cluster-receiver + +Restart=always + +StandardOutput=journal +StandardError=journal + +[Install] +WantedBy=agl-session.target diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb new file mode 100644 index 00000000..d43ab437 --- /dev/null +++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb @@ -0,0 +1,40 @@ +SUMMARY = "Instrument Cluster receiver application" +DESCRIPTION = "AGL demonstration instrument cluster Qt remote display application" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/admin/repos/apps/agl-qt-cluster-demo-receiver" +SECTION = "apps" + +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ + file://app/surface.hpp;beginline=5;endline=21;md5=5351c531a191f0e3463aafcd0a6a00a3" + +DEPENDS = " \ + wayland wayland-native \ + qtwayland qtwayland-native \ + qtquickcontrols2 qtwebsockets qtbase qtdeclarative \ + gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \ +" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-qt-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH} \ + file://qt-cluster-receiver.service \ +" +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit cmake_qt5 pkgconfig + +do_install:append() { + # Only install unit, do not enable it by default + install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_user_unitdir}/${BPN}.service +} + +FILES:${PN} += " ${systemd_user_unitdir}" + +RDEPENDS:${PN} += " \ + qtwayland \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad \ +" diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb new file mode 100644 index 00000000..5981cc58 --- /dev/null +++ b/recipes-demo/navigation/tbtnavi_git.bb @@ -0,0 +1,36 @@ +SUMMARY = "AGL Reference Navigation Cluster Streaming application" +DESCRIPTION = "Demo AGL turn by turn cluster navigation application based on QtLocation widget." +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/admin/repos/apps/tbtnavi" +SECTION = "apps" + +LICENSE = "Apache-2.0 & ISC & BSD-3-Clause & BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \ + file://LICENSE.mapbox-cheap-ruler-cpp;md5=761263ee6bdc98e8697d9fbc897021ba \ + file://LICENSE.mapbox-geometry.hpp;md5=6e44f5d6aeec54f40fc84eebe3c6fc6c \ + file://LICENSE.mapbox-variant;md5=79558839a9db3e807e4ae6f8cd100c1c \ + file://include/mapbox/recursive_wrapper.hpp;beginline=4;endline=13;md5=cd3341aae76c0cf8345935abd20f0051 \ +" + +DEPENDS = " \ + qtbase \ + qtquickcontrols2 \ + qtlocation \ + libqtappfw \ + wayland-native \ + qtwayland-native \ +" + +PV = "2.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/tbtnavi;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +S = "${WORKDIR}/git" + +inherit qmake5 pkgconfig + +RDEPENDS:${PN} += " \ + qtlocation \ + ondemandnavi-config \ + libqtappfw \ +" -- cgit 1.2.3-korg