From 60968c5ebd07365b96bbeeca32fa1ce8684daf51 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Fri, 17 Mar 2023 16:58:36 +0100 Subject: [PATCH 01/18] eclipse-kuksa: add recipe hvac-service-example Signed-off-by: Guenther Meyer --- .../0001-add-missing-shebang-line.patch | 19 +++++++++ .../eclipse-kuksa/hvac-service-example_git.bb | 40 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example/0001-add-missing-shebang-line.patch create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example_git.bb diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example/0001-add-missing-shebang-line.patch b/meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example/0001-add-missing-shebang-line.patch new file mode 100644 index 00000000..0db9ec75 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example/0001-add-missing-shebang-line.patch @@ -0,0 +1,19 @@ +From 4882362b8a53115cc87bffa173f9c799a6c6b1a2 Mon Sep 17 00:00:00 2001 +From: Guenther Meyer +Date: Fri, 17 Mar 2023 16:45:12 +0100 +Subject: [PATCH] add missing shebang line + +Signed-off-by: Guenther Meyer +--- + hvac_service/hvacservice.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hvac_service/hvacservice.py b/hvac_service/hvacservice.py +index bbcf120..393dca3 100644 +--- a/hvac_service/hvacservice.py ++++ b/hvac_service/hvacservice.py +@@ -1,3 +1,4 @@ ++#!/usr/bin/env python3 + # /******************************************************************************** + # * Copyright (c) 2022 Contributors to the Eclipse Foundation + # * diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example_git.bb b/meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example_git.bb new file mode 100644 index 00000000..0fbdeccf --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/hvac-service-example_git.bb @@ -0,0 +1,40 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "Eclipse Kuksa - HVAC Service Example" +DESCRIPTION = "The HVAC service is a service dummy allowing to control the state of the A/C and the desired cabin temperature." +HOMEPAGE = "https://github.com/eclipse/kuksa.val.services" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" + +SRC_URI = "git://github.com/eclipse/kuksa.val.services;protocol=https;branch=main \ + file://0001-add-missing-shebang-line.patch;patchdir=.. \ + " + +SRCREV = "07a2d28cedb1b367ae65a8e75939029f06bb24fc" +PV = "0.2.0+git${SRCPV}" + +S = "${WORKDIR}/git/hvac_service" + +inherit setuptools3 + +RDEPENDS:${PN} += "python3-asyncio python3-core python3-grpcio python3-logging python3-protobuf" + +do_install:append() { + install -d "${D}/${bindir}" + install -m 755 "${S}/hvacservice.py" "${D}/${bindir}/hvacservice" +} + +FILES:${PN} += " \ + ${bindir}/hvacservice \ +" From 5a0cad9c543ad11b4d2747b70b50295696fbda58 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Mon, 20 Mar 2023 12:06:05 +0100 Subject: [PATCH 02/18] sdv-containers: add recipe for hvac-service-example container Signed-off-by: Guenther Meyer --- .../packagegroup-sdv-container-images.bb | 1 + .../hvac-service-example-container_git.bb | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 meta-leda-distro-container/recipes-sdv/sdv-containers/hvac-service-example-container_git.bb diff --git a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb index 282a8944..cbe9aea8 100644 --- a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb +++ b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb @@ -18,4 +18,5 @@ inherit packagegroup RDEPENDS:${PN} = "\ self-update-agent-container \ + hvac-service-example-container \ " diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/hvac-service-example-container_git.bb b/meta-leda-distro-container/recipes-sdv/sdv-containers/hvac-service-example-container_git.bb new file mode 100644 index 00000000..81e033db --- /dev/null +++ b/meta-leda-distro-container/recipes-sdv/sdv-containers/hvac-service-example-container_git.bb @@ -0,0 +1,25 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "HVAC Service Example container image" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +require ../images/sdv-image-container.bb + +IMAGE_INSTALL += " \ + hvac-service-example \ + " + +OCI_IMAGE_TAG = "hvac-service-example:latest" +OCI_IMAGE_ENTRYPOINT = "/usr/bin/hvacservice" From 1dbc91e96cebdb6da3853007051e6236e99210c8 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Wed, 29 Mar 2023 15:00:10 +0200 Subject: [PATCH 03/18] leda-contrib: add recipe for vehicle-update-manager Signed-off-by: Guenther Meyer --- ...leda-contrib-vehicle-update-manager_git.bb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 meta-leda-components/recipes-sdv/eclipse-leda/leda-contrib-vehicle-update-manager_git.bb diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/leda-contrib-vehicle-update-manager_git.bb b/meta-leda-components/recipes-sdv/eclipse-leda/leda-contrib-vehicle-update-manager_git.bb new file mode 100644 index 00000000..40585c33 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-leda/leda-contrib-vehicle-update-manager_git.bb @@ -0,0 +1,34 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "SDV Vehicle Update Manager" +DESCRIPTION = "This is the vehicle update manager component used in the Software Defined Vehicle EDGE stack." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI = "git://${GO_IMPORT};protocol=https;branch=main" +SRCREV = "1d8dca55a755c4b3c7bc06eabfa06ad49e068a48" +PV = "0.1+git${SRCPV}" + +GO_IMPORT = "github.com/eclipse-leda/leda-contrib-vehicle-update-manager" + +S = "${WORKDIR}/git" + +inherit go-mod + +do_compile[network] = "1" + +do_install:append () { + install -d ${D}${localstatedir}/lib/updatemanagerd + mv ${D}${bindir}/daemon ${D}${bindir}/updatemanagerd +} From 40b1c6b04ede82e4d1974d2d56140463414d874c Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Wed, 29 Mar 2023 15:04:49 +0200 Subject: [PATCH 04/18] sdv-containers: add recipe for vehicle-update-manager container Signed-off-by: Guenther Meyer --- .../packagegroup-sdv-container-images.bb | 1 + .../vehicle-update-manager-container_git.bb | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 meta-leda-distro-container/recipes-sdv/sdv-containers/vehicle-update-manager-container_git.bb diff --git a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb index cbe9aea8..21e8f087 100644 --- a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb +++ b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb @@ -19,4 +19,5 @@ inherit packagegroup RDEPENDS:${PN} = "\ self-update-agent-container \ hvac-service-example-container \ + vehicle-update-manager-container \ " diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/vehicle-update-manager-container_git.bb b/meta-leda-distro-container/recipes-sdv/sdv-containers/vehicle-update-manager-container_git.bb new file mode 100644 index 00000000..ae108604 --- /dev/null +++ b/meta-leda-distro-container/recipes-sdv/sdv-containers/vehicle-update-manager-container_git.bb @@ -0,0 +1,26 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "Vehicle Update Manager container image" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +require ../images/sdv-image-container.bb + +IMAGE_INSTALL += " \ + busybox \ + leda-contrib-vehicle-update-manager \ + " + +OCI_IMAGE_TAG = "vehicle-update-manager:latest" +OCI_IMAGE_ENTRYPOINT = "/usr/bin/updatemanagerd" From a427fae6f1b13b6a5783e5d9e63f55a5051dcf31 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Wed, 29 Mar 2023 15:07:18 +0200 Subject: [PATCH 05/18] eclipse-kuksa: rename README.txt to README.md Signed-off-by: Guenther Meyer --- .../recipes-sdv/eclipse-kuksa/{readme.txt => README.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-leda-components/recipes-sdv/eclipse-kuksa/{readme.txt => README.md} (100%) diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/readme.txt b/meta-leda-components/recipes-sdv/eclipse-kuksa/README.md similarity index 100% rename from meta-leda-components/recipes-sdv/eclipse-kuksa/readme.txt rename to meta-leda-components/recipes-sdv/eclipse-kuksa/README.md From b5b8e245b54b102c7505da834d893cf7c6ac882d Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 11 May 2023 15:17:04 +0200 Subject: [PATCH 06/18] eclipse-kuksa: add recipe for seat-service-example Signed-off-by: Guenther Meyer --- .../0001-Remove-conan-dependency.patch | 36 +++++++++++++ .../seat-service-example/git/CMakeLists.txt | 1 + .../eclipse-kuksa/seat-service-example_git.bb | 54 +++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/0001-Remove-conan-dependency.patch create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/git/CMakeLists.txt create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example_git.bb diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/0001-Remove-conan-dependency.patch b/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/0001-Remove-conan-dependency.patch new file mode 100644 index 00000000..d81d6451 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/0001-Remove-conan-dependency.patch @@ -0,0 +1,36 @@ +From ed8681a122027078f7b032e59c595214dc996dab Mon Sep 17 00:00:00 2001 +From: Guenther Meyer +Date: Thu, 4 May 2023 16:49:19 +0200 +Subject: [PATCH] Remove conan dependency + +Signed-off-by: Guenther Meyer +--- + seat_service/CMakeLists.txt | 2 -- + seat_service/src/CMakeLists.txt | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/seat_service/CMakeLists.txt b/seat_service/CMakeLists.txt +index f99d663..77850da 100644 +--- a/seat_service/CMakeLists.txt ++++ b/seat_service/CMakeLists.txt +@@ -14,8 +14,6 @@ cmake_minimum_required(VERSION 3.5.1) + + # Project + project(SdvHAL C CXX) +-# use conan as dependency management +-include(${CMAKE_BINARY_DIR}/conan_paths.cmake) + + option(SDV_BUILD_TESTING "Build with Tests" ON) + +diff --git a/seat_service/src/CMakeLists.txt b/seat_service/src/CMakeLists.txt +index df59858..03140ee 100644 +--- a/seat_service/src/CMakeLists.txt ++++ b/seat_service/src/CMakeLists.txt +@@ -14,7 +14,6 @@ + cmake_minimum_required(VERSION 3.10) + + project(SdvVehicleServices C CXX) +-include(${CMAKE_BINARY_DIR}/conan_paths.cmake) + set (CMAKE_CXX_STANDARD 14) + + add_subdirectory(bin/seat_service) diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/git/CMakeLists.txt b/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/git/CMakeLists.txt new file mode 100644 index 00000000..b9a48788 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example/git/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(seat_service) diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example_git.bb b/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example_git.bb new file mode 100644 index 00000000..612cc2fb --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/seat-service-example_git.bb @@ -0,0 +1,54 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "Eclipse Kuksa - Seat Service Example" +DESCRIPTION = "This Seat Control Service Example allows moving a seat to a desired position" +HOMEPAGE = "https://github.com/eclipse/kuksa.val.services" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" + +SRC_URI = "git://github.com/eclipse/kuksa.val.services;protocol=https;branch=main \ + file://0001-Remove-conan-dependency.patch \ + file://git/CMakeLists.txt \ +" + +SRCREV = "07a2d28cedb1b367ae65a8e75939029f06bb24fc" +PV = "0.2.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS += " protobuf grpc protobuf-native grpc-native python3-cantools-native" + +RDEPENDS:${PN} = "can-utils" +RDEPENDS:${PN} += " bash" + +EXTRA_OECMAKE = "-DSDV_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release" + +# ignore "wrong place" of libcansim.so: +INSANE_SKIP:${PN} += "libdir" + +# Workaround for strange cmake/build behaviour: +# The pb files are generated in a specific path, e.g. +# /build/seat_service/src/lib/grpc_services/seats_grpc_service/sdv/edge/comfort/seats/v1/seats.pb.cc +# but the compiler tries to use them from a different path: +# /build/seat_service/proto/sdv/edge/comfort/seats/v1/seats.pb.cc +# +do_configure:prepend() { + mkdir -p "${B}/seat_service/src/lib/grpc_services/seats_grpc_service" + ln -s "${B}/seat_service/src/lib/grpc_services/seats_grpc_service" "${B}/seat_service/proto" + + mkdir -p "${B}/seat_service/src/lib/broker_feeder" + ln -s "${B}/seat_service/src/lib/broker_feeder" "${B}/proto" +} From 5aec396fe21644c07933a00becceb71cf4eb49f4 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 11 May 2023 17:45:33 +0200 Subject: [PATCH 07/18] sdv-containers: add recipe for seat-service-example container Signed-off-by: Guenther Meyer --- .../packagegroup-sdv-container-images.bb | 1 + .../seat-service-example-container_git.bb | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 meta-leda-distro-container/recipes-sdv/sdv-containers/seat-service-example-container_git.bb diff --git a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb index 21e8f087..b743066b 100644 --- a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb +++ b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb @@ -20,4 +20,5 @@ RDEPENDS:${PN} = "\ self-update-agent-container \ hvac-service-example-container \ vehicle-update-manager-container \ + seat-service-example-container \ " diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/seat-service-example-container_git.bb b/meta-leda-distro-container/recipes-sdv/sdv-containers/seat-service-example-container_git.bb new file mode 100644 index 00000000..87821317 --- /dev/null +++ b/meta-leda-distro-container/recipes-sdv/sdv-containers/seat-service-example-container_git.bb @@ -0,0 +1,33 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "Seat Service Example container image" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +require ../images/sdv-image-container.bb + +IMAGE_INSTALL += " \ + busybox \ + coreutils-stdbuf \ + seat-service-example \ +" + +OCI_IMAGE_TAG = "seat-service-example:latest" +OCI_IMAGE_ENTRYPOINT = "/usr/bin/val_start.sh" +OCI_IMAGE_ENV_VARS = " \ + CAN=cansim \ + SERVICE_HOST=0.0.0.0 \ + SERVICE_PORT=50051 \ + BROKER_ADDR=databroker:55555 \ +" From 825a09f3c07bc312d1e823d77a680b910be0dd19 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 11 May 2023 17:59:20 +0200 Subject: [PATCH 08/18] eclipse-kuksa: add python dependencies for seat-service-example Signed-off-by: Guenther Meyer --- .../recipes-sdv/eclipse-kuksa/python3-bitstruct_%.bbappend | 1 + .../recipes-sdv/eclipse-kuksa/python3-cantools_%.bbappend | 1 + .../recipes-sdv/eclipse-kuksa/python3-diskcache_%.bbappend | 1 + .../recipes-sdv/eclipse-kuksa/python3-textparser_%.bbappend | 1 + 4 files changed, 4 insertions(+) create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/python3-bitstruct_%.bbappend create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/python3-cantools_%.bbappend create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/python3-diskcache_%.bbappend create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/python3-textparser_%.bbappend diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-bitstruct_%.bbappend b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-bitstruct_%.bbappend new file mode 100644 index 00000000..608377e3 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-bitstruct_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-cantools_%.bbappend b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-cantools_%.bbappend new file mode 100644 index 00000000..608377e3 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-cantools_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-diskcache_%.bbappend b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-diskcache_%.bbappend new file mode 100644 index 00000000..608377e3 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-diskcache_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-textparser_%.bbappend b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-textparser_%.bbappend new file mode 100644 index 00000000..608377e3 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/python3-textparser_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" From 6fb53338a03d71c025c7b6537752474e7244af5d Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 25 May 2023 13:25:51 +0200 Subject: [PATCH 09/18] add layer meta-lts-mixins This allows the usage of rust 1.68 for recipes in kirkstone. Signed-off-by: Guenther Meyer --- .config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config.yaml b/.config.yaml index c921113f..6d7114aa 100644 --- a/.config.yaml +++ b/.config.yaml @@ -47,6 +47,9 @@ repos: meta: meta-poky: meta-yocto-bsp: + meta-lts-mixins: + url: "https://git.yoctoproject.org/git/meta-lts-mixins" + refspec: kirkstone/rust-1.68 meta-rauc-community: url: "https://github.com/rauc/meta-rauc-community.git" refspec: kirkstone From b8a0054279a51b2cf8a08c572719b585158fea86 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 25 May 2023 13:27:08 +0200 Subject: [PATCH 10/18] eclipse-kuksa: add recipe for databroker Signed-off-by: Guenther Meyer --- .../recipes-sdv/eclipse-kuksa/databroker.inc | 14 ++ .../eclipse-kuksa/databroker_0.3.0.bb | 223 ++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc create mode 100644 meta-leda-components/recipes-sdv/eclipse-kuksa/databroker_0.3.0.bb diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc new file mode 100644 index 00000000..84e71a47 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc @@ -0,0 +1,14 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +DESCRIPTION = "Efficient in-vehicle signal broker written in RUST" diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker_0.3.0.bb b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker_0.3.0.bb new file mode 100644 index 00000000..72d42fc2 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker_0.3.0.bb @@ -0,0 +1,223 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ +# +# Auto-Generated by cargo-bitbake 0.3.16 +# +inherit cargo + +# If this is git based prefer versioned ones if they exist +# DEFAULT_PREFERENCE = "-1" + +SRC_URI += "gitsm://github.com/eclipse/kuksa.val.git;protocol=https;nobranch=1;branch=master" +SRCREV = "dc8be056d96d60cdb6b60db04ab79b0d4ef86c54" +S = "${WORKDIR}/git" +CARGO_SRC_DIR = "kuksa_databroker/databroker" + +SRC_URI += " \ + crate://crates.io/aho-corasick/0.7.18 \ + crate://crates.io/ansi_term/0.12.1 \ + crate://crates.io/anyhow/1.0.59 \ + crate://crates.io/arrayref/0.3.6 \ + crate://crates.io/arrayvec/0.5.2 \ + crate://crates.io/async-stream-impl/0.3.3 \ + crate://crates.io/async-stream/0.3.3 \ + crate://crates.io/async-trait/0.1.57 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.13.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/blake2b_simd/0.5.11 \ + crate://crates.io/bumpalo/3.10.0 \ + crate://crates.io/bytes/1.2.1 \ + crate://crates.io/cc/1.0.73 \ + crate://crates.io/cfg-if/0.1.10 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/clap/3.2.16 \ + crate://crates.io/clap_lex/0.2.4 \ + crate://crates.io/constant_time_eq/0.1.5 \ + crate://crates.io/crossbeam-utils/0.8.11 \ + crate://crates.io/dirs-sys/0.3.7 \ + crate://crates.io/dirs/1.0.5 \ + crate://crates.io/dirs/2.0.2 \ + crate://crates.io/either/1.7.0 \ + crate://crates.io/enum-iterator-derive/1.0.2 \ + crate://crates.io/enum-iterator/1.1.3 \ + crate://crates.io/fastrand/1.8.0 \ + crate://crates.io/fixedbitset/0.4.2 \ + crate://crates.io/fnv/1.0.7 \ + crate://crates.io/form_urlencoded/1.0.1 \ + crate://crates.io/fs_extra/1.2.0 \ + crate://crates.io/futures-channel/0.3.21 \ + crate://crates.io/futures-core/0.3.21 \ + crate://crates.io/futures-sink/0.3.21 \ + crate://crates.io/futures-task/0.3.21 \ + crate://crates.io/futures-util/0.3.21 \ + crate://crates.io/getrandom/0.1.16 \ + crate://crates.io/getrandom/0.2.7 \ + crate://crates.io/getset/0.1.2 \ + crate://crates.io/git2/0.14.4 \ + crate://crates.io/h2/0.3.13 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/heck/0.3.3 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/http-body/0.4.5 \ + crate://crates.io/http/0.2.8 \ + crate://crates.io/httparse/1.7.1 \ + crate://crates.io/httpdate/1.0.2 \ + crate://crates.io/hyper-timeout/0.4.1 \ + crate://crates.io/hyper/0.14.20 \ + crate://crates.io/idna/0.2.3 \ + crate://crates.io/indexmap/1.9.1 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/itertools/0.10.3 \ + crate://crates.io/itoa/1.0.3 \ + crate://crates.io/jemalloc-sys/0.5.2+5.3.0-patched \ + crate://crates.io/jemallocator/0.5.0 \ + crate://crates.io/jobserver/0.1.24 \ + crate://crates.io/js-sys/0.3.59 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.127 \ + crate://crates.io/libgit2-sys/0.13.4+1.4.2 \ + crate://crates.io/libz-sys/1.1.8 \ + crate://crates.io/linefeed/0.6.0 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/matchers/0.1.0 \ + crate://crates.io/matches/0.1.9 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/memoffset/0.6.5 \ + crate://crates.io/mio/0.8.4 \ + crate://crates.io/mortal/0.2.3 \ + crate://crates.io/multimap/0.8.3 \ + crate://crates.io/nix/0.23.1 \ + crate://crates.io/nom/5.1.2 \ + crate://crates.io/num_cpus/1.13.1 \ + crate://crates.io/num_threads/0.1.6 \ + crate://crates.io/once_cell/1.13.0 \ + crate://crates.io/os_str_bytes/6.2.0 \ + crate://crates.io/percent-encoding/2.1.0 \ + crate://crates.io/petgraph/0.6.2 \ + crate://crates.io/phf/0.8.0 \ + crate://crates.io/phf_codegen/0.8.0 \ + crate://crates.io/phf_generator/0.8.0 \ + crate://crates.io/phf_shared/0.8.0 \ + crate://crates.io/pin-project-internal/1.0.11 \ + crate://crates.io/pin-project-lite/0.2.9 \ + crate://crates.io/pin-project/1.0.11 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/pkg-config/0.3.25 \ + crate://crates.io/ppv-lite86/0.2.16 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro2/1.0.43 \ + crate://crates.io/prost-build/0.9.0 \ + crate://crates.io/prost-derive/0.9.0 \ + crate://crates.io/prost-types/0.9.0 \ + crate://crates.io/prost/0.9.0 \ + crate://crates.io/quote/1.0.21 \ + crate://crates.io/rand/0.7.3 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.2.2 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.5.1 \ + crate://crates.io/rand_core/0.6.3 \ + crate://crates.io/rand_hc/0.2.0 \ + crate://crates.io/rand_pcg/0.2.1 \ + crate://crates.io/redox_syscall/0.1.57 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_users/0.3.5 \ + crate://crates.io/redox_users/0.4.3 \ + crate://crates.io/regex-automata/0.1.10 \ + crate://crates.io/regex-syntax/0.6.27 \ + crate://crates.io/regex/1.6.0 \ + crate://crates.io/remove_dir_all/0.5.3 \ + crate://crates.io/rust-argon2/0.8.3 \ + crate://crates.io/rustversion/1.0.9 \ + crate://crates.io/ryu/1.0.11 \ + crate://crates.io/serde/1.0.142 \ + crate://crates.io/serde_json/1.0.83 \ + crate://crates.io/sharded-slab/0.1.4 \ + crate://crates.io/signal-hook-registry/1.4.0 \ + crate://crates.io/siphasher/0.3.10 \ + crate://crates.io/slab/0.4.7 \ + crate://crates.io/smallstr/0.2.0 \ + crate://crates.io/smallvec/1.9.0 \ + crate://crates.io/socket2/0.4.4 \ + crate://crates.io/sqlparser/0.16.0 \ + crate://crates.io/syn/1.0.99 \ + crate://crates.io/tempfile/3.3.0 \ + crate://crates.io/terminfo/0.7.3 \ + crate://crates.io/textwrap/0.15.0 \ + crate://crates.io/thiserror-impl/1.0.32 \ + crate://crates.io/thiserror/1.0.32 \ + crate://crates.io/thread_local/1.1.4 \ + crate://crates.io/time/0.3.12 \ + crate://crates.io/tinyvec/1.6.0 \ + crate://crates.io/tinyvec_macros/0.1.0 \ + crate://crates.io/tokio-io-timeout/1.2.0 \ + crate://crates.io/tokio-macros/1.8.0 \ + crate://crates.io/tokio-stream/0.1.9 \ + crate://crates.io/tokio-util/0.6.10 \ + crate://crates.io/tokio-util/0.7.3 \ + crate://crates.io/tokio/1.20.1 \ + crate://crates.io/tonic-build/0.6.2 \ + crate://crates.io/tonic/0.6.2 \ + crate://crates.io/tower-layer/0.3.1 \ + crate://crates.io/tower-service/0.3.2 \ + crate://crates.io/tower/0.4.13 \ + crate://crates.io/tracing-attributes/0.1.22 \ + crate://crates.io/tracing-core/0.1.29 \ + crate://crates.io/tracing-futures/0.2.5 \ + crate://crates.io/tracing-subscriber/0.3.15 \ + crate://crates.io/tracing/0.1.36 \ + crate://crates.io/try-lock/0.2.3 \ + crate://crates.io/unicode-bidi/0.3.8 \ + crate://crates.io/unicode-ident/1.0.3 \ + crate://crates.io/unicode-normalization/0.1.21 \ + crate://crates.io/unicode-segmentation/1.9.0 \ + crate://crates.io/unicode-width/0.1.9 \ + crate://crates.io/url/2.2.2 \ + crate://crates.io/vcpkg/0.2.15 \ + crate://crates.io/vergen/7.3.2 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/want/0.3.0 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen-backend/0.2.82 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.82 \ + crate://crates.io/wasm-bindgen-macro/0.2.82 \ + crate://crates.io/wasm-bindgen-shared/0.2.82 \ + crate://crates.io/wasm-bindgen/0.2.82 \ + crate://crates.io/which/4.2.5 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/windows-sys/0.36.1 \ + crate://crates.io/windows_aarch64_msvc/0.36.1 \ + crate://crates.io/windows_i686_gnu/0.36.1 \ + crate://crates.io/windows_i686_msvc/0.36.1 \ + crate://crates.io/windows_x86_64_gnu/0.36.1 \ + crate://crates.io/windows_x86_64_msvc/0.36.1 \ +" + +LIC_FILES_CHKSUM = " \ + file://kuksa_databroker/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ +" + +SUMMARY = "Eclipse Kuksa - DataBroker" +HOMEPAGE = "https://github.com/eclipse/kuksa.val" +LICENSE = "Apache-2.0" + +# includes this file if it exists but does not fail +# this is useful for anything you may want to override from +# what cargo-bitbake generates. +include databroker-${PV}.inc +include databroker.inc From a88674a249c8107fd79bfb7e7d95f33889accf2d Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 25 May 2023 13:30:15 +0200 Subject: [PATCH 11/18] eclipse-kuksa: update recipe for databroker-cli Signed-off-by: Guenther Meyer --- .../eclipse-kuksa/databroker-cli.inc | 2 +- .../eclipse-kuksa/databroker-cli_0.17.0.bb | 206 ++++++++---------- 2 files changed, 97 insertions(+), 111 deletions(-) diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli.inc b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli.inc index b792df2a..7e385ec2 100644 --- a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli.inc +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli.inc @@ -1,5 +1,5 @@ # /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * Copyright (c) 2023 Contributors to the Eclipse Foundation # * # * See the NOTICE file(s) distributed with this work for additional # * information regarding copyright ownership. diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli_0.17.0.bb b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli_0.17.0.bb index 06713234..ca2e92c9 100644 --- a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli_0.17.0.bb +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker-cli_0.17.0.bb @@ -1,5 +1,5 @@ # /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * Copyright (c) 2023 Contributors to the Eclipse Foundation # * # * See the NOTICE file(s) distributed with this work for additional # * information regarding copyright ownership. @@ -15,137 +15,120 @@ # inherit cargo +# If this is git based prefer versioned ones if they exist +# DEFAULT_PREFERENCE = "-1" -SRCREV_FORMAT = "cli_jsoncons_jwtcpp_turtle" - -SRC_URI += "git://github.com/eclipse/kuksa.val;branch=master;name=cli;protocol=https;nobranch=1 \ - git://github.com/danielaparker/jsoncons.git;protocol=https;name=jsoncons;branch=master;destsuffix=git/kuksa-val-server/3rd-party-libs/jsoncons \ - git://github.com/Thalhammer/jwt-cpp.git;protocol=https;name=jwtcpp;branch=master;destsuffix=git/kuksa-val-server/3rd-party-libs/jwt-cpp \ - git://github.com/mat007/turtle.git;protocol=https;name=turtle;branch=master;destsuffix=git/kuksa-val-server/3rd-party-libs/turtle \ - " -SRCREV_cli = "590198a35de7b2201bdd913750157bb9778a5214" -SRCREV_jsoncons = "af61925bb960df55331d3b6ec198042a1b133694" -SRCREV_jwtcpp = "34bb0644ea613cfcbc09c148db9de8aa6c5612b5" -SRCREV_turtle = "bbe01e6d9d21ff7075aba782434185a8339d44dd" - +SRC_URI += "gitsm://github.com/eclipse/kuksa.val.git;protocol=https;nobranch=1;branch=master" +SRCREV = "dc8be056d96d60cdb6b60db04ab79b0d4ef86c54" S = "${WORKDIR}/git" CARGO_SRC_DIR = "kuksa_databroker/databroker-cli" -PV:append = ".AUTOINC+861b2ec674" - -do_compile:prepend(){ - # Needed as the repo for kuksa provides a Cargo.lock generated with a Rust - # toolchain version > 1.59.0. This causes the bitbake recipe to fail with a - # missing dependency. Deleting the lock causes the OE meta-rust tasks to - # re-generate the Cargo.lock with the crate versions. - if [ -f "${S}/Cargo.lock" ]; then - rm "${S}/Cargo.lock" - fi -} -# please note if you have entries that do not begin with crate:// -# you must change them to how that package can be fetched SRC_URI += " \ - crate://crates.io/aho-corasick/0.7.20 \ + crate://crates.io/aho-corasick/0.7.18 \ crate://crates.io/ansi_term/0.12.1 \ - crate://crates.io/anyhow/1.0.68 \ + crate://crates.io/anyhow/1.0.59 \ crate://crates.io/arrayref/0.3.6 \ crate://crates.io/arrayvec/0.5.2 \ crate://crates.io/async-stream-impl/0.3.3 \ crate://crates.io/async-stream/0.3.3 \ - crate://crates.io/async-trait/0.1.61 \ + crate://crates.io/async-trait/0.1.57 \ crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/base64/0.13.1 \ + crate://crates.io/base64/0.13.0 \ crate://crates.io/bitflags/1.3.2 \ crate://crates.io/blake2b_simd/0.5.11 \ - crate://crates.io/bytes/1.3.0 \ - crate://crates.io/cc/1.0.78 \ + crate://crates.io/bumpalo/3.10.0 \ + crate://crates.io/bytes/1.2.1 \ + crate://crates.io/cc/1.0.73 \ crate://crates.io/cfg-if/0.1.10 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/clap/3.2.23 \ + crate://crates.io/clap/3.2.16 \ crate://crates.io/clap_lex/0.2.4 \ crate://crates.io/constant_time_eq/0.1.5 \ - crate://crates.io/crossbeam-utils/0.8.14 \ + crate://crates.io/crossbeam-utils/0.8.11 \ crate://crates.io/dirs-sys/0.3.7 \ crate://crates.io/dirs/1.0.5 \ crate://crates.io/dirs/2.0.2 \ - crate://crates.io/either/1.8.0 \ - crate://crates.io/enum-iterator-derive/1.1.0 \ - crate://crates.io/enum-iterator/1.2.0 \ + crate://crates.io/either/1.7.0 \ + crate://crates.io/enum-iterator-derive/1.0.2 \ + crate://crates.io/enum-iterator/1.1.3 \ crate://crates.io/fastrand/1.8.0 \ crate://crates.io/fixedbitset/0.4.2 \ crate://crates.io/fnv/1.0.7 \ - crate://crates.io/form_urlencoded/1.1.0 \ - crate://crates.io/futures-channel/0.3.25 \ - crate://crates.io/futures-core/0.3.25 \ - crate://crates.io/futures-sink/0.3.25 \ - crate://crates.io/futures-task/0.3.25 \ - crate://crates.io/futures-util/0.3.25 \ + crate://crates.io/form_urlencoded/1.0.1 \ + crate://crates.io/fs_extra/1.2.0 \ + crate://crates.io/futures-channel/0.3.21 \ + crate://crates.io/futures-core/0.3.21 \ + crate://crates.io/futures-sink/0.3.21 \ + crate://crates.io/futures-task/0.3.21 \ + crate://crates.io/futures-util/0.3.21 \ crate://crates.io/getrandom/0.1.16 \ - crate://crates.io/getrandom/0.2.8 \ + crate://crates.io/getrandom/0.2.7 \ crate://crates.io/getset/0.1.2 \ - crate://crates.io/git2/0.14.2 \ - crate://crates.io/h2/0.3.15 \ + crate://crates.io/git2/0.14.4 \ + crate://crates.io/h2/0.3.13 \ crate://crates.io/hashbrown/0.12.3 \ crate://crates.io/heck/0.3.3 \ - crate://crates.io/hermit-abi/0.2.6 \ + crate://crates.io/hermit-abi/0.1.19 \ crate://crates.io/http-body/0.4.5 \ crate://crates.io/http/0.2.8 \ - crate://crates.io/httparse/1.8.0 \ + crate://crates.io/httparse/1.7.1 \ crate://crates.io/httpdate/1.0.2 \ crate://crates.io/hyper-timeout/0.4.1 \ - crate://crates.io/hyper/0.14.23 \ - crate://crates.io/idna/0.3.0 \ - crate://crates.io/indexmap/1.9.2 \ + crate://crates.io/hyper/0.14.20 \ + crate://crates.io/idna/0.2.3 \ + crate://crates.io/indexmap/1.9.1 \ crate://crates.io/instant/0.1.12 \ - crate://crates.io/itertools/0.10.5 \ - crate://crates.io/itoa/1.0.5 \ - crate://crates.io/jobserver/0.1.25 \ + crate://crates.io/itertools/0.10.3 \ + crate://crates.io/itoa/1.0.3 \ + crate://crates.io/jemalloc-sys/0.5.2+5.3.0-patched \ + crate://crates.io/jemallocator/0.5.0 \ + crate://crates.io/jobserver/0.1.24 \ + crate://crates.io/js-sys/0.3.59 \ crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.139 \ - crate://crates.io/libgit2-sys/0.13.2+1.4.2 \ + crate://crates.io/libc/0.2.127 \ + crate://crates.io/libgit2-sys/0.13.4+1.4.2 \ crate://crates.io/libz-sys/1.1.8 \ crate://crates.io/linefeed/0.6.0 \ crate://crates.io/log/0.4.17 \ crate://crates.io/matchers/0.1.0 \ + crate://crates.io/matches/0.1.9 \ crate://crates.io/memchr/2.5.0 \ crate://crates.io/memoffset/0.6.5 \ - crate://crates.io/mio/0.8.5 \ + crate://crates.io/mio/0.8.4 \ crate://crates.io/mortal/0.2.3 \ crate://crates.io/multimap/0.8.3 \ - crate://crates.io/nix/0.23.2 \ + crate://crates.io/nix/0.23.1 \ crate://crates.io/nom/5.1.2 \ - crate://crates.io/nu-ansi-term/0.46.0 \ - crate://crates.io/num_cpus/1.15.0 \ + crate://crates.io/num_cpus/1.13.1 \ crate://crates.io/num_threads/0.1.6 \ - crate://crates.io/once_cell/1.17.0 \ - crate://crates.io/os_str_bytes/6.4.1 \ - crate://crates.io/overload/0.1.1 \ - crate://crates.io/percent-encoding/2.2.0 \ + crate://crates.io/once_cell/1.13.0 \ + crate://crates.io/os_str_bytes/6.2.0 \ + crate://crates.io/percent-encoding/2.1.0 \ crate://crates.io/petgraph/0.6.2 \ crate://crates.io/phf/0.8.0 \ crate://crates.io/phf_codegen/0.8.0 \ crate://crates.io/phf_generator/0.8.0 \ crate://crates.io/phf_shared/0.8.0 \ - crate://crates.io/pin-project-internal/1.0.12 \ + crate://crates.io/pin-project-internal/1.0.11 \ crate://crates.io/pin-project-lite/0.2.9 \ - crate://crates.io/pin-project/1.0.12 \ + crate://crates.io/pin-project/1.0.11 \ crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/pkg-config/0.3.26 \ - crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/pkg-config/0.3.25 \ + crate://crates.io/ppv-lite86/0.2.16 \ crate://crates.io/proc-macro-error-attr/1.0.4 \ crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro2/1.0.49 \ + crate://crates.io/proc-macro2/1.0.43 \ crate://crates.io/prost-build/0.9.0 \ crate://crates.io/prost-derive/0.9.0 \ crate://crates.io/prost-types/0.9.0 \ crate://crates.io/prost/0.9.0 \ - crate://crates.io/quote/1.0.23 \ + crate://crates.io/quote/1.0.21 \ crate://crates.io/rand/0.7.3 \ crate://crates.io/rand/0.8.5 \ crate://crates.io/rand_chacha/0.2.2 \ crate://crates.io/rand_chacha/0.3.1 \ crate://crates.io/rand_core/0.5.1 \ - crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rand_core/0.6.3 \ crate://crates.io/rand_hc/0.2.0 \ crate://crates.io/rand_pcg/0.2.1 \ crate://crates.io/redox_syscall/0.1.57 \ @@ -153,80 +136,83 @@ SRC_URI += " \ crate://crates.io/redox_users/0.3.5 \ crate://crates.io/redox_users/0.4.3 \ crate://crates.io/regex-automata/0.1.10 \ - crate://crates.io/regex-syntax/0.6.28 \ - crate://crates.io/regex/1.7.1 \ + crate://crates.io/regex-syntax/0.6.27 \ + crate://crates.io/regex/1.6.0 \ crate://crates.io/remove_dir_all/0.5.3 \ crate://crates.io/rust-argon2/0.8.3 \ - crate://crates.io/rustversion/1.0.11 \ - crate://crates.io/ryu/1.0.12 \ - crate://crates.io/serde/1.0.152 \ - crate://crates.io/serde_json/1.0.91 \ + crate://crates.io/rustversion/1.0.9 \ + crate://crates.io/ryu/1.0.11 \ + crate://crates.io/serde/1.0.142 \ + crate://crates.io/serde_json/1.0.83 \ crate://crates.io/sharded-slab/0.1.4 \ crate://crates.io/signal-hook-registry/1.4.0 \ crate://crates.io/siphasher/0.3.10 \ crate://crates.io/slab/0.4.7 \ crate://crates.io/smallstr/0.2.0 \ - crate://crates.io/smallvec/1.10.0 \ - crate://crates.io/socket2/0.4.7 \ + crate://crates.io/smallvec/1.9.0 \ + crate://crates.io/socket2/0.4.4 \ crate://crates.io/sqlparser/0.16.0 \ - crate://crates.io/syn/1.0.107 \ + crate://crates.io/syn/1.0.99 \ crate://crates.io/tempfile/3.3.0 \ crate://crates.io/terminfo/0.7.3 \ - crate://crates.io/textwrap/0.16.0 \ - crate://crates.io/thiserror-impl/1.0.38 \ - crate://crates.io/thiserror/1.0.38 \ + crate://crates.io/textwrap/0.15.0 \ + crate://crates.io/thiserror-impl/1.0.32 \ + crate://crates.io/thiserror/1.0.32 \ crate://crates.io/thread_local/1.1.4 \ - crate://crates.io/time/0.3.15 \ + crate://crates.io/time/0.3.12 \ crate://crates.io/tinyvec/1.6.0 \ crate://crates.io/tinyvec_macros/0.1.0 \ crate://crates.io/tokio-io-timeout/1.2.0 \ - crate://crates.io/tokio-macros/1.8.2 \ - crate://crates.io/tokio-stream/0.1.11 \ + crate://crates.io/tokio-macros/1.8.0 \ + crate://crates.io/tokio-stream/0.1.9 \ crate://crates.io/tokio-util/0.6.10 \ - crate://crates.io/tokio-util/0.7.4 \ - crate://crates.io/tokio/1.24.1 \ + crate://crates.io/tokio-util/0.7.3 \ + crate://crates.io/tokio/1.20.1 \ crate://crates.io/tonic-build/0.6.2 \ crate://crates.io/tonic/0.6.2 \ - crate://crates.io/tower-layer/0.3.2 \ + crate://crates.io/tower-layer/0.3.1 \ crate://crates.io/tower-service/0.3.2 \ crate://crates.io/tower/0.4.13 \ - crate://crates.io/tracing-attributes/0.1.23 \ - crate://crates.io/tracing-core/0.1.30 \ + crate://crates.io/tracing-attributes/0.1.22 \ + crate://crates.io/tracing-core/0.1.29 \ crate://crates.io/tracing-futures/0.2.5 \ - crate://crates.io/tracing-subscriber/0.3.16 \ - crate://crates.io/tracing/0.1.37 \ - crate://crates.io/try-lock/0.2.4 \ + crate://crates.io/tracing-subscriber/0.3.15 \ + crate://crates.io/tracing/0.1.36 \ + crate://crates.io/try-lock/0.2.3 \ crate://crates.io/unicode-bidi/0.3.8 \ - crate://crates.io/unicode-ident/1.0.6 \ - crate://crates.io/unicode-normalization/0.1.22 \ - crate://crates.io/unicode-segmentation/1.10.0 \ - crate://crates.io/unicode-width/0.1.10 \ - crate://crates.io/url/2.3.1 \ + crate://crates.io/unicode-ident/1.0.3 \ + crate://crates.io/unicode-normalization/0.1.21 \ + crate://crates.io/unicode-segmentation/1.9.0 \ + crate://crates.io/unicode-width/0.1.9 \ + crate://crates.io/url/2.2.2 \ crate://crates.io/vcpkg/0.2.15 \ crate://crates.io/vergen/7.3.2 \ crate://crates.io/version_check/0.9.4 \ crate://crates.io/want/0.3.0 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ - crate://crates.io/which/4.3.0 \ + crate://crates.io/wasm-bindgen-backend/0.2.82 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.82 \ + crate://crates.io/wasm-bindgen-macro/0.2.82 \ + crate://crates.io/wasm-bindgen-shared/0.2.82 \ + crate://crates.io/wasm-bindgen/0.2.82 \ + crate://crates.io/which/4.2.5 \ crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi/0.3.9 \ - crate://crates.io/windows-sys/0.42.0 \ - crate://crates.io/windows_aarch64_gnullvm/0.42.0 \ - crate://crates.io/windows_aarch64_msvc/0.42.0 \ - crate://crates.io/windows_i686_gnu/0.42.0 \ - crate://crates.io/windows_i686_msvc/0.42.0 \ - crate://crates.io/windows_x86_64_gnu/0.42.0 \ - crate://crates.io/windows_x86_64_gnullvm/0.42.0 \ - crate://crates.io/windows_x86_64_msvc/0.42.0 \ + crate://crates.io/windows-sys/0.36.1 \ + crate://crates.io/windows_aarch64_msvc/0.36.1 \ + crate://crates.io/windows_i686_gnu/0.36.1 \ + crate://crates.io/windows_i686_msvc/0.36.1 \ + crate://crates.io/windows_x86_64_gnu/0.36.1 \ + crate://crates.io/windows_x86_64_msvc/0.36.1 \ " LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ + file://kuksa_databroker/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ " -SUMMARY = "databroker-cli" +SUMMARY = "Eclipse Kuksa - DataBroker CLI" HOMEPAGE = "https://github.com/eclipse/kuksa.val" LICENSE = "Apache-2.0" From 2327ed7ad85188dca0fa714a0a0f161ce0fb8f3a Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 25 May 2023 15:46:16 +0200 Subject: [PATCH 12/18] eclipse-kuksa: add vss-core package to databroker Signed-off-by: Guenther Meyer --- .../recipes-sdv/eclipse-kuksa/databroker.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc index 84e71a47..e9e90c4e 100644 --- a/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc +++ b/meta-leda-components/recipes-sdv/eclipse-kuksa/databroker.inc @@ -12,3 +12,14 @@ # ********************************************************************************/ DESCRIPTION = "Efficient in-vehicle signal broker written in RUST" + + +PACKAGES =+ "${PN}-vss-core" +SUMMARY:${PN}-vss-core = "Covesa VSS Releases" + +FILES:${PN}-vss-core = "${datadir}/vss-core" + +do_install:append() { + install -d ${D}${datadir}/vss-core + install -m 0644 ${S}/data/vss-core/*.json ${D}${datadir}/vss-core +} From 7ff819471200d4480136051273eb556204328250 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 25 May 2023 15:47:33 +0200 Subject: [PATCH 13/18] sdv-containers: add recipe for databroker container Signed-off-by: Guenther Meyer --- .../packagegroup-sdv-container-images.bb | 1 + .../databroker-container_git.bb | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 meta-leda-distro-container/recipes-sdv/sdv-containers/databroker-container_git.bb diff --git a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb index b743066b..c6106b92 100644 --- a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb +++ b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb @@ -21,4 +21,5 @@ RDEPENDS:${PN} = "\ hvac-service-example-container \ vehicle-update-manager-container \ seat-service-example-container \ + databroker-container \ " diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/databroker-container_git.bb b/meta-leda-distro-container/recipes-sdv/sdv-containers/databroker-container_git.bb new file mode 100644 index 00000000..6165995e --- /dev/null +++ b/meta-leda-distro-container/recipes-sdv/sdv-containers/databroker-container_git.bb @@ -0,0 +1,36 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "DataBroker container image" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +require ../images/sdv-image-container.bb + +IMAGE_INSTALL += " \ + busybox \ + databroker \ + databroker-vss-core \ +" + +DATA_BROKER_PORT = "55555" +DATA_BROKER_METADATA = "/usr/share/vss-core/vss_release_3.0.json" + +OCI_IMAGE_TAG = "databroker:latest" +OCI_IMAGE_ENTRYPOINT = "/usr/bin/databroker" +OCI_IMAGE_PORTS = "${DATA_BROKER_PORT}" +OCI_IMAGE_ENV_VARS = " \ + KUKSA_DATA_BROKER_ADDR=0.0.0.0 \ + KUKSA_DATA_BROKER_PORT=${DATA_BROKER_PORT} \ + KUKSA_DATA_BROKER_METADATA_FILE=${DATA_BROKER_METADATA} \ +" From 656b652225aff0104a52b2f414110ec5cb66955c Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Thu, 25 May 2023 18:51:23 +0200 Subject: [PATCH 14/18] kibi: update recipe Signed-off-by: Guenther Meyer --- .../recipes-sdv/leda-tools/kibi.inc | 57 +++---------------- .../recipes-sdv/leda-tools/kibi_0.2.2.bb | 51 +++++++++-------- 2 files changed, 36 insertions(+), 72 deletions(-) diff --git a/meta-leda-components/recipes-sdv/leda-tools/kibi.inc b/meta-leda-components/recipes-sdv/leda-tools/kibi.inc index 98b52eca..50ee939f 100644 --- a/meta-leda-components/recipes-sdv/leda-tools/kibi.inc +++ b/meta-leda-components/recipes-sdv/leda-tools/kibi.inc @@ -11,57 +11,18 @@ # * SPDX-License-Identifier: Apache-2.0 # ********************************************************************************/ - -PACKAGES = "${PN} ${PN}-dbg" -FILES:${PN} += "${bindir}/kibi" -FILES:${PN}-dbg += "${bindir}/.debug" - do_install:append() { - cargo_do_install - install_syntax_highlighting_confs - alias_nano -} - -cargo_do_install () { - install_syntax_highlighting_confs - local have_installed=false - for tgt in "${B}/target/${CARGO_TARGET_SUBDIR}/"*; do - case $tgt in - *examples) - if [ -d "$tgt" ]; then - for example in "$tgt/"*; do - if [ -f "$example" ] && [ -x "$example" ]; then - install -d "${D}${bindir}" - install -m755 "$example" "${D}${bindir}" - have_installed=true - fi - done - fi - ;; - *) - if [ -f "$tgt" ] && [ -x "$tgt" ]; then - install -d "${D}${bindir}" - install -m755 "$tgt" "${D}${bindir}" - have_installed=true - fi - ;; - esac - done - if ! $have_installed; then - die "Did not find anything to install" - fi - + install_syntax_highlighting_confs + alias_nano } install_syntax_highlighting_confs() { - if [ ${KIBI_SYNTAX_HIGHLIGHTING} -ne 0 ]; then - install -d ${D}${datadir}/kibi - cp -r ${S_SYNTAX}/syntax.d ${D}${datadir}/kibi - fi -} + install -d ${D}${datadir}/kibi + cp -r ${S}/syntax.d ${D}${datadir}/kibi +} alias_nano() { - if [ ${KIBI_ALIAS_NANO} -ne 0 ]; then - ln --relative --symbolic ${D}${bindir}/kibi ${D}${bindir}/nano - fi -} \ No newline at end of file + if [ ${KIBI_ALIAS_NANO} -ne 0 ]; then + ln --relative --symbolic ${D}${bindir}/kibi ${D}${bindir}/nano + fi +} diff --git a/meta-leda-components/recipes-sdv/leda-tools/kibi_0.2.2.bb b/meta-leda-components/recipes-sdv/leda-tools/kibi_0.2.2.bb index c462e152..71608a6b 100644 --- a/meta-leda-components/recipes-sdv/leda-tools/kibi_0.2.2.bb +++ b/meta-leda-components/recipes-sdv/leda-tools/kibi_0.2.2.bb @@ -18,28 +18,22 @@ HOMEPAGE = "https://github.com/ilai-deutel/kibi" inherit cargo SRC_URI += "git://github.com/ilai-deutel/kibi.git;protocol=https;nobranch=1" -SRCREV = "2cc6bead72e2b48203d6ddf28f189c51868a9a79" - -# Get a commit with syntax highlighting for a lot of languages but no support for rust version 1.59.0 -SRC_URI += "git://github.com/ilai-deutel/kibi.git;protocol=https;nobranch=1;name=moresyntax;destsuffix=moresyntax/" -SRCREV_moresyntax = "ed5244ee9837862610307036d8daa1a1e4afa884" +SRCREV = "750daa33946502ab15e57cdb982787140f0e53d3" S = "${WORKDIR}/git" -S_SYNTAX = "${WORKDIR}/moresyntax" - CARGO_SRC_DIR = "" -PV:append = ".AUTOINC+2cc6bead72" - -KIBI_SYNTAX_HIGHLIGHTING ??= "1" -KIBI_SYNTAX_HIGHLIGHTING[doc] = "Set to 0 to skip installing kibi syntax highlighting confs. Default 1." +PV:append = ".AUTOINC+750daa3394" KIBI_ALIAS_NANO ??= "1" KIBI_ALIAS_NANO[doc] = "Set to 0 to skip aliasing nano to kibi. Default 1 (kibi is supposed to be a nano replacement)." SRC_URI += " \ crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/cc/1.0.79 \ crate://crates.io/cfg-if/1.0.0 \ crate://crates.io/dashmap/5.2.0 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/errno/0.3.0 \ crate://crates.io/fastrand/1.7.0 \ crate://crates.io/futures-channel/0.3.21 \ crate://crates.io/futures-core/0.3.21 \ @@ -51,8 +45,10 @@ SRC_URI += " \ crate://crates.io/futures/0.3.21 \ crate://crates.io/hermit-abi/0.1.19 \ crate://crates.io/instant/0.1.12 \ + crate://crates.io/io-lifetimes/1.0.5 \ crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.132 \ + crate://crates.io/libc/0.2.144 \ + crate://crates.io/linux-raw-sys/0.3.1 \ crate://crates.io/lock_api/0.4.6 \ crate://crates.io/log/0.4.17 \ crate://crates.io/memchr/2.5.0 \ @@ -61,32 +57,39 @@ SRC_URI += " \ crate://crates.io/parking_lot_core/0.9.3 \ crate://crates.io/pin-project-lite/0.2.9 \ crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro2/1.0.36 \ - crate://crates.io/quote/1.0.15 \ + crate://crates.io/proc-macro2/1.0.56 \ + crate://crates.io/quote/1.0.27 \ crate://crates.io/redox_syscall/0.2.10 \ - crate://crates.io/remove_dir_all/0.5.3 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/rustix/0.37.6 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/serial_test/0.9.0 \ - crate://crates.io/serial_test_derive/0.9.0 \ + crate://crates.io/serial_test/2.0.0 \ + crate://crates.io/serial_test_derive/2.0.0 \ crate://crates.io/slab/0.4.6 \ crate://crates.io/smallvec/1.8.0 \ - crate://crates.io/syn/1.0.86 \ - crate://crates.io/tempfile/3.3.0 \ - crate://crates.io/unicode-width/0.1.9 \ - crate://crates.io/unicode-xid/0.2.2 \ - crate://crates.io/version_check/0.9.4 \ + crate://crates.io/syn/2.0.15 \ + crate://crates.io/tempfile/3.5.0 \ + crate://crates.io/unicode-ident/1.0.8 \ + crate://crates.io/unicode-width/0.1.10 \ crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi-util/0.1.5 \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi/0.3.9 \ crate://crates.io/windows-sys/0.36.1 \ + crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-targets/0.42.1 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.1 \ crate://crates.io/windows_aarch64_msvc/0.36.1 \ + crate://crates.io/windows_aarch64_msvc/0.42.1 \ crate://crates.io/windows_i686_gnu/0.36.1 \ + crate://crates.io/windows_i686_gnu/0.42.1 \ crate://crates.io/windows_i686_msvc/0.36.1 \ + crate://crates.io/windows_i686_msvc/0.42.1 \ crate://crates.io/windows_x86_64_gnu/0.36.1 \ + crate://crates.io/windows_x86_64_gnu/0.42.1 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.1 \ crate://crates.io/windows_x86_64_msvc/0.36.1 \ + crate://crates.io/windows_x86_64_msvc/0.42.1 \ " # We choose the Apache-2.0 license From 13777b059ff24eaaa6d75f4eddf5d8ca954944a3 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Fri, 16 Jun 2023 12:04:36 +0200 Subject: [PATCH 15/18] kantui: update recipe Signed-off-by: Guenther Meyer --- .../recipes-sdv/eclipse-leda/kantui.inc | 45 +-- .../recipes-sdv/eclipse-leda/kantui_0.3.0.bb | 238 ++++++++++++++++ .../recipes-sdv/eclipse-leda/kantui_git.bb | 263 ------------------ 3 files changed, 246 insertions(+), 300 deletions(-) create mode 100644 meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb delete mode 100644 meta-leda-components/recipes-sdv/eclipse-leda/kantui_git.bb diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc b/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc index a45872b7..5979b0ab 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc @@ -1,5 +1,5 @@ # /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * Copyright (c) 2023 Contributors to the Eclipse Foundation # * # * See the NOTICE file(s) distributed with this work for additional # * information regarding copyright ownership. @@ -11,43 +11,14 @@ # * SPDX-License-Identifier: Apache-2.0 # ********************************************************************************/ +SUMMARY = "KantUI" +DESCRIPTION = "A TUI for Kanto CM that allows easier management of deployed containers." +HOMEPAGE = "https://github.com/eclipse-leda/leda-utils" -PACKAGES = "${PN} ${PN}-dbg" -FILES:${PN} += "${bindir}/kantui" -FILES:${PN}-dbg += "${bindir}/.debug" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" do_install:append() { - cargo_do_install - install -d ${D}${sysconfdir}/kantui - install -m 0664 "${S}/${CARGO_SRC_DIR}/kantui_conf.toml" "${D}${sysconfdir}/kantui/kantui_conf.toml" + install -d ${D}${sysconfdir}/kantui + install -m 0664 "${S}/${CARGO_SRC_DIR}/kantui_conf.toml" "${D}${sysconfdir}/kantui/kantui_conf.toml" } - -cargo_do_install () { - local have_installed=false - for tgt in "${B}/target/${CARGO_TARGET_SUBDIR}/"*; do - case $tgt in - *examples) - if [ -d "$tgt" ]; then - for example in "$tgt/"*; do - if [ -f "$example" ] && [ -x "$example" ]; then - install -d "${D}${bindir}" - install -m755 "$example" "${D}${bindir}" - have_installed=true - fi - done - fi - ;; - *) - if [ -f "$tgt" ] && [ -x "$tgt" ]; then - install -d "${D}${bindir}" - install -m755 "$tgt" "${D}${bindir}" - have_installed=true - fi - ;; - esac - done - if ! $have_installed; then - die "Did not find anything to install" - fi - -} \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb b/meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb new file mode 100644 index 00000000..2c0d1161 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb @@ -0,0 +1,238 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ +# +# Auto-Generated by cargo-bitbake 0.3.16 + +inherit cargo + +SRC_URI += "gitsm://git@github.com/eclipse-leda/leda-utils.git;protocol=https;nobranch=1;branch=main" +SRCREV = "006e8f0e7d993be9f7405d8f61db8fb8a58a49eb" +S = "${WORKDIR}/git" +CARGO_SRC_DIR = "src/rust/kanto-tui" + +SRC_URI += " \ + crate://crates.io/ahash/0.6.3 \ + crate://crates.io/android_system_properties/0.1.5 \ + crate://crates.io/anyhow/1.0.70 \ + crate://crates.io/array-macro/1.0.5 \ + crate://crates.io/arrayvec/0.5.2 \ + crate://crates.io/async-priority-channel/0.1.0 \ + crate://crates.io/async-stream-impl/0.3.5 \ + crate://crates.io/async-stream/0.3.5 \ + crate://crates.io/async-trait/0.1.68 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/axum-core/0.2.9 \ + crate://crates.io/axum/0.5.17 \ + crate://crates.io/base64/0.13.1 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bumpalo/3.12.0 \ + crate://crates.io/bytes/1.4.0 \ + crate://crates.io/cc/1.0.79 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.24 \ + crate://crates.io/clap/3.2.23 \ + crate://crates.io/clap_derive/3.2.18 \ + crate://crates.io/clap_lex/0.2.4 \ + crate://crates.io/cmake/0.1.50 \ + crate://crates.io/codespan-reporting/0.11.1 \ + crate://crates.io/config/0.13.3 \ + crate://crates.io/core-foundation-sys/0.8.4 \ + crate://crates.io/crossbeam-channel/0.5.8 \ + crate://crates.io/crossbeam-utils/0.8.15 \ + crate://crates.io/cursive/0.16.3 \ + crate://crates.io/cursive_buffered_backend/0.5.0 \ + crate://crates.io/cursive_core/0.2.2 \ + crate://crates.io/cursive_table_view/0.13.3 \ + crate://crates.io/cxx-build/1.0.94 \ + crate://crates.io/cxx/1.0.94 \ + crate://crates.io/cxxbridge-flags/1.0.94 \ + crate://crates.io/cxxbridge-macro/1.0.94 \ + crate://crates.io/darling/0.10.2 \ + crate://crates.io/darling_core/0.10.2 \ + crate://crates.io/darling_macro/0.10.2 \ + crate://crates.io/either/1.8.1 \ + crate://crates.io/enclose/1.1.8 \ + crate://crates.io/enum-map-derive/0.4.6 \ + crate://crates.io/enum-map/0.6.6 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/errno/0.3.1 \ + crate://crates.io/event-listener/2.5.3 \ + crate://crates.io/fastrand/1.9.0 \ + crate://crates.io/fixedbitset/0.4.2 \ + crate://crates.io/fnv/1.0.7 \ + crate://crates.io/futures-channel/0.3.28 \ + crate://crates.io/futures-core/0.3.28 \ + crate://crates.io/futures-sink/0.3.28 \ + crate://crates.io/futures-task/0.3.28 \ + crate://crates.io/futures-util/0.3.28 \ + crate://crates.io/getrandom/0.2.9 \ + crate://crates.io/h2/0.3.18 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/heck/0.4.1 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.2.6 \ + crate://crates.io/hermit-abi/0.3.1 \ + crate://crates.io/http-body/0.4.5 \ + crate://crates.io/http-range-header/0.3.0 \ + crate://crates.io/http/0.2.9 \ + crate://crates.io/httparse/1.8.0 \ + crate://crates.io/httpdate/1.0.2 \ + crate://crates.io/hyper-timeout/0.4.1 \ + crate://crates.io/hyper/0.14.26 \ + crate://crates.io/iana-time-zone-haiku/0.1.1 \ + crate://crates.io/iana-time-zone/0.1.56 \ + crate://crates.io/ident_case/1.0.1 \ + crate://crates.io/indexmap/1.9.3 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/io-lifetimes/1.0.10 \ + crate://crates.io/itertools/0.10.5 \ + crate://crates.io/itoa/1.0.6 \ + crate://crates.io/js-sys/0.3.61 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.141 \ + crate://crates.io/link-cplusplus/1.0.8 \ + crate://crates.io/linux-raw-sys/0.3.2 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/matchit/0.5.0 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/mime/0.3.17 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/mio/0.8.6 \ + crate://crates.io/multimap/0.8.3 \ + crate://crates.io/nix/0.26.2 \ + crate://crates.io/nom/7.1.3 \ + crate://crates.io/num-complex/0.3.1 \ + crate://crates.io/num-integer/0.1.45 \ + crate://crates.io/num-iter/0.1.43 \ + crate://crates.io/num-rational/0.3.2 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/num/0.3.1 \ + crate://crates.io/num_cpus/1.15.0 \ + crate://crates.io/numtoa/0.1.0 \ + crate://crates.io/once_cell/1.17.1 \ + crate://crates.io/os_str_bytes/6.5.0 \ + crate://crates.io/owning_ref/0.4.1 \ + crate://crates.io/pathdiff/0.2.1 \ + crate://crates.io/percent-encoding/2.2.0 \ + crate://crates.io/petgraph/0.6.3 \ + crate://crates.io/pin-project-internal/1.0.12 \ + crate://crates.io/pin-project-lite/0.2.9 \ + crate://crates.io/pin-project/1.0.12 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/prettyplease/0.1.25 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro2/1.0.56 \ + crate://crates.io/prost-build/0.10.4 \ + crate://crates.io/prost-derive/0.10.1 \ + crate://crates.io/prost-types/0.10.1 \ + crate://crates.io/prost/0.10.4 \ + crate://crates.io/quote/1.0.26 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/redox_termios/0.1.2 \ + crate://crates.io/regex-syntax/0.6.29 \ + crate://crates.io/regex/1.7.3 \ + crate://crates.io/rustix/0.37.1 \ + crate://crates.io/ryu/1.0.13 \ + crate://crates.io/scratch/1.0.5 \ + crate://crates.io/serde/1.0.160 \ + crate://crates.io/serde_derive/1.0.160 \ + crate://crates.io/serde_json/1.0.96 \ + crate://crates.io/shlex/1.1.0 \ + crate://crates.io/signal-hook-registry/1.4.1 \ + crate://crates.io/signal-hook/0.3.15 \ + crate://crates.io/slab/0.4.8 \ + crate://crates.io/smallvec/1.10.0 \ + crate://crates.io/socket2/0.4.9 \ + crate://crates.io/stable_deref_trait/1.2.0 \ + crate://crates.io/static_assertions/1.1.0 \ + crate://crates.io/strip-ansi-escapes/0.1.1 \ + crate://crates.io/strsim/0.10.0 \ + crate://crates.io/strsim/0.9.3 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.15 \ + crate://crates.io/sync_wrapper/0.1.1 \ + crate://crates.io/tempfile/3.5.0 \ + crate://crates.io/termcolor/1.2.0 \ + crate://crates.io/termion/1.5.6 \ + crate://crates.io/textwrap/0.16.0 \ + crate://crates.io/time/0.1.45 \ + crate://crates.io/tokio-io-timeout/1.2.0 \ + crate://crates.io/tokio-macros/2.0.0 \ + crate://crates.io/tokio-stream/0.1.12 \ + crate://crates.io/tokio-util/0.7.7 \ + crate://crates.io/tokio/1.27.0 \ + crate://crates.io/toml/0.5.11 \ + crate://crates.io/tonic-build/0.7.2 \ + crate://crates.io/tonic/0.7.2 \ + crate://crates.io/tower-http/0.3.5 \ + crate://crates.io/tower-layer/0.3.2 \ + crate://crates.io/tower-service/0.3.2 \ + crate://crates.io/tower/0.4.13 \ + crate://crates.io/tracing-attributes/0.1.23 \ + crate://crates.io/tracing-core/0.1.30 \ + crate://crates.io/tracing-futures/0.2.5 \ + crate://crates.io/tracing/0.1.37 \ + crate://crates.io/try-lock/0.2.4 \ + crate://crates.io/unicode-ident/1.0.8 \ + crate://crates.io/unicode-segmentation/1.10.1 \ + crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/utf8parse/0.2.1 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/vte/0.10.1 \ + crate://crates.io/vte_generate_state_changes/0.1.1 \ + crate://crates.io/want/0.3.0 \ + crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen-backend/0.2.84 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.84 \ + crate://crates.io/wasm-bindgen-macro/0.2.84 \ + crate://crates.io/wasm-bindgen-shared/0.2.84 \ + crate://crates.io/wasm-bindgen/0.2.84 \ + crate://crates.io/wasmer_enumset/1.0.1 \ + crate://crates.io/wasmer_enumset_derive/0.5.0 \ + crate://crates.io/which/4.4.0 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-sys/0.48.0 \ + crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows-targets/0.48.0 \ + crate://crates.io/windows/0.48.0 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ + crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.48.0 \ + crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.48.0 \ + crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.48.0 \ + crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.48.0 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ + crate://crates.io/windows_x86_64_msvc/0.42.2 \ + crate://crates.io/windows_x86_64_msvc/0.48.0 \ + crate://crates.io/xi-unicode/0.3.0 \ +" + +include kantui-${PV}.inc +include kantui.inc diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kantui_git.bb b/meta-leda-components/recipes-sdv/eclipse-leda/kantui_git.bb deleted file mode 100644 index f96328eb..00000000 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kantui_git.bb +++ /dev/null @@ -1,263 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ -# -DESCRIPTION = "Kantui" -SUMMARY = "A TUI for Kanto Container Management" -HOMEPAGE = "https://github.com/eclipse-leda/leda-utils/tree/main/src/rust/kanto-tui" - -PROVIDES:${PN} += "kantui" -RPROVIDES:${PN} += "kantui" -inherit cargo - -RDEPENDS_${PN} += "grpc protobuf nativesdk-protobuf" -DEPENDS += "protobuf protobuf-native grpc" - -SRCREV_FORMAT = "kantuisrc_containerm" - -SRC_URI += "git://github.com/eclipse-leda/leda-utils.git;protocol=https;name=kantuisrc;branch=main" -SRCREV_kantuisrc = "5bcbef1054775e277117d9cebacbc05234919ba7" -PV:append = ".AUTOINC+5bcbef1054" - -# Fetch the Kanto Container Management repository since kantui needs the protobuf files from kanto CM -SRC_URI += "git://github.com/eclipse-kanto/container-management;protocol=https;branch=main;name=containerm;destsuffix=git/src/rust/kanto-tui/container-management" -SRCREV_containerm = "65e00358fa5aed1792059488a80fe755b36a8191" - -S = "${WORKDIR}/git" -CARGO_SRC_DIR = "src/rust/kanto-tui" - -RUSTC = "rustc" -PROTOC = "protoc --proto_path=/src/rust/kanto-tui/container-management/containerm" - -SRC_URI += " \ - crate://crates.io/ahash/0.6.3 \ - crate://crates.io/ahash/0.7.6 \ - crate://crates.io/android_system_properties/0.1.5 \ - crate://crates.io/anyhow/1.0.68 \ - crate://crates.io/array-macro/1.0.5 \ - crate://crates.io/arrayvec/0.5.2 \ - crate://crates.io/async-priority-channel/0.1.0 \ - crate://crates.io/async-stream-impl/0.3.3 \ - crate://crates.io/async-stream/0.3.3 \ - crate://crates.io/async-trait/0.1.61 \ - crate://crates.io/atty/0.2.14 \ - crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/axum-core/0.2.9 \ - crate://crates.io/axum/0.5.17 \ - crate://crates.io/base64/0.13.1 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/block-buffer/0.10.3 \ - crate://crates.io/bumpalo/3.11.1 \ - crate://crates.io/bytes/1.3.0 \ - crate://crates.io/cc/1.0.78 \ - crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.23 \ - crate://crates.io/clap/3.2.23 \ - crate://crates.io/clap_derive/3.2.18 \ - crate://crates.io/clap_lex/0.2.4 \ - crate://crates.io/codespan-reporting/0.11.1 \ - crate://crates.io/config/0.13.3 \ - crate://crates.io/core-foundation-sys/0.8.3 \ - crate://crates.io/cpufeatures/0.2.5 \ - crate://crates.io/crossbeam-channel/0.5.6 \ - crate://crates.io/crossbeam-utils/0.8.14 \ - crate://crates.io/crypto-common/0.1.6 \ - crate://crates.io/cursive/0.16.3 \ - crate://crates.io/cursive_buffered_backend/0.5.0 \ - crate://crates.io/cursive_core/0.2.2 \ - crate://crates.io/cursive_table_view/0.13.3 \ - crate://crates.io/cxx-build/1.0.86 \ - crate://crates.io/cxx/1.0.86 \ - crate://crates.io/cxxbridge-flags/1.0.86 \ - crate://crates.io/cxxbridge-macro/1.0.86 \ - crate://crates.io/darling/0.10.2 \ - crate://crates.io/darling_core/0.10.2 \ - crate://crates.io/darling_macro/0.10.2 \ - crate://crates.io/digest/0.10.6 \ - crate://crates.io/dlv-list/0.3.0 \ - crate://crates.io/either/1.8.0 \ - crate://crates.io/enclose/1.1.8 \ - crate://crates.io/enum-map-derive/0.4.6 \ - crate://crates.io/enum-map/0.6.6 \ - crate://crates.io/event-listener/2.5.3 \ - crate://crates.io/fastrand/1.8.0 \ - crate://crates.io/fixedbitset/0.4.2 \ - crate://crates.io/fnv/1.0.7 \ - crate://crates.io/futures-channel/0.3.25 \ - crate://crates.io/futures-core/0.3.25 \ - crate://crates.io/futures-sink/0.3.25 \ - crate://crates.io/futures-task/0.3.25 \ - crate://crates.io/futures-util/0.3.25 \ - crate://crates.io/generic-array/0.14.6 \ - crate://crates.io/getrandom/0.2.8 \ - crate://crates.io/h2/0.3.15 \ - crate://crates.io/hashbrown/0.12.3 \ - crate://crates.io/heck/0.4.0 \ - crate://crates.io/hermit-abi/0.1.19 \ - crate://crates.io/hermit-abi/0.2.6 \ - crate://crates.io/http-body/0.4.5 \ - crate://crates.io/http-range-header/0.3.0 \ - crate://crates.io/http/0.2.8 \ - crate://crates.io/httparse/1.8.0 \ - crate://crates.io/httpdate/1.0.2 \ - crate://crates.io/hyper-timeout/0.4.1 \ - crate://crates.io/hyper/0.14.23 \ - crate://crates.io/iana-time-zone-haiku/0.1.1 \ - crate://crates.io/iana-time-zone/0.1.53 \ - crate://crates.io/ident_case/1.0.1 \ - crate://crates.io/indexmap/1.9.2 \ - crate://crates.io/instant/0.1.12 \ - crate://crates.io/itertools/0.10.5 \ - crate://crates.io/itoa/1.0.5 \ - crate://crates.io/js-sys/0.3.60 \ - crate://crates.io/json5/0.4.1 \ - crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.139 \ - crate://crates.io/link-cplusplus/1.0.8 \ - crate://crates.io/linked-hash-map/0.5.6 \ - crate://crates.io/log/0.4.17 \ - crate://crates.io/matchit/0.5.0 \ - crate://crates.io/memchr/2.5.0 \ - crate://crates.io/memoffset/0.7.1 \ - crate://crates.io/mime/0.3.16 \ - crate://crates.io/minimal-lexical/0.2.1 \ - crate://crates.io/mio/0.8.5 \ - crate://crates.io/multimap/0.8.3 \ - crate://crates.io/nix/0.26.1 \ - crate://crates.io/nom/7.1.3 \ - crate://crates.io/num-complex/0.3.1 \ - crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-iter/0.1.43 \ - crate://crates.io/num-rational/0.3.2 \ - crate://crates.io/num-traits/0.2.15 \ - crate://crates.io/num/0.3.1 \ - crate://crates.io/num_cpus/1.15.0 \ - crate://crates.io/numtoa/0.1.0 \ - crate://crates.io/once_cell/1.17.0 \ - crate://crates.io/ordered-multimap/0.4.3 \ - crate://crates.io/os_str_bytes/6.4.1 \ - crate://crates.io/owning_ref/0.4.1 \ - crate://crates.io/pathdiff/0.2.1 \ - crate://crates.io/percent-encoding/2.2.0 \ - crate://crates.io/pest/2.5.3 \ - crate://crates.io/pest_derive/2.5.3 \ - crate://crates.io/pest_generator/2.5.3 \ - crate://crates.io/pest_meta/2.5.3 \ - crate://crates.io/petgraph/0.6.2 \ - crate://crates.io/pin-project-internal/1.0.12 \ - crate://crates.io/pin-project-lite/0.2.9 \ - crate://crates.io/pin-project/1.0.12 \ - crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/ppv-lite86/0.2.17 \ - crate://crates.io/prettyplease/0.1.23 \ - crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro2/1.0.50 \ - crate://crates.io/prost-build/0.11.6 \ - crate://crates.io/prost-derive/0.11.6 \ - crate://crates.io/prost-types/0.11.6 \ - crate://crates.io/prost/0.11.6 \ - crate://crates.io/quote/1.0.23 \ - crate://crates.io/rand/0.8.5 \ - crate://crates.io/rand_chacha/0.3.1 \ - crate://crates.io/rand_core/0.6.4 \ - crate://crates.io/redox_syscall/0.2.16 \ - crate://crates.io/redox_termios/0.1.2 \ - crate://crates.io/regex-syntax/0.6.28 \ - crate://crates.io/regex/1.7.1 \ - crate://crates.io/remove_dir_all/0.5.3 \ - crate://crates.io/ron/0.7.1 \ - crate://crates.io/rust-ini/0.18.0 \ - crate://crates.io/ryu/1.0.12 \ - crate://crates.io/scratch/1.0.3 \ - crate://crates.io/serde/1.0.152 \ - crate://crates.io/serde_derive/1.0.152 \ - crate://crates.io/serde_json/1.0.91 \ - crate://crates.io/sha2/0.10.6 \ - crate://crates.io/shlex/1.1.0 \ - crate://crates.io/signal-hook-registry/1.4.0 \ - crate://crates.io/signal-hook/0.3.14 \ - crate://crates.io/slab/0.4.7 \ - crate://crates.io/smallvec/1.10.0 \ - crate://crates.io/socket2/0.4.7 \ - crate://crates.io/stable_deref_trait/1.2.0 \ - crate://crates.io/static_assertions/1.1.0 \ - crate://crates.io/strip-ansi-escapes/0.1.1 \ - crate://crates.io/strsim/0.10.0 \ - crate://crates.io/strsim/0.9.3 \ - crate://crates.io/syn/1.0.107 \ - crate://crates.io/sync_wrapper/0.1.1 \ - crate://crates.io/tempfile/3.3.0 \ - crate://crates.io/termcolor/1.2.0 \ - crate://crates.io/termion/1.5.6 \ - crate://crates.io/textwrap/0.16.0 \ - crate://crates.io/thiserror-impl/1.0.38 \ - crate://crates.io/thiserror/1.0.38 \ - crate://crates.io/time/0.1.45 \ - crate://crates.io/tokio-io-timeout/1.2.0 \ - crate://crates.io/tokio-macros/1.8.2 \ - crate://crates.io/tokio-stream/0.1.11 \ - crate://crates.io/tokio-util/0.7.4 \ - crate://crates.io/tokio/1.24.1 \ - crate://crates.io/toml/0.5.10 \ - crate://crates.io/tonic-build/0.8.4 \ - crate://crates.io/tonic/0.8.2 \ - crate://crates.io/tower-http/0.3.5 \ - crate://crates.io/tower-layer/0.3.2 \ - crate://crates.io/tower-service/0.3.2 \ - crate://crates.io/tower/0.4.13 \ - crate://crates.io/tracing-attributes/0.1.23 \ - crate://crates.io/tracing-core/0.1.30 \ - crate://crates.io/tracing-futures/0.2.5 \ - crate://crates.io/tracing/0.1.37 \ - crate://crates.io/try-lock/0.2.4 \ - crate://crates.io/typenum/1.16.0 \ - crate://crates.io/ucd-trie/0.1.5 \ - crate://crates.io/unicode-ident/1.0.6 \ - crate://crates.io/unicode-segmentation/1.10.0 \ - crate://crates.io/unicode-width/0.1.10 \ - crate://crates.io/utf8parse/0.2.0 \ - crate://crates.io/version_check/0.9.4 \ - crate://crates.io/vte/0.10.1 \ - crate://crates.io/vte_generate_state_changes/0.1.1 \ - crate://crates.io/want/0.3.0 \ - crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ - crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ - crate://crates.io/wasm-bindgen-backend/0.2.83 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.83 \ - crate://crates.io/wasm-bindgen-macro/0.2.83 \ - crate://crates.io/wasm-bindgen-shared/0.2.83 \ - crate://crates.io/wasm-bindgen/0.2.83 \ - crate://crates.io/wasmer_enumset/1.0.1 \ - crate://crates.io/wasmer_enumset_derive/0.5.0 \ - crate://crates.io/which/4.3.0 \ - crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-util/0.1.5 \ - crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi/0.3.9 \ - crate://crates.io/windows-sys/0.42.0 \ - crate://crates.io/windows_aarch64_gnullvm/0.42.1 \ - crate://crates.io/windows_aarch64_msvc/0.42.1 \ - crate://crates.io/windows_i686_gnu/0.42.1 \ - crate://crates.io/windows_i686_msvc/0.42.1 \ - crate://crates.io/windows_x86_64_gnu/0.42.1 \ - crate://crates.io/windows_x86_64_gnullvm/0.42.1 \ - crate://crates.io/windows_x86_64_msvc/0.42.1 \ - crate://crates.io/xi-unicode/0.3.0 \ - crate://crates.io/yaml-rust/0.4.5 \ -" - -SRC_URI += "file://LICENSE" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -include kantui.inc From 418cdea9492de064ad477091f0c12d408147326c Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Mon, 19 Jun 2023 18:00:58 +0200 Subject: [PATCH 16/18] kantui: fixed SRC_URI Signed-off-by: Guenther Meyer --- meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb b/meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb index 2c0d1161..906c554d 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kantui_0.3.0.bb @@ -15,7 +15,7 @@ inherit cargo -SRC_URI += "gitsm://git@github.com/eclipse-leda/leda-utils.git;protocol=https;nobranch=1;branch=main" +SRC_URI += "gitsm://github.com/eclipse-leda/leda-utils.git;protocol=https;nobranch=1;branch=main" SRCREV = "006e8f0e7d993be9f7405d8f61db8fb8a58a49eb" S = "${WORKDIR}/git" CARGO_SRC_DIR = "src/rust/kanto-tui" From 7a1fcf1bfda9e59c2ff5c162f9c19bde9ddeea98 Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Mon, 19 Jun 2023 18:03:08 +0200 Subject: [PATCH 17/18] kanto-auto-deployer: update recipe Signed-off-by: Guenther Meyer --- .../classes/kanto-auto-deployer.bbclass | 3 +- .../kanto-auto-deployer.service.template | 4 +- .../eclipse-leda/kanto-auto-deployer.inc | 61 +++++-------------- ...er_git.bb => kanto-auto-deployer_0.2.2.bb} | 47 +++----------- .../eclipse-leda/sdv-core-containers.bb | 4 ++ .../eclipse-leda/sdv-example-containers.bb | 3 + 6 files changed, 33 insertions(+), 89 deletions(-) rename meta-leda-components/recipes-sdv/eclipse-leda/{kanto-auto-deployer_git.bb => kanto-auto-deployer_0.2.2.bb} (79%) diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/classes/kanto-auto-deployer.bbclass b/meta-leda-components/recipes-sdv/eclipse-leda/classes/kanto-auto-deployer.bbclass index 6a94a2fe..2f5b9ebb 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/classes/kanto-auto-deployer.bbclass +++ b/meta-leda-components/recipes-sdv/eclipse-leda/classes/kanto-auto-deployer.bbclass @@ -1,5 +1,5 @@ # /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * Copyright (c) 2023 Contributors to the Eclipse Foundation # * # * See the NOTICE file(s) distributed with this work for additional # * information regarding copyright ownership. @@ -10,7 +10,6 @@ # * # * SPDX-License-Identifier: Apache-2.0 # ********************************************************************************/ -# KANTO_MANIFESTS_LOCAL_DIR ??= "/var/containers/manifests" KANTO_MANIFESTS_LOCAL_DEV_DIR ??= "/var/containers/manifests_dev" diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/files/kanto-auto-deployer.service.template b/meta-leda-components/recipes-sdv/eclipse-leda/files/kanto-auto-deployer.service.template index 53d24f3c..4bf6c071 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/files/kanto-auto-deployer.service.template +++ b/meta-leda-components/recipes-sdv/eclipse-leda/files/kanto-auto-deployer.service.template @@ -1,5 +1,5 @@ # /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * Copyright (c) 2023 Contributors to the Eclipse Foundation # * # * See the NOTICE file(s) distributed with this work for additional # * information regarding copyright ownership. @@ -10,7 +10,7 @@ # * # * SPDX-License-Identifier: Apache-2.0 # ********************************************************************************/ -# Eclipse Leda + [Unit] Description=Kanto Auto Deployer After=network-online.target container-management.service diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc index 3dfcd801..c35d4202 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc @@ -1,5 +1,5 @@ # /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * Copyright (c) 2023 Contributors to the Eclipse Foundation # * # * See the NOTICE file(s) distributed with this work for additional # * information regarding copyright ownership. @@ -11,55 +11,28 @@ # * SPDX-License-Identifier: Apache-2.0 # ********************************************************************************/ +inherit systemd kanto-auto-deployer + +SUMMARY = "Kanto Auto Deployer via a unix socket" +DESCRIPTION = "Automated deployment of Kanto Container Management Manifests" +HOMEPAGE = "https://github.com/eclipse-leda/leda-utils" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SYSTEMD_AUTO_ENABLE = "enable" +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kanto-auto-deployer.service','',d)}" + +KANTO_SERVICE_DIR = "${systemd_unitdir}/system" -PACKAGES = "${PN} ${PN}-dbg" -FILES:${PN} += "${bindir}/kanto-auto-deployer" FILES:${PN} += "${systemd_unitdir}/system/kanto-auto-deployer.service" FILES:${PN} += "${KANTO_MANIFESTS_DEV_DIR}" -FILES:${PN}-dbg += "${bindir}/.debug" do_install:append() { - cargo_do_install - install_service -} - -cargo_do_install () { - local have_installed=false - for tgt in "${B}/target/${CARGO_TARGET_SUBDIR}/"*; do - case $tgt in - *.so|*.rlib) - install -d "${D}${rustlibdir}" - install -m755 "$tgt" "${D}${rustlibdir}" - have_installed=true - ;; - *examples) - if [ -d "$tgt" ]; then - for example in "$tgt/"*; do - if [ -f "$example" ] && [ -x "$example" ]; then - install -d "${D}${bindir}" - install -m755 "$example" "${D}${bindir}" - have_installed=true - fi - done - fi - ;; - *) - if [ -f "$tgt" ] && [ -x "$tgt" ]; then - install -d "${D}${bindir}" - install -m755 "$tgt" "${D}${bindir}" - have_installed=true - fi - ;; - esac - done - if ! $have_installed; then - die "Did not find anything to install" - fi - + install_service } -KANTO_SERVICE_DIR = "${systemd_unitdir}/system" - install_service() { install -d ${D}${KANTO_SERVICE_DIR} install -m 0644 ${THISDIR}/files/kanto-auto-deployer.service.template ${D}${KANTO_SERVICE_DIR}/kanto-auto-deployer.service @@ -75,5 +48,3 @@ install_service() { install -d ${D}${KANTO_MANIFESTS_DEV_DIR} } - - diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_0.2.2.bb similarity index 79% rename from meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb rename to meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_0.2.2.bb index ee8354e7..a187678d 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_0.2.2.bb @@ -1,5 +1,5 @@ # /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * Copyright (c) 2023 Contributors to the Eclipse Foundation # * # * See the NOTICE file(s) distributed with this work for additional # * information regarding copyright ownership. @@ -11,40 +11,15 @@ # * SPDX-License-Identifier: Apache-2.0 # ********************************************************************************/ # -DESCRIPTION = "Kanto Auto Deployer" -inherit systemd +# Auto-Generated by cargo-bitbake 0.3.16 -SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" -SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kanto-auto-deployer.service','',d)}" - -PROVIDES:${PN} += "kanto-auto-deployer" -RPROVIDES:${PN} += "kanto-auto-deployer" - -inherit cargo kanto-auto-deployer - -RDEPENDS_${PN} += " grpc protobuf nativesdk-protobuf" -DEPENDS += " protobuf protobuf-native grpc git-native" - -SRCREV_FORMAT = "kadsrc_containerm" - -PV:append = ".AUTOINC+cead2d028f" -SRC_URI += "git://github.com/eclipse-leda/leda-utils.git;protocol=https;name=kadsrc;branch=main" -SRCREV_kadsrc = "cead2d028fb011f124b0f321e2c3a7c4e1845c12" - -# Fetch the Kanto Container Management repository since kanto-auto-deployer needs the protobuf files from kanto CM -SRC_URI += "git://github.com/eclipse-kanto/container-management;protocol=https;branch=main;name=containerm;destsuffix=git/src/rust/kanto-auto-deployer/container-management" -SRCREV_containerm = "65e00358fa5aed1792059488a80fe755b36a8191" +inherit cargo +SRC_URI += "gitsm://github.com/eclipse-leda/leda-utils.git;protocol=https;nobranch=1;branch=main" +SRCREV = "006e8f0e7d993be9f7405d8f61db8fb8a58a49eb" S = "${WORKDIR}/git" - CARGO_SRC_DIR = "src/rust/kanto-auto-deployer" -RUSTC = "rustc" -PROTOC = "protoc --proto_path=/src/rust/kanto-auto-deployer/container-management/containerm" - -# please note if you have entries that do not begin with crate:// -# you must change them to how that package can be fetched SRC_URI += " \ crate://crates.io/aho-corasick/0.7.20 \ crate://crates.io/anyhow/1.0.70 \ @@ -162,6 +137,7 @@ SRC_URI += " \ crate://crates.io/thiserror/1.0.40 \ crate://crates.io/tokio-io-timeout/1.2.0 \ crate://crates.io/tokio-macros/2.0.0 \ + crate://crates.io/tokio-retry/0.3.0 \ crate://crates.io/tokio-stream/0.1.12 \ crate://crates.io/tokio-util/0.7.7 \ crate://crates.io/tokio/1.27.0 \ @@ -198,14 +174,5 @@ SRC_URI += " \ crate://crates.io/windows_x86_64_msvc/0.42.2 \ " -SRC_URI += "file://LICENSE" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SUMMARY = "Kanto Auto Deployer via a unix socket" -HOMEPAGE = "https://github.com/eclipse-leda/leda-utils/tree/main/src/rust/kanto-auto-deployer" - -# includes this file if it exists but does not fail -# this is useful for anything you may want to override from -# what cargo-bitbake generates. +include kanto-auto-deployer-${PV}.inc include kanto-auto-deployer.inc diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-core-containers.bb b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-core-containers.bb index 11f71ab5..a2fbcf3d 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-core-containers.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-core-containers.bb @@ -27,6 +27,8 @@ SRC_URI:append = " file://core/cloudconnector.json" do_install:append() { install -d ${D}${KANTO_MANIFESTS_LOCAL_DIR} + install -d ${D}${KANTO_MANIFESTS_LOCAL_DEV_DIR} + install ${WORKDIR}/core/databroker.json ${D}${KANTO_MANIFESTS_LOCAL_DIR} install ${WORKDIR}/core/vum.json ${D}${KANTO_MANIFESTS_LOCAL_DIR} install ${WORKDIR}/core/sua.json ${D}${KANTO_MANIFESTS_LOCAL_DIR} @@ -35,6 +37,8 @@ do_install:append() { PACKAGES = "${PN}" FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}" +FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DEV_DIR}" + FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/databroker.json" FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/vum.json" FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/sua.json" diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-example-containers.bb b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-example-containers.bb index 11265cf3..e6508055 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-example-containers.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-example-containers.bb @@ -29,6 +29,7 @@ SRC_URI:append = " file://example/otelcol-sdv-exporter.json.disabled" do_install:append() { install -d ${D}${KANTO_MANIFESTS_LOCAL_DIR} + install -d ${D}${KANTO_MANIFESTS_LOCAL_DEV_DIR} # Activated Containers install ${WORKDIR}/example/hvac.json ${D}${KANTO_MANIFESTS_LOCAL_DIR} @@ -46,6 +47,8 @@ do_install:append() { PACKAGES = "${PN}" FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}" +FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DEV_DIR}" + FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/hvac.json" FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/feedercan.json" FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/seatservice.json" From b2cbafe665800d3a8ea36cf95859fbab5f32bd3c Mon Sep 17 00:00:00 2001 From: Guenther Meyer Date: Mon, 19 Jun 2023 18:09:17 +0200 Subject: [PATCH 18/18] packagegroup-sdv-additions: remove kanto-auto-deployer The entry is redundant, because kanto-auto-deployer is already part of packagegroup-sdv-core. Signed-off-by: Guenther Meyer --- .../recipes-sdv/packagegroups/packagegroup-sdv-additions.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb index 7d2d9324..b1fd0793 100644 --- a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb +++ b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb @@ -17,7 +17,6 @@ DESCRIPTION = "Packages required to set up a basic working demo SDV system, but inherit packagegroup RDEPENDS:${PN} = "\ - kanto-auto-deployer \ kantui \ "