From a7da4638a9c7f86f6bd0be8ff08be55147bfd6a1 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 18 Apr 2023 16:11:47 -0400 Subject: kuksa-val: Update to 0.3.1 Changes: - Update kuksa-val to a commit that includes the 0.3.1 release and some other fixes past that. Our local patches have been updated. - Rework and rename the kuksa-viss-client recipe for the upstream switch to kuksa-client as the name. Our local patches have been updated. - Update kuksa-dbc-feeder to a commit that supports the kuksa-client library changes that come with 0.3.1. Our local patches have been updated, and a new local patch has been added to fix the token file configuration option behavior, this will be worked with upstream. Upstream changed the configuration file format, so our local one has also been updated to match. - Update the parsing of the DBC feeder configuration file in the can-dev-helper.sh script to work with the new format. - Update kuksa-val-agl recipe to not install AGL signals overlay for VSS, as that has been replaced with the use of the vss-agl package. - Add installation of vss-agl to packagegroup-agl-ivi-services so the AGL specific signals and DBC configuration will be available. Bug-AGL: SPEC-4761 Change-Id: I5933017a30f040a746f0a6a6eb2a3b68d1fc4bc1 Signed-off-by: Scott Murray (cherry picked from commit f6a2980917592000382d2a9af9ea4803e90f9f88) --- recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb') diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb index b5597d003..5fe872c69 100644 --- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb +++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder_git.bb @@ -7,23 +7,25 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=175792518e4ac015ab6696d16c4f607e" DEPENDS = "python3-setuptools-git-versioning-native" -PV = "0.1.0+git${SRCPV}" +PV = "0.1.2+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://config.ini \ file://dbc_feeder.json.token \ - file://mapping.yml \ file://agl-vcar.dbc \ file://kuksa-dbc-feeder.service \ " -SRCREV = "a857a1d6981b7d62b80ac03e60988a0bded3e255" +SRCREV = "d5fe991706bd8fc6d92ffbbaa838a380067f201f" S = "${WORKDIR}/git" inherit setuptools3 systemd +SETUPTOOLS_SETUP_PATH = "${S}/dbc2val" + SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { @@ -33,7 +35,6 @@ do_install:append() { # 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 0644 ${WORKDIR}/agl-vcar.dbc ${D}${sysconfdir}/kuksa-dbc-feeder/ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} @@ -51,6 +52,6 @@ RDEPENDS:${PN} += " \ python3-can-j1939 \ python3-pyyaml \ python3-py-expression-eval \ - kuksa-viss-client \ + kuksa-client \ can-dev-helper \ " -- cgit 1.2.3-korg