summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-06-26 15:11:03 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-06-27 15:49:13 +0000
commit7a356a7e84f6fc7b67a725cfb27d432b782ab43e (patch)
tree423cacaa2598cbccdb80e9f85f5496c7818e338d /recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch
parent7618c4a08229834883c8ade90e52c8c41eb81901 (diff)
Move base VSS and KUKSA.val recipes to meta-agl-kuksa-val
Remove base VSS and KUKSA.val recipes, as they are moving to a new meta-agl-kuksa-val layer in the meta-agl repository. The recipes for the Python modules they depend on have also been moved. Additional changes: - A new kuksa-can-provider-conf-agl recipe has been added to install our common AGL-specific kuksa-can-provider configuration. The intent is that the kuksa-can-provider in meta-agl-kuksa-val not be dependent on our demo configuration choices. - The other kuksa-can-provider configuration recipes have been tweaked to mark them as allarch. - The python3-argparse-addons recipe and python3-cantools bbappend that used it have been removed, as it looks like it is no longer required. - The dangling kuksa-val-agl-demo-cluster recipe has been removed, it was missed in the previous kuksa-val server removal. Bug-AGL: SPEC-5136 Change-Id: I8c5aa556a796852c5ee3d8c26e045a089911f37e Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30038 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account
Diffstat (limited to 'recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch')
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch80
1 files changed, 0 insertions, 80 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch b/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch
deleted file mode 100644
index 91a309240..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2e4e1f9147f1ebe5b545ae0cab41341e3abb00ae Mon Sep 17 00:00:00 2001
-From: Scott Murray <scott.murray@konsulko.com>
-Date: Sat, 15 Jun 2024 13:13:17 -0400
-Subject: [PATCH 2/4] dbc2val: usability improvements
-
-Changes:
-- Tweaked default configuration file search path to better match
- Linux FHS. First look for a config.ini or dbc_feeder.ini in
- /etc/kuksa-can-provider, then fall back to /etc/dbc_feeder.ini
- before using trying other possible paths.
-- Add catching of exceptions around CAN device opening so that the
- script can exit cleanly with an error message if the device is
- not available.
-- Tweaked DBC default value file command line argument parsing so
- that it does not attempt to fallback to "dbc_default_values.json"
- in the current working directory. That likely works for upstream
- test scenarios, but prevents running on a target.
-
-Upstream-Status: pending
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
----
- dbcfeeder.py | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/dbcfeeder.py b/dbcfeeder.py
-index a1ef174..c252503 100755
---- a/dbcfeeder.py
-+++ b/dbcfeeder.py
-@@ -144,7 +144,11 @@ class Feeder:
- whitelisted_frame_ids.append(filter.can_id) # type: ignore
- elm2canbridge.elm2canbridge(canport, self._elmcan_config, whitelisted_frame_ids)
-
-- self._reader.start()
-+ try:
-+ self._reader.start()
-+ except:
-+ log.error("Could not open %s, exiting", canport)
-+ sys.exit(-1)
-
- receiver = threading.Thread(target=self._run_receiver)
- receiver.start()
-@@ -165,7 +169,12 @@ class Feeder:
- # For now creating another bus
- # Maybe support different buses for downstream/upstream in the future
-
-- self._canclient = CANClient(interface="socketcan", channel=canport, can_fd=can_fd)
-+ self._canclient = None
-+ try:
-+ self._canclient = CANClient(interface="socketcan", channel=canport, can_fd=can_fd)
-+ except:
-+ log.error("Could not open %s, exiting", canport)
-+ sys.exit(-1)
-
- transmitter = threading.Thread(target=self._run_transmitter)
- transmitter.start()
-@@ -335,8 +344,10 @@ def _parse_config(filename: str) -> configparser.ConfigParser:
- configfile = filename
- else:
- config_candidates = [
-- "/config/dbc_feeder.ini",
-+ "/etc/kuksa-can-provider/config.ini",
-+ "/etc/kuksa-can-provider/dbc_feeder.ini",
- "/etc/dbc_feeder.ini",
-+ "/config/dbc_feeder.ini",
- "config/dbc_feeder.ini",
- ]
- for candidate in config_candidates:
-@@ -534,7 +545,7 @@ def main(argv):
- elif os.environ.get("DBC_DEFAULT_FILE"):
- dbc_default = os.environ.get("DBC_DEFAULT_FILE")
- else:
-- dbc_default = config.get(CONFIG_SECTION_CAN, CONFIG_OPTION_DBC_DEFAULT_FILE, fallback="dbc_default_values.json")
-+ dbc_default = config.get(CONFIG_SECTION_CAN, CONFIG_OPTION_DBC_DEFAULT_FILE, fallback=None)
-
- if args.mapping:
- mappingfile = args.mapping
---
-2.44.0
-