From 39bdfed9e62d301fc139f04b608136345a5ff596 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 16 Nov 2023 23:54:38 +0900
Subject: Update to VSS 4.0

Update VSS tools and spec recipes from version 3.1.1 to 4.0.

Bug-AGL: SPEC-4970

Change-Id: I26a4a1ac3e149013b0ee71426beaba0c7d4731e4
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29416
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
---
 recipes-connectivity/vss/vss-agl_3.1.1.bb | 36 --------------------------
 recipes-connectivity/vss/vss-agl_4.0.bb   | 36 ++++++++++++++++++++++++++
 recipes-connectivity/vss/vss-tools_3.1.bb | 28 --------------------
 recipes-connectivity/vss/vss-tools_4.0.bb | 28 ++++++++++++++++++++
 recipes-connectivity/vss/vss.inc          |  6 ++---
 recipes-connectivity/vss/vss_3.1.1.bb     | 43 -------------------------------
 recipes-connectivity/vss/vss_4.0.bb       | 43 +++++++++++++++++++++++++++++++
 7 files changed, 110 insertions(+), 110 deletions(-)
 delete mode 100644 recipes-connectivity/vss/vss-agl_3.1.1.bb
 create mode 100644 recipes-connectivity/vss/vss-agl_4.0.bb
 delete mode 100644 recipes-connectivity/vss/vss-tools_3.1.bb
 create mode 100644 recipes-connectivity/vss/vss-tools_4.0.bb
 delete mode 100644 recipes-connectivity/vss/vss_3.1.1.bb
 create mode 100644 recipes-connectivity/vss/vss_4.0.bb

(limited to 'recipes-connectivity')

diff --git a/recipes-connectivity/vss/vss-agl_3.1.1.bb b/recipes-connectivity/vss/vss-agl_3.1.1.bb
deleted file mode 100644
index 83fb4b1a..00000000
--- a/recipes-connectivity/vss/vss-agl_3.1.1.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Vehicle Signal Specification with AGL overlays"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
-
-DEPENDS = "vss-tools-native"
-
-inherit allarch update-alternatives
-
-require vss.inc
-
-SRC_URI += "file://agl_vss_overlay.vspec"
-
-# Since we're not relying on the simple upstream repo Makefile, use
-# best practices and output into a separate directory.
-B = "${WORKDIR}/build"
-
-do_configure[noexec] = "1"
-
-VSPEC2JSON_OPTS = "-e dbc -o ${WORKDIR}/agl_vss_overlay.vspec --no-uuid --json-pretty"
-
-do_compile() {
-    vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl.json
-}
-
-do_install() {
-    install -d ${D}${datadir}/vss
-    install -m 0644 vss_rel_${PV}-agl.json ${D}${datadir}/vss/
-}
-
-ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json"
-
-ALTERNATIVE_PRIORITY = "20"
-ALTERNATIVE:${PN} = "vss.json"
-ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}-agl.json"
-
-FILES:${PN} += "${datadir}/vss/"
diff --git a/recipes-connectivity/vss/vss-agl_4.0.bb b/recipes-connectivity/vss/vss-agl_4.0.bb
new file mode 100644
index 00000000..83fb4b1a
--- /dev/null
+++ b/recipes-connectivity/vss/vss-agl_4.0.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Vehicle Signal Specification with AGL overlays"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
+
+DEPENDS = "vss-tools-native"
+
+inherit allarch update-alternatives
+
+require vss.inc
+
+SRC_URI += "file://agl_vss_overlay.vspec"
+
+# Since we're not relying on the simple upstream repo Makefile, use
+# best practices and output into a separate directory.
+B = "${WORKDIR}/build"
+
+do_configure[noexec] = "1"
+
+VSPEC2JSON_OPTS = "-e dbc -o ${WORKDIR}/agl_vss_overlay.vspec --no-uuid --json-pretty"
+
+do_compile() {
+    vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl.json
+}
+
+do_install() {
+    install -d ${D}${datadir}/vss
+    install -m 0644 vss_rel_${PV}-agl.json ${D}${datadir}/vss/
+}
+
+ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json"
+
+ALTERNATIVE_PRIORITY = "20"
+ALTERNATIVE:${PN} = "vss.json"
+ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}-agl.json"
+
+FILES:${PN} += "${datadir}/vss/"
diff --git a/recipes-connectivity/vss/vss-tools_3.1.bb b/recipes-connectivity/vss/vss-tools_3.1.bb
deleted file mode 100644
index b681d8dc..00000000
--- a/recipes-connectivity/vss/vss-tools_3.1.bb
+++ /dev/null
@@ -1,28 +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=master"
-SRCREV = "97148190d0f84bedfc933b8bc4391c0a7e7a099b"
-
-S = "${WORKDIR}/git"
-
-inherit setuptools3
-
-RDEPENDS:${PN} += " \
-    python3-core \
-    python3-ctypes \
-    python3-email \
-    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-tools_4.0.bb b/recipes-connectivity/vss/vss-tools_4.0.bb
new file mode 100644
index 00000000..432dd39b
--- /dev/null
+++ b/recipes-connectivity/vss/vss-tools_4.0.bb
@@ -0,0 +1,28 @@
+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=master"
+SRCREV = "784505f3005c2350d7861c3add030348e2d910e3"
+
+S = "${WORKDIR}/git"
+
+inherit setuptools3
+
+RDEPENDS:${PN} += " \
+    python3-core \
+    python3-ctypes \
+    python3-email \
+    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
index eb8f31c0..de2ffdcf 100644
--- a/recipes-connectivity/vss/vss.inc
+++ b/recipes-connectivity/vss/vss.inc
@@ -1,5 +1,5 @@
-SRC_URI = "git://github.com/COVESA/vehicle_signal_specification.git;branch=release/3.1;protocol=https"
-# v3.1.1
-SRCREV = "af4f6a4a67aa8e7bc87421bd90db7a2d99ea8856"
+SRC_URI = "git://github.com/COVESA/vehicle_signal_specification.git;branch=release/4.0;protocol=https"
+# v4.0
+SRCREV = "249dc03f3d75f96218c95483df0a32a2c3535964"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-connectivity/vss/vss_3.1.1.bb b/recipes-connectivity/vss/vss_3.1.1.bb
deleted file mode 100644
index 05351662..00000000
--- a/recipes-connectivity/vss/vss_3.1.1.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"
diff --git a/recipes-connectivity/vss/vss_4.0.bb b/recipes-connectivity/vss/vss_4.0.bb
new file mode 100644
index 00000000..05351662
--- /dev/null
+++ b/recipes-connectivity/vss/vss_4.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<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"
-- 
cgit 1.2.3-korg