summaryrefslogtreecommitdiffstats
path: root/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-06-26 15:22:14 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-06-27 09:53:39 +0000
commit2460f6ac99d834f00dfa6e26546c41eac6cd38c9 (patch)
tree1e9d6714f63bc29f8e31e5007c162e1df3d6406b /meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client
parentdbb228360317872e7c6fcbd96faaf404535130c3 (diff)
Add meta-agl-kuksa-val
Add new meta-agl-kuksa-val layer, and populate it with the base KUKSA.val databroker and VSS schema recipes from meta-agl, as well as the recipes for the Python modules they depend on. Additional changes: - Installation of AGL-specific configuration has been removed from the kuksa-can-provider recipe. It now packages the upstream example/test configuration in a new kuksa-can-provider-conf-example package that can be replaced via the RPROVIDES scheme. Some minor tweaks for paths are made to the upstream .ini file to match FHS expectations. Bug-AGL: SPEC-5136 Change-Id: I3128a223f4fcf16e496cb27e26afcaee0a28979a Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30040 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 'meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client')
-rw-r--r--meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch161
-rw-r--r--meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0002-Tweak-grpcio-tools-requirement.patch30
2 files changed, 191 insertions, 0 deletions
diff --git a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch
new file mode 100644
index 000000000..3f5527384
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch
@@ -0,0 +1,161 @@
+From acb2bbff3de6e9f0bafb8b96a339820a9ddfadca Mon Sep 17 00:00:00 2001
+From: Scott Murray <scott.murray@konsulko.com>
+Date: Mon, 27 Nov 2023 15:31:02 -0500
+Subject: [PATCH 1/2] kuksa-client: Update cmd2 completer usage
+
+Update cmd2 usage to avoid using internal methods and fix breakage
+with newer versions of the cmd2 module.
+
+Upstream-Status: pending
+
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+---
+ kuksa-client/kuksa_client/__main__.py | 33 +++++++++++++--------------
+ 1 file changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/kuksa-client/kuksa_client/__main__.py b/kuksa-client/kuksa_client/__main__.py
+index 2b29623..7061ec1 100755
+--- a/kuksa-client/kuksa_client/__main__.py
++++ b/kuksa-client/kuksa_client/__main__.py
+@@ -36,7 +36,6 @@ from cmd2 import CompletionItem
+ from cmd2 import with_argparser
+ from cmd2 import with_category
+ from cmd2 import constants
+-from cmd2.utils import basic_complete
+ from urllib.parse import urlparse
+
+ from kuksa_client import KuksaClientThread
+@@ -151,7 +150,7 @@ class TestClient(Cmd):
+ self.pathCompletionItems = []
+ for sub_id in self.subscribeIds:
+ self.pathCompletionItems.append(CompletionItem(sub_id))
+- return basic_complete(text, line, begidx, endidx, self.pathCompletionItems)
++ return Cmd.basic_complete(self, text, line, begidx, endidx, self.pathCompletionItems)
+
+ COMM_SETUP_COMMANDS = "Communication Set-up Commands"
+ VSS_COMMANDS = "Kuksa Interaction Commands (Supported by both KUKSA Databroker and KUKSA Server)"
+@@ -167,19 +166,19 @@ class TestClient(Cmd):
+
+ ap_disconnect = argparse.ArgumentParser()
+ ap_authorize = argparse.ArgumentParser()
+- tokenfile_completer_method = functools.partial(
++ tokenfile_completer = functools.partial(
+ Cmd.path_complete,
+ path_filter=lambda path: (os.path.isdir(path) or path.endswith(".token")),
+ )
+ ap_authorize.add_argument(
+ "token_or_tokenfile",
+ help="JWT(or the file storing the token) for authorizing the client.",
+- completer_method=tokenfile_completer_method,
++ completer=tokenfile_completer,
+ )
+
+ ap_setValue = argparse.ArgumentParser()
+ ap_setValue.add_argument(
+- "Path", help="Path to be set", completer_method=path_completer
++ "Path", help="Path to be set", completer=path_completer
+ )
+ ap_setValue.add_argument("Value", nargs="+", help="Value to be set")
+ ap_setValue.add_argument(
+@@ -199,7 +198,7 @@ class TestClient(Cmd):
+
+ ap_getValue = argparse.ArgumentParser()
+ ap_getValue.add_argument(
+- "Path", help="Path to be read", completer_method=path_completer
++ "Path", help="Path to be read", completer=path_completer
+ )
+ ap_getValue.add_argument(
+ "-a", "--attribute", help="Attribute to be get", default="value"
+@@ -210,7 +209,7 @@ class TestClient(Cmd):
+ "Path",
+ help="Path whose value is to be read",
+ nargs="+",
+- completer_method=path_completer,
++ completer=path_completer,
+ )
+ ap_getValues.add_argument(
+ "-a", "--attribute", help="Attribute to be get", default="value"
+@@ -220,7 +219,7 @@ class TestClient(Cmd):
+ ap_setTargetValue.add_argument(
+ "Path",
+ help="Path whose target value to be set",
+- completer_method=path_completer,
++ completer=path_completer,
+ )
+ ap_setTargetValue.add_argument("Value", help="Value to be set")
+
+@@ -236,7 +235,7 @@ class TestClient(Cmd):
+ ap_getTargetValue.add_argument(
+ "Path",
+ help="Path whose target value is to be read",
+- completer_method=path_completer,
++ completer=path_completer,
+ )
+
+ ap_getTargetValues = argparse.ArgumentParser()
+@@ -244,12 +243,12 @@ class TestClient(Cmd):
+ "Path",
+ help="Path whose target value is to be read",
+ nargs="+",
+- completer_method=path_completer,
++ completer=path_completer,
+ )
+
+ ap_subscribe = argparse.ArgumentParser()
+ ap_subscribe.add_argument(
+- "Path", help="Path to subscribe to", completer_method=path_completer
++ "Path", help="Path to subscribe to", completer=path_completer
+ )
+ ap_subscribe.add_argument(
+ "-a", "--attribute", help="Attribute to subscribe to", default="value"
+@@ -264,7 +263,7 @@ class TestClient(Cmd):
+
+ ap_subscribeMultiple = argparse.ArgumentParser()
+ ap_subscribeMultiple.add_argument(
+- "Path", help="Path to subscribe to", nargs="+", completer_method=path_completer
++ "Path", help="Path to subscribe to", nargs="+", completer=path_completer
+ )
+ ap_subscribeMultiple.add_argument(
+ "-a", "--attribute", help="Attribute to subscribe to", default="value"
+@@ -280,18 +279,18 @@ class TestClient(Cmd):
+ ap_unsubscribe.add_argument(
+ "SubscribeId",
+ help="Corresponding subscription Id",
+- completer_method=subscriptionIdCompleter,
++ completer=subscriptionIdCompleter,
+ )
+
+ ap_getMetaData = argparse.ArgumentParser()
+ ap_getMetaData.add_argument(
+ "Path",
+ help="Path whose metadata is to be read",
+- completer_method=path_completer,
++ completer=path_completer,
+ )
+ ap_updateMetaData = argparse.ArgumentParser()
+ ap_updateMetaData.add_argument(
+- "Path", help="Path whose MetaData is to update", completer_method=path_completer
++ "Path", help="Path whose MetaData is to update", completer=path_completer
+ )
+ ap_updateMetaData.add_argument(
+ "Json",
+@@ -300,14 +299,14 @@ class TestClient(Cmd):
+ )
+
+ ap_updateVSSTree = argparse.ArgumentParser()
+- jsonfile_completer_method = functools.partial(
++ jsonfile_completer = functools.partial(
+ Cmd.path_complete,
+ path_filter=lambda path: (os.path.isdir(path) or path.endswith(".json")),
+ )
+ ap_updateVSSTree.add_argument(
+ "Json",
+ help="Json tree to update VSS",
+- completer_method=jsonfile_completer_method,
++ completer=jsonfile_completer,
+ )
+
+ # Constructor, request names after protocol to avoid errors
+--
+2.44.0
+
diff --git a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0002-Tweak-grpcio-tools-requirement.patch b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0002-Tweak-grpcio-tools-requirement.patch
new file mode 100644
index 000000000..fef2265b2
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0002-Tweak-grpcio-tools-requirement.patch
@@ -0,0 +1,30 @@
+From 43823a52a9cb25d906542d15dc207f6516579aa3 Mon Sep 17 00:00:00 2001
+From: Scott Murray <scott.murray@konsulko.com>
+Date: Tue, 18 Jun 2024 16:08:13 -0400
+Subject: [PATCH 2/2] Tweak grpcio-tools requirement
+
+Lower grpcio-tools requirement to 1.62.0 so building on YP scarthgap
+is possible.
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+---
+ kuksa-client/pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kuksa-client/pyproject.toml b/kuksa-client/pyproject.toml
+index a7afaca..a8d70ff 100644
+--- a/kuksa-client/pyproject.toml
++++ b/kuksa-client/pyproject.toml
+@@ -1,6 +1,6 @@
+ [build-system]
+ requires = [
+- "grpcio-tools>=1.63.0",
++ "grpcio-tools>=1.62.0",
+ "setuptools>=42",
+ "setuptools-git-versioning",
+ "wheel",
+--
+2.44.0
+