X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2Fcan-lin%2Fcan-lin_0.2.bb;h=918b868652af6a1fa65b5ccda0e9c98db14ccb6f;hb=e5fbebaa4fce6fb0877354fb0ac2f6d6576e6adf;hp=ec3db4bedef4a7019be15338affb8d9e08484c73;hpb=b092df77e7b5ede496f4d3c8b71ba37a640b1fa8;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-demo-hmi/can-lin/can-lin_0.2.bb b/recipes-demo-hmi/can-lin/can-lin_0.2.bb
index ec3db4bed..918b86865 100644
--- a/recipes-demo-hmi/can-lin/can-lin_0.2.bb
+++ b/recipes-demo-hmi/can-lin/can-lin_0.2.bb
@@ -1,23 +1,39 @@
 DESCRIPTION = "CAN-LIN Application"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r0"
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/most-can-demo-bin;protocol=https"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/most-can-demo-bin;protocol=https;branch=${AGL_BRANCH}"
+SRC_URI += "file://hvac-demo.service"
 
 S = "${WORKDIR}/git"
-SRCREV = "70458963c48662012af856b56676260150f124c8"
+SRCREV = "fd2101e277cb80eef4c6381924cfdc1d50087d12"
 
-do_configure() {
-        echo ""
-}
-
-do_compile() {
-        echo ""
-}
+# These binaries are currently for the porter kernel only
+COMPATIBLE_MACHINE = "porter"
 
 do_install() {
         install -m 0755 -d ${D}${bindir}
         install -m 0755 ${S}/OptoLyzerMoccaApp ${D}${bindir}
+        # Hack for vod service for RSE with most/hvac demo hardware
+
+        # vod-client is provided as binary stored and delivered in staging/most-can-demo-bin.
+        install -m 0755 -d ${D}/usr/AGL/most
+        install -m 0755 ${S}/vod-client ${D}/usr/AGL/most
+
+        # Install HVAC DEMO hardware startup systemd service (user)
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+            install -m 644 -p -D ${WORKDIR}/hvac-demo.service ${D}${systemd_user_unitdir}/hvac-demo.service
+        fi
+
+        # Execute install manually for root user on behalf of systemctl script
+        # because it doesn't support user mode of systemd.
+        install -m 0755 -d ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/
+        ln -sf ${systemd_user_unitdir}/hvac-demo.service ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/hvac-demo.service
 }
 
+FILES_${PN} += " \
+    ${bindir}/OptoLyzerMoccaApp \
+    /usr/AGL/most/vod-client \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/hvac-demo.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ROOT_HOME}/.config/systemd/user/default.target.wants/hvac-demo.service', '', d)} \
+    "