From 63512e51692b48ad645dba0a21858cc48d5b416f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 26 May 2022 10:38:07 -0400 Subject: kuksa-dbc-feeder: add recipe and dependencies Add a kuksa-dbc-feeder recipe to build the sample CAN feeder for the KUKSA.val Vehicle Information Service (VIS) server and add it to the agl-demo-platform image by adding it to packagegroup-agl-ivi-services. Local patches are applied to enable building with OpenEmbedded, make installation into standard Linux FHS locations feasible, and improve usability on target with respect to logging and error handling. These will be discussed with upstream to hopefully get them integrated. Additional changes: - Add a recipe for the required kuksa-viss-client Python module included with the KUKSA.val source tree. The module is also available via pypi.org, but keeping all the pieces in lockstep for now seems better, so it is built out of a clone of the kuksa.val repo using the same SRCREV as the server and kuksa-dbc-feeder. - Add backports of recipes for required Python modules: python3-bitstruct, python3-can, python3-cantools, python3-cmd2, python3-diskcache, python3-importlib-metadata, python3-setuptools-scm, python3-textparser, python3-toml This is required to both add recipes missing from dunfell as well as to meet version requirements for kuksa-viss-client and kuksa-dbc-feeder. For the most part the recipes were picked from the poky and meta-openembedded kirkstone branches before the significant Python module build rework done for the kirkstone M4 milestone. There is some potential for updating them to newer backports, but this will be a low priority unless there are explicit requests. - Add bbappend for python3-cantools to add some missing runtime dependencies discovered during testing. This will be addressed upstream in meta-python as time permits. - Add new recipes for required Python modules: python3-argparse-addons, python3-can-j1939, python3-py-expression-eval, python3-setuptools-git-versioning These will be upstreamed to meta-python as time permits. - Add minimal DBC file and mapping configuration. At present the agl-vcar.dbc file only contains the minimum message definitions known to be required for the AGL demo platform, namely vehicle and engine speeds and the steering wheel events. - Add can-dev-helper recipe to install a systemd unit and script to ensure a CAN interface is available for testing. This is a tweaked version of what was previously used with agl-service-can-low-level. Bug-AGL: SPEC-4405 Signed-off-by: Scott Murray Change-Id: I4f9fe9c34165da30005d39689739c73dfdbbc615 --- .../can-dev-helper/can-dev-helper.service | 10 +++++++ .../kuksa-val/can-dev-helper/can-dev-helper.sh | 33 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.service create mode 100644 recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.sh (limited to 'recipes-connectivity/kuksa-val/can-dev-helper') diff --git a/recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.service b/recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.service new file mode 100644 index 000000000..04e6a9c35 --- /dev/null +++ b/recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.service @@ -0,0 +1,10 @@ +[Unit] +Description=CAN interface helper +Before=kuksa-dbc-feeder.service + +[Service] +ExecStart=/usr/sbin/can-dev-helper.sh +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.sh b/recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.sh new file mode 100644 index 000000000..de9894d76 --- /dev/null +++ b/recipes-connectivity/kuksa-val/can-dev-helper/can-dev-helper.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# +# Script to bring up CAN interface configured for the kuksa.val +# CAN feeder in /etc/kuksa-dbc-feeder/dbc_feeder.ini as vcan +# interfaces if no physical interface is present. +# + +vcan_up() { + if [ -n "$1" ]; then + echo "Bringing up $1 as virtual CAN device" + ip link add dev $1 type vcan + ip link set up $1 + fi +} + +CONF=/etc/kuksa-dbc-feeder/config.ini + +if [ ! -f $CONF ]; then + exit 0 +fi + +# Ideally the parsing would take the "[can]" section into +# account, but this should work for now. +interface=$(grep ^port= $CONF |cut -d= -f2 |tr -d '"') +if [ -n "$interface" ]; then + echo "Checking $interface" + if ! ifconfig $interface >/dev/null 2>&1; then + vcan_up $interface + fi +fi + +exit 0 -- cgit 1.2.3-korg