diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2023-08-15 17:35:59 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-09-11 12:50:27 +0000 |
| commit | 7dcdecf5b01f48a8fbd16fe05ebede08bf5b76a8 (patch) | |
| tree | d65ebd51edf1da848c87b1e1367c910510b09439 /recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch | |
| parent | 93500637270f0d2e5f4a4185c09e65661e101a82 (diff) | |
Upgrade KUKSA.val components to 0.4.0 releasespike_16.0.2pike_16.0.1pike/16.0.2pike/16.0.116.0.216.0.1
Move kuksa.val and kuksa.val.feeders repos to a commit that includes
the recent 0.4.0 release plus a few post-release fixes, and update
our local patches for the new version. A new patch is required for
the databroker to disable the upstream addition of a vendored build
of protobuf tooling for the host platform, as that does not work
in the OE build enviroment, and is effectively not required since
known versions of protoc and libprotobuf are already present.
The major change coming in is a rework of TLS support, which requires
a minor change to the DBC feeder configuration file that has also
been included.
Bug-AGL: SPEC-4762
Change-Id: I1a43248f15c9946d9d9dc1e8aacf1c3a96ab45a0
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
(cherry picked from commit a620f3a712bab0dd80c8ecaa49e1ebb062fabbb6)
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29202
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch')
| -rw-r--r-- | recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch index e3f3de655..aae8b3dc0 100644 --- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch +++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch @@ -1,4 +1,4 @@ -From e2b5305a48a8c5ce5c149437e44d1b82f4b94432 Mon Sep 17 00:00:00 2001 +From dc20da27a73141b04cc6b0ce5d74e547d6fc7256 Mon Sep 17 00:00:00 2001 From: Scott Murray <scott.murray@konsulko.com> Date: Mon, 8 May 2023 14:58:06 -0400 Subject: [PATCH] dbc2val: fix token file configuration option @@ -10,23 +10,21 @@ location can be configured again for dbcfeeder.py. Upstream-Status: pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> + --- dbc2val/dbcfeederlib/serverclientwrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbc2val/dbcfeederlib/serverclientwrapper.py b/dbc2val/dbcfeederlib/serverclientwrapper.py -index 851516b..4f44913 100644 +index 1219a76..63bc12e 100644 --- a/dbc2val/dbcfeederlib/serverclientwrapper.py +++ b/dbc2val/dbcfeederlib/serverclientwrapper.py -@@ -60,7 +60,7 @@ class ServerClientWrapper(clientwrapper.ClientWrapper): +@@ -59,7 +59,7 @@ class ServerClientWrapper(clientwrapper.ClientWrapper): self._client_config["insecure"] = not self._tls # Do not set token if it is empty to allow default client lib info to be used if self._token_path != "": - self._client_config["token"] = self._token_path + self._client_config["token_or_tokenfile"] = self._token_path - # TODO add data for root cert if using TLS and if given - --- -2.39.2 - + if self._root_ca_path: + self._client_config['cacertificate'] = self._root_ca_path |