diff options
author | Scott Murray <scott.murray@konsulko.com> | 2024-06-18 16:13:35 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2024-06-20 02:04:33 +0000 |
commit | d9f9ddd177a57110d9c67ea438436c3160f8e429 (patch) | |
tree | 057eb6ee90e025743c374d428138b57358f7d554 /recipes-connectivity/kuksa-val/kuksa-client/0002-kuksa-client-Add-external-certificates-support.patch | |
parent | d0078bc67f253d971e94f13426ecf8bb10079784 (diff) |
kuksa-client: Upgrade to 0.4.3
Upgrade kuksa-client to 0.4.3 release. One of our local patches has
been dropped as it is no longer applicable, and a new one has been
added to allow building with the version of python3-grpcio-tools
available in YP scarthgap.
Bug-AGL: SPEC-5179
Change-Id: I6fb3ff8cd63cec924dc4180ac4f44d3ac0c1996f
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30001
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'recipes-connectivity/kuksa-val/kuksa-client/0002-kuksa-client-Add-external-certificates-support.patch')
-rw-r--r-- | recipes-connectivity/kuksa-val/kuksa-client/0002-kuksa-client-Add-external-certificates-support.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-client/0002-kuksa-client-Add-external-certificates-support.patch b/recipes-connectivity/kuksa-val/kuksa-client/0002-kuksa-client-Add-external-certificates-support.patch deleted file mode 100644 index adc19e6f3..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-client/0002-kuksa-client-Add-external-certificates-support.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3f3dbe36b4adcdd7c3cef41980058331e79ce620 Mon Sep 17 00:00:00 2001 -From: Scott Murray <scott.murray@konsulko.com> -Date: Sat, 5 Aug 2023 13:27:44 -0400 -Subject: [PATCH 2/2] kuksa_viss_client: Add external certificates support - -Tweak the definition of __certificate_dir__ in the kuksa_certificates -package, and certificate location logic in the client library to allow -picking up alternative certificates from /etc/kuksa-certificates or -/etc/kuksa-val before falling back to the shipped defaults. The -intent is to allow packagers to more straighhtforwardly use their own -certificates with both the server and clients. - -Upstream-Status: pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - kuksa-client/kuksa_client/cli_backend/__init__.py | 2 +- - kuksa-client/kuksa_client/kuksa_server_certificates/__init__.py | 7 ++++++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/kuksa-client/kuksa_client/cli_backend/__init__.py b/kuksa-client/kuksa_client/cli_backend/__init__.py -index 2cfe51e..96d94f2 100644 ---- a/kuksa-client/kuksa_client/cli_backend/__init__.py -+++ b/kuksa-client/kuksa_client/cli_backend/__init__.py -@@ -28,7 +28,7 @@ class Backend: - self.insecure = config.getboolean('insecure', False) - except AttributeError: - self.insecure = config.get('insecure', False) -- self.default_cert_path = pathlib.Path(kuksa_server_certificates.__path__[0]) -+ self.default_cert_path = pathlib.Path(kuksa_server_certificates.__certificate_dir__) - self.cacertificate = config.get( - 'cacertificate', str(self.default_cert_path / 'CA.pem')) - self.certificate = config.get('certificate', str( -diff --git a/kuksa-client/kuksa_client/kuksa_server_certificates/__init__.py b/kuksa-client/kuksa_client/kuksa_server_certificates/__init__.py -index 22ccd3f..8323868 100644 ---- a/kuksa-client/kuksa_client/kuksa_server_certificates/__init__.py -+++ b/kuksa-client/kuksa_client/kuksa_server_certificates/__init__.py -@@ -2,4 +2,9 @@ import os - - from kuksa_client._metadata import * - --__certificate_dir__= os.path.dirname(os.path.realpath(__file__)) -+if os.path.isdir("/etc/kuksa-certificates"): -+ __certificate_dir__= "/etc/kuksa-certificates" -+elif os.path.isdir("/etc/kuksa-val"): -+ __certificate_dir__= "/etc/kuksa-val" -+else: -+ __certificate_dir__= os.path.dirname(os.path.realpath(__file__)) --- -2.41.0 - |