From 294e71b1485de2aa331645d0ce4ef3b58c1f7390 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 28 May 2024 10:38:49 -0400 Subject: [PATCH] Remove agl-cluster-demo-qtcompositor image Remove agl-cluster-demo-qtcompositor image and the recipe for its cluster-gauges-qtcompositor application. They are unused and the submitter has not been active in AGL for several years. Bug-AGL: SPEC-5152 Change-Id: I0f82927eb1563d1d1136c7bd2970b8e35f93da44 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29950 ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- .../cluster-gauges-qtcompositor.service | 15 --------- .../cluster-gauges-qtcompositor_git.bb | 38 ---------------------- .../images/agl-cluster-demo-qtcompositor.bb | 11 ------- 3 files changed, 64 deletions(-) delete mode 100644 recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor.service delete mode 100644 recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb delete mode 100644 recipes-platform/images/agl-cluster-demo-qtcompositor.bb 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 deleted file mode 100644 index 083a1e1f1..000000000 --- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=cluster-gauges-qtcompositor - -[Service] -User=agl-driver -Environment=XDG_RUNTIME_DIR=/run/user/1001 -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 deleted file mode 100644 index 161e66528..000000000 --- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -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-3-Clause" -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 = "23eaf7da1f7d252aefddf9e41e52c745b7433b50" - -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 -} - -RDEPENDS:${PN} += " \ - qtquickcontrols \ - qtquickcontrols-qmlplugins \ - qtquickcontrols2 \ - qtquickcontrols2-qmlplugins \ - qtwebsockets \ - qtwebsockets-qmlplugins \ - kms-conf \ -" diff --git a/recipes-platform/images/agl-cluster-demo-qtcompositor.bb b/recipes-platform/images/agl-cluster-demo-qtcompositor.bb deleted file mode 100644 index 69dee2dfc..000000000 --- a/recipes-platform/images/agl-cluster-demo-qtcompositor.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "AGL Cluster Demo Qtwayland Compositor image currently contains a \ -simple cluster interface." - -LICENSE = "MIT" - -require recipes-platform/images/agl-image-weston.bb - -IMAGE_FEATURES += "splash package-management ssh-server-dropbear" - -# Add packages for qtcompositor demo -IMAGE_INSTALL += "cluster-gauges-qtcompositor" -- 2.16.6