From d21658f508c70859907f4c1687b623cadaf2c3d3 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 20 Nov 2024 19:14:22 -0500 Subject: 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30533 --- .../python/python3-annotated-types_%.bbappend | 1 + .../python3-annotated-types_agl-kuksa-val.inc | 1 + .../python/python3-anytree_2.8.0.bb | 16 -------- .../python/python3-anytree_2.9.2.bb | 16 ++++++++ .../python/python3-pydantic-core_%.bbappend | 1 + .../python/python3-pydantic-core_agl-kuksa-val.inc | 1 + .../python/python3-pydantic_%.bbappend | 1 + .../python/python3-pydantic_agl-kuksa-val.inc | 1 + .../python/python3-rich-click_1.8.4.bb | 17 +++++++++ .../python/python3-rich_%.bbappend | 1 + .../python/python3-rich_agl-kuksa-val.inc | 1 + .../recipes-support/vss/vss-tools_4.2.bb | 29 --------------- .../recipes-support/vss/vss-tools_5.0.bb | 31 ++++++++++++++++ meta-agl-kuksa-val/recipes-support/vss/vss.inc | 6 +-- meta-agl-kuksa-val/recipes-support/vss/vss_4.2.bb | 43 ---------------------- meta-agl-kuksa-val/recipes-support/vss/vss_5.0.bb | 43 ++++++++++++++++++++++ 16 files changed, 118 insertions(+), 91 deletions(-) create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_%.bbappend create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-annotated-types_agl-kuksa-val.inc delete mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.8.0.bb create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.9.2.bb create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_%.bbappend create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic-core_agl-kuksa-val.inc create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_%.bbappend create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-pydantic_agl-kuksa-val.inc create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-rich-click_1.8.4.bb create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-rich_%.bbappend create mode 100644 meta-agl-kuksa-val/recipes-devtools/python/python3-rich_agl-kuksa-val.inc delete mode 100644 meta-agl-kuksa-val/recipes-support/vss/vss-tools_4.2.bb create mode 100644 meta-agl-kuksa-val/recipes-support/vss/vss-tools_5.0.bb delete mode 100644 meta-agl-kuksa-val/recipes-support/vss/vss_4.2.bb create mode 100644 meta-agl-kuksa-val/recipes-support/vss/vss_5.0.bb 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.8.0.bb deleted file mode 100644 index 1b4628a9a..000000000 --- a/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.8.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Powerful and Lightweight Python Tree Data Structure" -HOMEPAGE = "https://github.com/c0fec0de/anytree" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -PYPI_PACKAGE = "anytree" - -SRC_URI[sha256sum] = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab" - -inherit pypi setuptools3 - -do_install:append () { - rm -f ${D}${prefix}/LICENSE -} - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.9.2.bb b/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.9.2.bb new file mode 100644 index 000000000..7965ea8df --- /dev/null +++ b/meta-agl-kuksa-val/recipes-devtools/python/python3-anytree_2.9.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "Powerful and Lightweight Python Tree Data Structure" +HOMEPAGE = "https://github.com/c0fec0de/anytree" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +PYPI_PACKAGE = "anytree" + +SRC_URI[sha256sum] = "e02af617d41ede47f922e5deea0e4efc3201c6e7330cfc1265409762e5381283" + +inherit pypi python_poetry_core + +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_4.2.bb deleted file mode 100644 index 62f78f07e..000000000 --- a/meta-agl-kuksa-val/recipes-support/vss/vss-tools_4.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "COVESA Vehicle Signal Specification tooling." -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" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -RDEPENDS:${PN} += " \ - python3-core \ - python3-ctypes \ - python3-email \ - python3-importlib-metadata \ - python3-json \ - python3-logging \ - python3-netclient \ - python3-pkg-resources \ - python3-anytree \ - python3-deprecation \ - python3-graphql-core \ - python3-pyyaml \ - python3-six \ -" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-agl-kuksa-val/recipes-support/vss/vss-tools_5.0.bb b/meta-agl-kuksa-val/recipes-support/vss/vss-tools_5.0.bb new file mode 100644 index 000000000..7743efbd7 --- /dev/null +++ b/meta-agl-kuksa-val/recipes-support/vss/vss-tools_5.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "COVESA Vehicle Signal Specification tooling." +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/5.0" +SRCREV = "9ba7f40c0995358a293aab729d57739c3e9b2829" + +S = "${WORKDIR}/git" + +inherit python_poetry_core + +RDEPENDS:${PN} += " \ + python3-core \ + python3-ctypes \ + python3-email \ + python3-importlib-metadata \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-pkg-resources \ + python3-anytree \ + python3-deprecation \ + 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_4.2.bb deleted file mode 100644 index 053516629..000000000 --- a/meta-agl-kuksa-val/recipes-support/vss/vss_4.2.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Vehicle Signal Specification" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" - -DEPENDS = "vss-tools-native" - -inherit allarch update-alternatives - -require vss.inc - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" - -EXTRA_OEMAKE = "TOOLSDIR=${STAGING_BINDIR_NATIVE}" - -do_compile() { - oe_runmake json -} - -do_install() { - # Cannot use the "install" target in the project Makefile, as it is - # intended for setting the repo up for builds. - # For now, just the generated JSON is installed. It is possible that - # 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/ -} - -# NOTE: -# A virtual RPROVIDES is not used for now, as packages such as KUKSA.val -# provide their own copies of the VSS JSON, so we can install this one -# and any alternatives in parallel and point e.g. KUKSA.val at the desired -# file with a configuration change. This may be worth revisiting down the -# road. - -ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json" - -ALTERNATIVE:${PN} = "vss.json" -ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}.json" diff --git a/meta-agl-kuksa-val/recipes-support/vss/vss_5.0.bb b/meta-agl-kuksa-val/recipes-support/vss/vss_5.0.bb new file mode 100644 index 000000000..c400ed66f --- /dev/null +++ b/meta-agl-kuksa-val/recipes-support/vss/vss_5.0.bb @@ -0,0 +1,43 @@ +SUMMARY = "Vehicle Signal Specification" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" + +DEPENDS = "vss-tools-native" + +inherit allarch update-alternatives + +require vss.inc + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +EXTRA_OEMAKE = "TOOLSDIR=${STAGING_BINDIR_NATIVE}" + +do_compile() { + oe_runmake json +} + +do_install() { + # Cannot use the "install" target in the project Makefile, as it is + # intended for setting the repo up for builds. + # For now, just the generated JSON is installed. It is possible that + # 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.json ${D}${datadir}/vss/vss_${PV}.json +} + +# NOTE: +# A virtual RPROVIDES is not used for now, as packages such as KUKSA.val +# provide their own copies of the VSS JSON, so we can install this one +# and any alternatives in parallel and point e.g. KUKSA.val at the desired +# file with a configuration change. This may be worth revisiting down the +# road. + +ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json" + +ALTERNATIVE:${PN} = "vss.json" +ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_${PV}.json" -- cgit