meta-agl-kuksa-val: upgrade to VSS 5.0

Update the vss-tools and vss recipes to upgrade to the 5.0 release.
This requires some updates to the supplied Python module recipes
for vss-tools, including some new bbappends to enable native support
for a few modules.

Bug-AGL: SPEC-5299

Change-Id: Idb6a5f4d28a05dc7040a09465f6d903631bcadef
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30533

13 files changed, 40 insertions, 13 deletions

diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_%.bbappend b/meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_%.bbappend
new file mode 100644
index 000000000..d8e10b100
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agl-kuksa-val', 'python3-annotated-types_agl-kuksa-val.inc', '', d)}
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_agl-kuksa-val.inc b/meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_agl-kuksa-val.inc
new file mode 100644
index 000000000..d6f586995
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_agl-kuksa-val.inc
@@ -0,0 +1 @@
+BBCLASSEXTEND += "native"
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.8.0.bb b/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.9.2.bb
index 1b4628a9a..7965ea8df 100644
--- a/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.8.0.bb
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.9.2.bb
@@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 PYPI_PACKAGE = "anytree"
 
-SRC_URI[sha256sum] = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"
+SRC_URI[sha256sum] = "e02af617d41ede47f922e5deea0e4efc3201c6e7330cfc1265409762e5381283"
 
-inherit pypi setuptools3
+inherit pypi python_poetry_core
 
-do_install:append () {
-    rm -f ${D}${prefix}/LICENSE
-}
+RDEPENDS:${PN} += " \
+    python3-six \
+"
 
 BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_%.bbappend b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_%.bbappend
new file mode 100644
index 000000000..23442af74
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agl-kuksa-val', 'python3-pydantic-core_agl-kuksa-val.inc', '', d)}
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_agl-kuksa-val.inc b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_agl-kuksa-val.inc
new file mode 100644
index 000000000..d6f586995
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_agl-kuksa-val.inc
@@ -0,0 +1 @@
+BBCLASSEXTEND += "native"
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_%.bbappend b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_%.bbappend
new file mode 100644
index 000000000..5aa1fc00e
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agl-kuksa-val', 'python3-pydantic_agl-kuksa-val.inc', '', d)}
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_agl-kuksa-val.inc b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_agl-kuksa-val.inc
new file mode 100644
index 000000000..d6f586995
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_agl-kuksa-val.inc
@@ -0,0 +1 @@
+BBCLASSEXTEND += "native"
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-rich-click_1.8.4.bb b/meta-agl-kuksa-val/recipes-devtools/python/python3-rich-click_1.8.4.bb
new file mode 100644
index 000000000..e442774a9
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-rich-click_1.8.4.bb
@@ -0,0 +1,17 @@
+SUMMARY = "A shim around Click that renders help output nicely using Rich."
+HOMEPAGE = "https://github.com/ewels/rich-click"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5372b77c3720be60b7eff9a9a5c0000d"
+
+PYPI_PACKAGE = "rich_click"
+
+SRC_URI[sha256sum] = "0f49471f04439269d0e66a6f43120f52d11d594869a2a0be600cfb12eb0616b9"
+
+inherit pypi python_setuptools_build_meta
+
+RDEPENDS:${PN} += " \
+    python3-click \
+    python3-rich \
+"
+
+BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-rich_%.bbappend b/meta-agl-kuksa-val/recipes-devtools/python/python3-rich_%.bbappend
new file mode 100644
index 000000000..221228c34
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-rich_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agl-kuksa-val', 'python3-rich_agl-kuksa-val.inc', '', d)}
diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-rich_agl-kuksa-val.inc b/meta-agl-kuksa-val/recipes-devtools/python/python3-rich_agl-kuksa-val.inc
new file mode 100644
index 000000000..d6f586995
--- /dev/null
+++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-rich_agl-kuksa-val.inc
@@ -0,0 +1 @@
+BBCLASSEXTEND += "native"
diff --git a/meta-agl-kuksa-val/recipes-support/vss/vss-tools_4.2.bb b/meta-agl-kuksa-val/recipes-support/vss/vss-tools_5.0.bb
index 62f78f07e..7743efbd7 100644
--- a/meta-agl-kuksa-val/recipes-support/vss/vss-tools_4.2.bb
+++ b/meta-agl-kuksa-val/recipes-support/vss/vss-tools_5.0.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/COVESA/vss-tools"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-SRC_URI = "git://github.com/COVESA/vss-tools.git;protocol=https;branch=release/4.2"
-SRCREV = "b350788d6dd16942e987fdb9e8b8b3b403fe23c6"
+SRC_URI = "git://github.com/COVESA/vss-tools.git;protocol=https;branch=release/5.0"
+SRCREV = "9ba7f40c0995358a293aab729d57739c3e9b2829"
 
 S = "${WORKDIR}/git"
 
-inherit setuptools3
+inherit python_poetry_core
 
 RDEPENDS:${PN} += " \
     python3-core \
@@ -24,6 +24,8 @@ RDEPENDS:${PN} += " \
     python3-graphql-core \
     python3-pyyaml \
     python3-six \
+    python3-pydantic \
+    python3-rich-click \
 "
 
 BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-agl-kuksa-val/recipes-support/vss/vss.inc b/meta-agl-kuksa-val/recipes-support/vss/vss.inc
index aab950bee..7f12d3b61 100644
--- a/meta-agl-kuksa-val/recipes-support/vss/vss.inc
+++ b/meta-agl-kuksa-val/recipes-support/vss/vss.inc
@@ -1,5 +1,5 @@
-SRC_URI = "git://github.com/COVESA/vehicle_signal_specification.git;branch=release/4.2;protocol=https"
-# v4.2
-SRCREV = "6024c4b29065b37c074649a1a65396b9d4de9b55"
+SRC_URI = "git://github.com/COVESA/vehicle_signal_specification.git;branch=release/5.0;protocol=https"
+# v5.0
+SRCREV = "f23ba53be78a8bf2b8df2496bbfccb2860913892"
 
 S = "${WORKDIR}/git"
diff --git a/meta-agl-kuksa-val/recipes-support/vss/vss_4.2.bb b/meta-agl-kuksa-val/recipes-support/vss/vss_5.0.bb
index 053516629..c400ed66f 100644
--- a/meta-agl-kuksa-val/recipes-support/vss/vss_4.2.bb
+++ b/meta-agl-kuksa-val/recipes-support/vss/vss_5.0.bb
@@ -27,7 +27,7 @@ do_install() {
     # installing the vspec files somewhere as a development package may
     # be useful, but for now things will be kept simple.
     install -d ${D}${datadir}/vss
-    install -m 0644 ${S}/vss_rel_${PV}.json ${D}${datadir}/vss/
+    install -m 0644 ${S}/vss.json ${D}${datadir}/vss/vss_${PV}.json
 }
 
 # NOTE:
@@ -40,4 +40,4 @@ do_install() {
 ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json"
 
 ALTERNATIVE:${PN} = "vss.json"
-ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}.json"
+ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_${PV}.json"