diff options
author | Scott Murray <scott.murray@konsulko.com> | 2024-06-26 15:11:03 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-06-27 15:49:13 +0000 |
commit | 7a356a7e84f6fc7b67a725cfb27d432b782ab43e (patch) | |
tree | 423cacaa2598cbccdb80e9f85f5496c7818e338d /recipes-connectivity/vss | |
parent | 7618c4a08229834883c8ade90e52c8c41eb81901 (diff) |
Move base VSS and KUKSA.val recipes to meta-agl-kuksa-val
Remove base VSS and KUKSA.val recipes, as they are moving to a new
meta-agl-kuksa-val layer in the meta-agl repository. The recipes
for the Python modules they depend on have also been moved.
Additional changes:
- A new kuksa-can-provider-conf-agl recipe has been added to install
our common AGL-specific kuksa-can-provider configuration. The
intent is that the kuksa-can-provider in meta-agl-kuksa-val not be
dependent on our demo configuration choices.
- The other kuksa-can-provider configuration recipes have been
tweaked to mark them as allarch.
- The python3-argparse-addons recipe and python3-cantools bbappend
that used it have been removed, as it looks like it is no longer
required.
- The dangling kuksa-val-agl-demo-cluster recipe has been removed,
it was missed in the previous kuksa-val server removal.
Bug-AGL: SPEC-5136
Change-Id: I8c5aa556a796852c5ee3d8c26e045a089911f37e
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30038
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account
Diffstat (limited to 'recipes-connectivity/vss')
-rw-r--r-- | recipes-connectivity/vss/vss-agl_4.2.bb | 2 | ||||
-rw-r--r-- | recipes-connectivity/vss/vss-tools_4.2.bb | 29 | ||||
-rw-r--r-- | recipes-connectivity/vss/vss.inc | 5 | ||||
-rw-r--r-- | recipes-connectivity/vss/vss_4.2.bb | 43 |
4 files changed, 1 insertions, 78 deletions
diff --git a/recipes-connectivity/vss/vss-agl_4.2.bb b/recipes-connectivity/vss/vss-agl_4.2.bb index 4423a9806..981ba1645 100644 --- a/recipes-connectivity/vss/vss-agl_4.2.bb +++ b/recipes-connectivity/vss/vss-agl_4.2.bb @@ -6,7 +6,7 @@ DEPENDS = "vss-tools-native" inherit allarch update-alternatives -require vss.inc +require recipes-support/vss/vss.inc SRC_URI += "file://agl_vss_overlay.vspec \ file://agl_vss_overlay.vspec.control-panel \ diff --git a/recipes-connectivity/vss/vss-tools_4.2.bb b/recipes-connectivity/vss/vss-tools_4.2.bb deleted file mode 100644 index 62f78f07e..000000000 --- a/recipes-connectivity/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/recipes-connectivity/vss/vss.inc b/recipes-connectivity/vss/vss.inc deleted file mode 100644 index aab950bee..000000000 --- a/recipes-connectivity/vss/vss.inc +++ /dev/null @@ -1,5 +0,0 @@ -SRC_URI = "git://github.com/COVESA/vehicle_signal_specification.git;branch=release/4.2;protocol=https" -# v4.2 -SRCREV = "6024c4b29065b37c074649a1a65396b9d4de9b55" - -S = "${WORKDIR}/git" diff --git a/recipes-connectivity/vss/vss_4.2.bb b/recipes-connectivity/vss/vss_4.2.bb deleted file mode 100644 index 053516629..000000000 --- a/recipes-connectivity/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<pver>\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" |