X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-connectivity%2Fkuksa-val%2Fkuksa-dbc-feeder_git.bb;h=281f10ac3377fe8692d4093ccf5e3d90475ac6d0;hb=aae4e6dbcf7836f49eef755164c3ee1fd0142883;hp=b5597d0035269ab9ab187d599ba96ba7f9778bec;hpb=54ef381ec92148015cbd743a1b30771cca22f80b;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb
index b5597d003..281f10ac3 100644
--- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb
+++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb
@@ -7,22 +7,27 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=175792518e4ac015ab6696d16c4f607e"
 
 DEPENDS = "python3-setuptools-git-versioning-native"
 
-PV = "0.1.0+git${SRCPV}"
+PV = "0.4.0+git${SRCPV}"
 
 SRC_URI = "git://github.com/eclipse/kuksa.val.feeders.git;protocol=https;branch=main \
            file://0001-dbc2val-add-installation-mechanism.patch \
            file://0002-dbc2val-usability-improvements.patch \
+           file://0003-dbc2val-fix-token-file-configuration-option.patch \
+           file://0004-Enable-val2dbc-for-sensor-values.patch \
            file://config.ini \
-           file://dbc_feeder.json.token \
-           file://mapping.yml \
+           file://dbc_feeder.token \
            file://agl-vcar.dbc \
+           file://dbc_default_values.json \
            file://kuksa-dbc-feeder.service \
-"
-SRCREV = "a857a1d6981b7d62b80ac03e60988a0bded3e255"
+	   file://kuksa-dbc-feeder.default \
+           "
+SRCREV = "5bb52eca8d79f7c05a024f69b1faab81dabacdcd"
 
 S = "${WORKDIR}/git"
 
-inherit setuptools3 systemd
+inherit setuptools3 systemd update-alternatives
+
+SETUPTOOLS_SETUP_PATH = "${S}/dbc2val"
 
 SYSTEMD_SERVICE:${PN} = "${BPN}.service"
 
@@ -32,15 +37,20 @@ do_install:append() {
     # Token should ideally not be readable by other users.
     # The potential for running the feeder as non-root will take some
     # investigation.
-    install -m 0600 ${WORKDIR}/dbc_feeder.json.token ${D}${sysconfdir}/kuksa-dbc-feeder/
-    install -m 0644 ${WORKDIR}/mapping.yml ${D}${sysconfdir}/kuksa-dbc-feeder/
+    install -m 0600 ${WORKDIR}/dbc_feeder.token ${D}${sysconfdir}/kuksa-dbc-feeder/
     install -m 0644 ${WORKDIR}/agl-vcar.dbc ${D}${sysconfdir}/kuksa-dbc-feeder/
+    install -m 0644 ${WORKDIR}/dbc_default_values.json ${D}${sysconfdir}/kuksa-dbc-feeder/
+    install -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/kuksa-dbc-feeder.default ${D}${sysconfdir}/default/
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_system_unitdir}
         install -m 0644 ${WORKDIR}/kuksa-dbc-feeder.service ${D}${systemd_system_unitdir}
     fi
 }
 
+ALTERNATIVE_LINK_NAME[kuksa-dbc-feeder.env] = "${sysconfdir}/default/kuksa-dbc-feeder"
+
+ALTERNATIVE_TARGET_${PN} = "${sysconfdir}/default/kuksa-dbc-feeder.default"
 FILES:${PN} += "${systemd_system_unitdir}"
 
 RDEPENDS:${PN} += " \
@@ -51,6 +61,6 @@ RDEPENDS:${PN} += " \
     python3-can-j1939 \
     python3-pyyaml \
     python3-py-expression-eval \
-    kuksa-viss-client \
+    kuksa-client \
     can-dev-helper \
 "