From e14d6f4b1b25af2fce6af1245b1b6dbc650d3931 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 18 Jun 2024 16:44:10 -0400 Subject: vss: Upgrade to 0.4.2 Upgrade recipes for stock VSS schema and AGL's tweaked copy for demos to 0.4.2 release. Bug-AGL: SPEC-5180 Change-Id: I0f90742c3220ab460932ebf8afb19d0498e43a51 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30004 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- recipes-connectivity/vss/vss-agl_4.0.bb | 65 --------------------------------- recipes-connectivity/vss/vss-agl_4.2.bb | 64 ++++++++++++++++++++++++++++++++ recipes-connectivity/vss/vss.inc | 6 +-- recipes-connectivity/vss/vss_4.0.bb | 43 ---------------------- recipes-connectivity/vss/vss_4.2.bb | 43 ++++++++++++++++++++++ 5 files changed, 110 insertions(+), 111 deletions(-) delete mode 100644 recipes-connectivity/vss/vss-agl_4.0.bb create mode 100644 recipes-connectivity/vss/vss-agl_4.2.bb delete mode 100644 recipes-connectivity/vss/vss_4.0.bb create mode 100644 recipes-connectivity/vss/vss_4.2.bb (limited to 'recipes-connectivity/vss') diff --git a/recipes-connectivity/vss/vss-agl_4.0.bb b/recipes-connectivity/vss/vss-agl_4.0.bb deleted file mode 100644 index 00d83a7a5..000000000 --- a/recipes-connectivity/vss/vss-agl_4.0.bb +++ /dev/null @@ -1,65 +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 \ - file://agl_vss_overlay.vspec.control-panel \ - file://agl_vss_overlay.vspec.gw-control-panel \ - file://agl_vss_overlay.vspec.gw-hardware \ -" -# 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 dbc2vss,vss2dbc -o ${WORKDIR}/agl_vss_overlay.vspec --no-uuid --json-pretty" -VSPEC2JSON_OPTS = "-e dbc2vss,vss2dbc --no-uuid --json-pretty" - -do_compile() { - vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl.json - vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-control-panel.json - vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.gw-control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-control-panel.json - vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.gw-hardware -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-hardware.json -} - -do_install() { - install -d ${D}${datadir}/vss - install -m 0644 vss_rel_${PV}-agl.json ${D}${datadir}/vss/ - install -m 0644 vss_rel_${PV}-agl-control-panel.json ${D}${datadir}/vss/ - install -m 0644 vss_rel_${PV}-agl-gw-control-panel.json ${D}${datadir}/vss/ - install -m 0644 vss_rel_${PV}-agl-gw-hardware.json ${D}${datadir}/vss/ -} - -PACKAGE_BEFORE_PN += "${PN}-control-panel ${PN}-gw-control-panel ${PN}-gw-hardware" - -ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json" - -ALTERNATIVE:${PN} = "vss.json" -ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}-agl.json" -ALTERNATIVE_PRIORITY_${PN} = "20" -FILES:${PN} += "${datadir}/vss/vss_rel_${PV}-agl.json" - -ALTERNATIVE:${PN}-control-panel = "vss.json" -ALTERNATIVE_TARGET_${PN}-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json" -ALTERNATIVE_PRIORITY_${PN}-control-panel = "30" -FILES:${PN}-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json" - -ALTERNATIVE:${PN}-gw-hardware = "vss.json" -ALTERNATIVE_TARGET_${PN}-gw-hardware = "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json" -ALTERNATIVE_PRIORITY_${PN}-gw-hardware = "31" -FILES:${PN}-gw-hardware += "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json" - -# Higher priority than gw-hardware, as we want it to be the default -# if both are installed (as is the case with the full gateway demo -# setup). -ALTERNATIVE:${PN}-gw-control-panel = "vss.json" -ALTERNATIVE_TARGET_${PN}-gw-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json" -ALTERNATIVE_PRIORITY_${PN}-gw-control-panel = "32" -FILES:${PN}-gw-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json" diff --git a/recipes-connectivity/vss/vss-agl_4.2.bb b/recipes-connectivity/vss/vss-agl_4.2.bb new file mode 100644 index 000000000..4423a9806 --- /dev/null +++ b/recipes-connectivity/vss/vss-agl_4.2.bb @@ -0,0 +1,64 @@ +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 \ + file://agl_vss_overlay.vspec.control-panel \ + file://agl_vss_overlay.vspec.gw-control-panel \ + file://agl_vss_overlay.vspec.gw-hardware \ +" +# 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 dbc2vss,vss2dbc --no-uuid --json-pretty" + +do_compile() { + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl.json + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-control-panel.json + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.gw-control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-control-panel.json + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.gw-hardware -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-hardware.json +} + +do_install() { + install -d ${D}${datadir}/vss + install -m 0644 vss_rel_${PV}-agl.json ${D}${datadir}/vss/ + install -m 0644 vss_rel_${PV}-agl-control-panel.json ${D}${datadir}/vss/ + install -m 0644 vss_rel_${PV}-agl-gw-control-panel.json ${D}${datadir}/vss/ + install -m 0644 vss_rel_${PV}-agl-gw-hardware.json ${D}${datadir}/vss/ +} + +PACKAGE_BEFORE_PN += "${PN}-control-panel ${PN}-gw-control-panel ${PN}-gw-hardware" + +ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json" + +ALTERNATIVE:${PN} = "vss.json" +ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}-agl.json" +ALTERNATIVE_PRIORITY_${PN} = "20" +FILES:${PN} += "${datadir}/vss/vss_rel_${PV}-agl.json" + +ALTERNATIVE:${PN}-control-panel = "vss.json" +ALTERNATIVE_TARGET_${PN}-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json" +ALTERNATIVE_PRIORITY_${PN}-control-panel = "30" +FILES:${PN}-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json" + +ALTERNATIVE:${PN}-gw-hardware = "vss.json" +ALTERNATIVE_TARGET_${PN}-gw-hardware = "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json" +ALTERNATIVE_PRIORITY_${PN}-gw-hardware = "31" +FILES:${PN}-gw-hardware += "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json" + +# Higher priority than gw-hardware, as we want it to be the default +# if both are installed (as is the case with the full gateway demo +# setup). +ALTERNATIVE:${PN}-gw-control-panel = "vss.json" +ALTERNATIVE_TARGET_${PN}-gw-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json" +ALTERNATIVE_PRIORITY_${PN}-gw-control-panel = "32" +FILES:${PN}-gw-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json" diff --git a/recipes-connectivity/vss/vss.inc b/recipes-connectivity/vss/vss.inc index de2ffdcf1..aab950bee 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/4.0;protocol=https" -# v4.0 -SRCREV = "249dc03f3d75f96218c95483df0a32a2c3535964" +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.0.bb b/recipes-connectivity/vss/vss_4.0.bb deleted file mode 100644 index 053516629..000000000 --- a/recipes-connectivity/vss/vss_4.0.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/recipes-connectivity/vss/vss_4.2.bb b/recipes-connectivity/vss/vss_4.2.bb new file mode 100644 index 000000000..053516629 --- /dev/null +++ b/recipes-connectivity/vss/vss_4.2.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_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