summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/kuksa-val/kuksa-viss-client/0001-Update-kuksa-viss-client-to-support-Python-3.10.patch
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-10-11 16:00:28 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-10-18 04:28:35 +0000
commit54ef381ec92148015cbd743a1b30771cca22f80b (patch)
tree143dc14b4e1596123d86f6d9e85335515f05b23d /recipes-connectivity/kuksa-val/kuksa-viss-client/0001-Update-kuksa-viss-client-to-support-Python-3.10.patch
parentc74f6beed1454015b010a403cd726562f79ea829 (diff)
kuksa-val: Upgrade to latest
Changes: - Upgrade kuksa-val and kuksa-viss-client to a commit that includes the 0.2.5 release tag and some fixes past it. The patches for each have been updated against the newer version, with backported ones dropped. - The affected recipes have been updated to include some new gRPC tooling dependencies, and a recipe for a new jsonpath-ng dependency has been added. - Rework the kuksa-dbc-feeder recipe for the splitting out of the example feeders from the main kuksa-val repository. - Rework our local kuksa-dbc-feeder patches against the newer version, as upstream has made several improvements. Also drop the duplicate filtering feature patch, as it seems likely we will not need it going forward. - Update the kuksa-dbc-feeder configuration files to work with the new version. Notable is a change in the engine speed signal naming in VSS 3.0, which is the new default for VSS schema. - The kuksa-val and kuksa-val-feeders trees have changed their licensing from EPL-1.0 to Apache-2.0, update the recipes accordingly. Bug-AGL: SPEC-4587 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ibc990767219f79af95929e86361e66beda2d0c9e
Diffstat (limited to 'recipes-connectivity/kuksa-val/kuksa-viss-client/0001-Update-kuksa-viss-client-to-support-Python-3.10.patch')
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-viss-client/0001-Update-kuksa-viss-client-to-support-Python-3.10.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-viss-client/0001-Update-kuksa-viss-client-to-support-Python-3.10.patch b/recipes-connectivity/kuksa-val/kuksa-viss-client/0001-Update-kuksa-viss-client-to-support-Python-3.10.patch
deleted file mode 100644
index f1813e586..000000000
--- a/recipes-connectivity/kuksa-val/kuksa-viss-client/0001-Update-kuksa-viss-client-to-support-Python-3.10.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9c0d93ef3b7266037a1c8fe7e49790f9119dae28 Mon Sep 17 00:00:00 2001
-From: Erik Jaegervall <erik.jaegervall@se.bosch.com>
-Date: Wed, 31 Aug 2022 14:41:07 +0200
-Subject: [PATCH] Update kuksa-viss-client to support Python 3.10
-
-SSH checks in Python 3.10 are stricter.
-Using current version with Python 3.10 gives the following error:
-
-Disconnected!! Cannot create a client socket with a PROTOCOL_TLS_SERVER context (_ssl.c:801)
-
-Changing to default context (i.e. implictly Purpose.SERVER_AUTH)
-Also ignoring hostname check as certificate does not include correct hostname
-Updating Docker build to use Python 3.10
-
-Signed-off-by: Erik Jaegervall <erik.jaegervall@se.bosch.com>
-
-Upstream-Status: Backport [https://github.com/eclipse/kuksa.val/commit/9c0d93ef3b7266037a1c8fe7e49790f9119dae28]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
----
- kuksa_viss_client/Dockerfile | 2 +-
- kuksa_viss_client/__init__.py | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/kuksa_viss_client/Dockerfile b/kuksa_viss_client/Dockerfile
-index ae62e50..bf0f49e 100644
---- a/kuksa_viss_client/Dockerfile
-+++ b/kuksa_viss_client/Dockerfile
-@@ -18,7 +18,7 @@ RUN python -m build
- RUN mkdir /kuksa_viss_client
- RUN pip install --target /kuksa_viss_client --no-cache-dir dist/*.whl
-
--FROM python:3.8-alpine
-+FROM python:3.10-alpine
-
- COPY --from=build /kuksa_viss_client /kuksa_viss_client
- ENV PYTHONUNBUFFERED=yes
-diff --git a/kuksa_viss_client/__init__.py b/kuksa_viss_client/__init__.py
-index 69cc996..ab29fb9 100644
---- a/kuksa_viss_client/__init__.py
-+++ b/kuksa_viss_client/__init__.py
-@@ -227,9 +227,12 @@ class KuksaClientThread(threading.Thread):
-
- async def mainLoop(self):
- if not self.insecure:
-- context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-+ context = ssl.create_default_context()
- context.load_cert_chain(certfile=self.certificate, keyfile=self.keyfile)
- context.load_verify_locations(cafile=self.cacertificate)
-+ # Certificates in ../kuksa_certificates does not contain the IP address used for
-+ # connection to server so hostname check must be disabled
-+ context.check_hostname = False
- try:
- print("connect to wss://"+self.serverIP+":"+str(self.serverPort))
- async with websockets.connect("wss://"+self.serverIP+":"+str(self.serverPort), ssl=context) as ws:
---
-2.34.1
-