From 8a3944ae0cf1ba5fffb1b1dfd148e536ef98500b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 18 Jun 2024 15:48:15 -0400 Subject: kuksa-val: remove deprecated KUKSA.val server Remove recipes for deprecated KUKSA.val C++ based server and associated configuration. It is no longer supported by upstream, and has not been used in the demo images for multiple releases. Bug-AGL: SPEC-5179 Change-Id: I339dc62df667650a5025e58d6f8272b040ef393d Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29999 ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- recipes-connectivity/kuksa-val/kuksa-val-agl.bb | 23 --- .../kuksa-val-agl/00-agl_vss_overlay_2.2.json | 153 ---------------- .../kuksa-val/kuksa-val-agl/kuksa-val.env | 1 - ...0001-Make-Boost-requirements-more-liberal.patch | 41 ----- ...gRPC-configuration-for-OE-cross-compiling.patch | 53 ------ .../0003-Make-install-locations-configurable.patch | 198 --------------------- ...ble-default-fetch-and-build-of-googletest.patch | 83 --------- ...l-server-Add-missing-check_git-dependency.patch | 32 ---- ...erver-OverlayLoader-explicitly-include-fs.patch | 35 ---- .../kuksa-val/kuksa-val/kuksa-val.service | 12 -- recipes-connectivity/kuksa-val/kuksa-val_git.bb | 89 --------- 11 files changed, 720 deletions(-) delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val-agl.bb delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val-agl/00-agl_vss_overlay_2.2.json delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val-agl/kuksa-val.env delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val/0001-Make-Boost-requirements-more-liberal.patch delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val/0003-Make-install-locations-configurable.patch delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val/0004-Disable-default-fetch-and-build-of-googletest.patch delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val/0005-kuksa-val-server-Add-missing-check_git-dependency.patch delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val/kuksa-val.service delete mode 100644 recipes-connectivity/kuksa-val/kuksa-val_git.bb (limited to 'recipes-connectivity/kuksa-val') diff --git a/recipes-connectivity/kuksa-val/kuksa-val-agl.bb b/recipes-connectivity/kuksa-val/kuksa-val-agl.bb deleted file mode 100644 index 8b69e5e51..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val-agl.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "AGL demo signal overlay for KUKSA.val, the KUKSA Vehicle Abstraction Layer" -HOMEPAGE = "https://github.com/eclipse/kuksa.val" -BUGTRACKER = "https://github.com/eclipse/kuksa.val/issues" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://kuksa-val.env" - -inherit allarch update-alternatives - -do_install() { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/kuksa-val.env ${D}${sysconfdir}/default/kuksa-val.agl -} - -FILES:${PN} += "${datadir}/kuksa-val/overlays" - -ALTERNATIVE:${PN} = "kuksa-val-env" -ALTERNATIVE_LINK_NAME[kuksa-val-env] = "${sysconfdir}/default/kuksa-val" -ALTERNATIVE_TARGET[kuksa-val-env] = "${sysconfdir}/default/kuksa-val.agl" - -RDEPENDS:${PN} += "kuksa-val vss-agl" diff --git a/recipes-connectivity/kuksa-val/kuksa-val-agl/00-agl_vss_overlay_2.2.json b/recipes-connectivity/kuksa-val/kuksa-val-agl/00-agl_vss_overlay_2.2.json deleted file mode 100644 index 423d32385..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val-agl/00-agl_vss_overlay_2.2.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "Vehicle": { - "children": { - "Cabin": { - "children": { - "SteeringWheel": { - "children": { - "Switches": { - "children": { - "VolumeUp": { - "datatype": "boolean", - "description": "Steering wheel volume up switch engaged", - "type": "sensor", - "uuid": "b1b71c0d19684170bbf9fc40eb4d0d0e" - }, - "VolumeDown": { - "datatype": "boolean", - "description": "Steering wheel volume down switch engaged", - "type": "sensor", - "uuid": "03ff9703a5604ab190cf518eec08ba07" - }, - "VolumeMute": { - "datatype": "boolean", - "description": "Steering wheel volume mute switch engaged", - "type": "sensor", - "uuid": "c20467086cf846dc9f27da93d611af12" - }, - "Next": { - "datatype": "boolean", - "description": "Steering wheel next switch engaged", - "type": "sensor", - "uuid": "a2a997e5e6a848d0be1bf8b8bc45e215" - }, - "Previous": { - "datatype": "boolean", - "description": "Steering wheel previous switch engaged", - "type": "sensor", - "uuid": "1505a53421044bccb249f08c270e3912" - }, - "Mode": { - "datatype": "boolean", - "description": "Steering wheel mode switch engaged", - "type": "sensor", - "uuid": "6cba659f06ae4809adb5de53786ab0b6" - }, - "Info": { - "datatype": "boolean", - "description": "Steering wheel info switch engaged", - "type": "sensor", - "uuid": "5dd6d297edfb4cb99ab2ed7723877cd0" - }, - "CruiseEnable": { - "datatype": "boolean", - "description": "Steering wheel cruise enable switch engaged", - "type": "sensor", - "uuid": "f4f383fbf3ff4a7b99ea71203cd8a446" - }, - "CruiseSet": { - "datatype": "boolean", - "description": "Steering wheel cruise set switch engaged", - "type": "sensor", - "uuid": "14bd5c2326a043b79898df4e80403a93" - }, - "CruiseResume": { - "datatype": "boolean", - "description": "Steering wheel cruise resume switch engaged", - "type": "sensor", - "uuid": "000cc121e98345f2976615f550b91639" - }, - "CruiseCancel": { - "datatype": "boolean", - "description": "Steering wheel cruise cancel switch engaged", - "type": "sensor", - "uuid": "b953dac89a2b40fdace6c74bb212afb8" - }, - "CruiseLimit": { - "datatype": "boolean", - "description": "Steering wheel cruise limit switch engaged", - "type": "sensor", - "uuid": "1c211ac5dd4d42249d7e1c104ef81df9" - }, - "CruiseDistance": { - "datatype": "boolean", - "description": "Steering wheel cruise distance switch engaged", - "type": "sensor", - "uuid": "744c8913afe641d0903c44932879ab43" - }, - "Voice": { - "datatype": "boolean", - "description": "Steering wheel voice switch engaged", - "type": "sensor", - "uuid": "9d78ab3889d74209acf6974e070d9d57" - }, - "PhoneCall": { - "datatype": "boolean", - "description": "Steering wheel phone call switch engaged", - "type": "sensor", - "uuid": "3b505e5d962546c7a03509a5c14cfd60" - }, - "PhoneSwitch": { - "datatype": "boolean", - "description": "Steering wheel phone call switch engaged", - "type": "sensor", - "uuid": "f19d7c584f2f4f0080a10f773e472359" - }, - "Horn": { - "datatype": "boolean", - "description": "Steering wheel horn switch engaged", - "type": "sensor", - "uuid": "e025a116b74a41a0a283815621a41fb2" - }, - "LaneDepartureWarning": { - "datatype": "boolean", - "description": "Steering wheel lane departure warning switch engaged", - "type": "sensor", - "uuid": "6dd9c149da8449df885e6250e912e986" - } - } - } - } - }, - "Infotainment": { - "children": { - "Navigation": { - "children": { - "State": { - "datatype": "string", - "description": "Navigation state", - "enum": [ - "unknown", - "Active", - "Arrived", - "Stopped" - ], - "type": "sensor", - "uuid": "4c16a4aace5a418580c6370356d2acb9" - }, - "ElapsedDistance": { - "datatype": "float", - "description": "Navigation elapsed distance", - "type": "sensor", - "unit": "km", - "uuid": "0bef606dcf5b4a75bfd7e5f3c68359ec" - } - } - } - } - } - } - } - } - } -} diff --git a/recipes-connectivity/kuksa-val/kuksa-val-agl/kuksa-val.env b/recipes-connectivity/kuksa-val/kuksa-val-agl/kuksa-val.env deleted file mode 100644 index c7cffb387..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val-agl/kuksa-val.env +++ /dev/null @@ -1 +0,0 @@ -EXTRA_ARGS="--vss /usr/share/vss/vss.json" diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0001-Make-Boost-requirements-more-liberal.patch b/recipes-connectivity/kuksa-val/kuksa-val/0001-Make-Boost-requirements-more-liberal.patch deleted file mode 100644 index 244191662..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val/0001-Make-Boost-requirements-more-liberal.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 69a64b4426fdeff1c1e098941496deda5ad3ea31 Mon Sep 17 00:00:00 2001 -From: Scott Murray -Date: Thu, 6 Oct 2022 11:56:38 -0400 -Subject: [PATCH 1/5] Make Boost requirements more liberal - -To allow building with Yocto Project 4.0/kirkstone, remove the EXACT -specifier from the Boost find_package call and restore the lower -Boost version originally specified before upstream commit 7ea6026d -raised it due to issues with the in-tree build. - -Upstream-Status: Pending - -Signed-off-by: Scott Murray ---- - kuksa-val-server/boost.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kuksa-val-server/boost.cmake b/kuksa-val-server/boost.cmake -index 7358976..0da54df 100644 ---- a/kuksa-val-server/boost.cmake -+++ b/kuksa-val-server/boost.cmake -@@ -19,14 +19,14 @@ - # 4. Change version in main README.md file for KUKSA.val Server - - set(Boost_USE_STATIC_LIBS OFF) --set(BOOST_VER 1.82.0) -+set(BOOST_VER 1.75.0) - set(Boost_NO_BOOST_CMAKE ON) - set(BOOST_COMPONENTS filesystem program_options system log thread) - ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK) - - # Workaround function to allow cmake call `find_package` twice. Avoide side effects from local variables, which are produced be `find_package` - function(findBoost Required) -- find_package(Boost ${BOOST_VER} EXACT ${Required} -+ find_package(Boost ${BOOST_VER} ${Required} - COMPONENTS ${BOOST_COMPONENTS} - OPTIONAL_COMPONENTS unit_test_framework - ) --- -2.41.0 - diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch b/recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch deleted file mode 100644 index a7eaf1004..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 09eba6eef270a3f75add5c54b5455399aecceaf6 Mon Sep 17 00:00:00 2001 -From: Scott Murray -Date: Thu, 6 Oct 2022 11:56:57 -0400 -Subject: [PATCH 2/3] Fix gRPC configuration for OE cross-compiling - -The gRPC CMake package that kuksa.val pulls in is problematic with -respect to cross-compiling with OpenEmbedded's split native and -target sysroots, as the location of the grpc_cpp_plugin does not -match the (somewhat ill-advised) assumptions in the original -upstream gRPC configuration. To work around this, a patch to -gRPC is separately applied to split the plugins into their own -optional package, and the logic in grpc.cmake here tweaked to -explicitly take cross-compilation into account. - -Upstream-Status: Pending - -Signed-off-by: Scott Murray ---- - kuksa-val-server/grpc.cmake | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/kuksa-val-server/grpc.cmake b/kuksa-val-server/grpc.cmake -index 4d90f1d..d097a69 100644 ---- a/kuksa-val-server/grpc.cmake -+++ b/kuksa-val-server/grpc.cmake -@@ -14,14 +14,21 @@ set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library") - set(GRPC_VER 1.44.0) - - find_package(Protobuf) --find_package(gRPC ${GRPC_VER} EXACT CONFIG) -+find_package(gRPC ${GRPC_VER} CONFIG) -+if(NOT CMAKE_CROSSCOMPILING) -+ find_package(gRPCPlugin ${GRPC_VER} CONFIG) -+ if(gRPCPlugin_FOUND) -+ set(_GRPC_CPP_PLUGIN_EXECUTABLE $) -+ endif() -+else() -+ find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) -+endif() - --if(Protobuf_FOUND AND gRPC_FOUND) -+if(Protobuf_FOUND AND gRPC_FOUND AND _GRPC_CPP_PLUGIN_EXECUTABLE) - message(STATUS "Using protobuf ${protobuf_VERSION}") - message(STATUS "Using gRPC ${gRPC_VERSION}") - - set(_GRPC_GRPCPP gRPC::grpc++) -- set(_GRPC_CPP_PLUGIN_EXECUTABLE $) - set(_REFLECTION gRPC::grpc++_reflection) - set(_PROTOBUF_PROTOC $) - --- -2.37.3 - diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0003-Make-install-locations-configurable.patch b/recipes-connectivity/kuksa-val/kuksa-val/0003-Make-install-locations-configurable.patch deleted file mode 100644 index 11db788b0..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val/0003-Make-install-locations-configurable.patch +++ /dev/null @@ -1,198 +0,0 @@ -From f73106b1f204b49930922e8bb4d1fdec6ac64b7d Mon Sep 17 00:00:00 2001 -From: Scott Murray -Date: Sat, 5 Aug 2023 12:19:45 -0400 -Subject: [PATCH 5/5] Make install locations configurable - -Make binary, certificate, and configuration file install locations -configurable, including generation and installation of an accurate -default config.ini as well as a header file so that the server -binary uses the specified defaults. This allows configuring a -build that installs files into locations more along the lines of -the Linux FHS. An effort has been made to ensure that the previous -default locations are maintained. - -Upstream-Status: Pending - -Signed-off-by: Scott Murray ---- - kuksa-val-server/config.ini | 7 ---- - kuksa-val-server/config.ini.in | 7 ++++ - kuksa-val-server/src/CMakeLists.txt | 59 +++++++++++++++++++++-------- - kuksa-val-server/src/config.hpp.in | 27 +++++++++++++ - kuksa-val-server/src/main.cpp | 5 ++- - 5 files changed, 81 insertions(+), 24 deletions(-) - delete mode 100644 kuksa-val-server/config.ini - create mode 100644 kuksa-val-server/config.ini.in - create mode 100644 kuksa-val-server/src/config.hpp.in - -diff --git a/kuksa-val-server/config.ini b/kuksa-val-server/config.ini -deleted file mode 100644 -index 8fcd63c..0000000 ---- a/kuksa-val-server/config.ini -+++ /dev/null -@@ -1,7 +0,0 @@ --vss = vss_release_4.0.json --log-level = ALL --cert-path = . -- --[mqtt] -- publish = -- topic-prefix = vss -diff --git a/kuksa-val-server/config.ini.in b/kuksa-val-server/config.ini.in -new file mode 100644 -index 0000000..3793bd6 ---- /dev/null -+++ b/kuksa-val-server/config.ini.in -@@ -0,0 +1,7 @@ -+vss = @KUKSA_DEFAULT_DATADIR@/vss_release_4.0.json -+log-level = ALL -+cert-path = @KUKSA_DEFAULT_CERTDIR@ -+ -+[mqtt] -+ publish = -+ topic-prefix = vss -diff --git a/kuksa-val-server/src/CMakeLists.txt b/kuksa-val-server/src/CMakeLists.txt -index 908c66c..b749a7a 100644 ---- a/kuksa-val-server/src/CMakeLists.txt -+++ b/kuksa-val-server/src/CMakeLists.txt -@@ -161,6 +161,35 @@ if(BUILD_EXE) - ###### - # Setup server install and packaging - -+ set(KUKSA_INSTALL_BINDIR "bin/${SERVER_EXE_NAME}" CACHE STRING "Server binary install directory") -+ -+ if(DEFINED KUKSA_INSTALL_DATADIR) -+ set(KUKSA_DEFAULT_DATADIR_INTERNAL "${KUKSA_INSTALL_DATADIR}") -+ else() -+ set(KUKSA_DEFAULT_DATADIR_INTERNAL ".") -+ endif() -+ set(KUKSA_INSTALL_DATADIR "${KUKSA_INSTALL_BINDIR}" CACHE STRING "Data install directory") -+ set(KUKSA_DEFAULT_DATADIR "${KUKSA_DEFAULT_DATADIR_INTERNAL}" CACHE STRING "Default data location") -+ -+ if(DEFINED KUKSA_INSTALL_CONFIGDIR) -+ set(KUKSA_DEFAULT_CONFIG "${KUKSA_INSTALL_CONFIGDIR}/config.ini" CACHE STRING "Default config.ini location") -+ else() -+ set(KUKSA_DEFAULT_CONFIG "config.ini" CACHE STRING "Default config.ini location") -+ endif() -+ set(KUKSA_INSTALL_CONFIGDIR "${KUKSA_INSTALL_BINDIR}" CACHE STRING "config.ini install directory") -+ -+ if(DEFINED KUKSA_INSTALL_CERTDIR) -+ set(KUKSA_DEFAULT_CERTDIR_INTERNAL "${KUKSA_INSTALL_CERTDIR}") -+ else() -+ set(KUKSA_DEFAULT_CERTDIR_INTERNAL ".") -+ endif() -+ set(KUKSA_INSTALL_CERTDIR "${KUKSA_INSTALL_BINDIR}" CACHE STRING "Certificate install directory") -+ set(KUKSA_DEFAULT_CERTDIR "${KUKSA_DEFAULT_CERTDIR_INTERNAL}" CACHE STRING "Default certificate location") -+ -+ # Generate header for main.cpp to pick up default locations -+ configure_file(config.hpp.in config.hpp @ONLY) -+ include_directories(${CMAKE_CURRENT_BINARY_DIR}) -+ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/jwt/jwt.key.pub ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Server.pem ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Server.key ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) -@@ -173,23 +202,23 @@ if(BUILD_EXE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_3.0.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_3.1.1.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_4.0.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../config.ini ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../config.ini.in ${CMAKE_CURRENT_BINARY_DIR}/config.ini @COPY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../config_grpc_client.ini ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) - -- install( TARGETS ${SERVER_EXE_NAME} DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/jwt/jwt.key.pub DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Server.pem DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Server.key DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Client.pem DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Client.key DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/CA.pem DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.0.json DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.1.json DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.2.json DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_3.0.json DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_3.1.1.json DESTINATION bin/${SERVER_EXE_NAME}) -- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_4.0.json DESTINATION bin/${SERVER_EXE_NAME}) -- -+ install( TARGETS ${SERVER_EXE_NAME} DESTINATION ${KUKSA_INSTALL_BINDIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/jwt/jwt.key.pub DESTINATION ${KUKSA_INSTALL_CERTDIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Server.pem DESTINATION ${KUKSA_INSTALL_CERTDIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Server.key DESTINATION ${KUKSA_INSTALL_CERTDIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Client.pem DESTINATION ${KUKSA_INSTALL_CERTDIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/Client.key DESTINATION ${KUKSA_INSTALL_CERTDIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../kuksa_certificates/CA.pem DESTINATION ${KUKSA_INSTALL_CERTDIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.0.json DESTINATION ${KUKSA_INSTALL_DATADIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.1.json DESTINATION ${KUKSA_INSTALL_DATADIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.2.json DESTINATION ${KUKSA_INSTALL_DATADIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_3.0.json DESTINATION ${KUKSA_INSTALL_DATADIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_3.1.1.json DESTINATION ${KUKSA_INSTALL_DATADIR}) -+ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_4.0.json DESTINATION ${KUKSA_INSTALL_DATADIR}) -+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.ini DESTINATION ${KUKSA_INSTALL_CONFIGDIR}) - - # CPack - INCLUDE(InstallRequiredSystemLibraries) -diff --git a/kuksa-val-server/src/config.hpp.in b/kuksa-val-server/src/config.hpp.in -new file mode 100644 -index 0000000..24226d2 ---- /dev/null -+++ b/kuksa-val-server/src/config.hpp.in -@@ -0,0 +1,27 @@ -+/********************************************************************** -+ * Copyright (c) 2022 Konsulko Group -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ * SPDX-License-Identifier: Apache-2.0 -+ **********************************************************************/ -+ -+#ifndef __CONFIG_H___ -+ -+// Default configuration file location -+#cmakedefine KUKSA_DEFAULT_CONFIG "@KUKSA_DEFAULT_CONFIG@" -+ -+// Default Certificate directory -+#cmakedefine KUKSA_DEFAULT_CERTDIR "@KUKSA_DEFAULT_CERTDIR@" -+ -+#endif -diff --git a/kuksa-val-server/src/main.cpp b/kuksa-val-server/src/main.cpp -index f3e6dd1..8346188 100644 ---- a/kuksa-val-server/src/main.cpp -+++ b/kuksa-val-server/src/main.cpp -@@ -47,6 +47,7 @@ - #include "exception.hpp" - #include "grpcHandler.hpp" - #include "OverlayLoader.hpp" -+#include "config.hpp" - - - #include "../buildinfo.h" -@@ -107,7 +108,7 @@ int main(int argc, const char *argv[]) { - program_options::options_description desc{"OPTIONS"}; - desc.add_options() - ("help,h", "Help screen") -- ("config-file,c", program_options::value()->default_value(boost::filesystem::path{"config.ini"}), -+ ("config-file,c", program_options::value()->default_value(boost::filesystem::path{KUKSA_DEFAULT_CONFIG}), - "Configuration file with `kuksa-val-server` input parameters." - "Configuration file can replace command-line parameters and through different files multiple configurations can be handled more easily (e.g. test and production setup)." - "Sample of configuration file parameters looks like:\n" -@@ -116,7 +117,7 @@ int main(int argc, const char *argv[]) { - "log-level = ALL\n") - ("vss", program_options::value()->required(), "[mandatory] Path to VSS data file describing VSS data tree structure which `kuksa-val-server` shall handle. Sample 'vss_release_4.0.json' file can be found under [data](./data/vss-core/vss_release_4.0.json)") - ("overlays", program_options::value(), "Path to a directory cotaiing additional VSS models. All json files will be applied on top of the main vss file given by the -vss parameter in alphanumerical order") -- ("cert-path", program_options::value()->required()->default_value(boost::filesystem::path(".")), -+ ("cert-path", program_options::value()->required()->default_value(boost::filesystem::path(KUKSA_DEFAULT_CERTDIR)), - "[mandatory] Directory path where 'Server.pem', 'Server.key' and 'jwt.key.pub' are located. ") - ("insecure", program_options::bool_switch()->default_value(false), "By default, `kuksa-val-server` shall accept only SSL (TLS) secured connections. If provided, `kuksa-val-server` shall also accept plain un-secured connections for Web-Socket and GRPC API connections, and also shall not fail connections due to self-signed certificates.") - ("use-keycloak", "Use KeyCloak for permission management") --- -2.41.0 - diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0004-Disable-default-fetch-and-build-of-googletest.patch b/recipes-connectivity/kuksa-val/kuksa-val/0004-Disable-default-fetch-and-build-of-googletest.patch deleted file mode 100644 index 8dc8b213c..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val/0004-Disable-default-fetch-and-build-of-googletest.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 21a33ac3b07b00b510c80f50bde7cc42dcada039 Mon Sep 17 00:00:00 2001 -From: Scott Murray -Date: Thu, 6 Oct 2022 13:31:02 -0400 -Subject: [PATCH 3/3] Disable default fetch and build of googletest - -The logic in test/unit-test/CMakeLists.txt was always fetching and -building googletest even if the unit-test was not enabled (which is -the default), rework it a bit to only do so when the unit-test is -desired. - -Upstream-Status: Pending - -Signed-off-by: Scott Murray ---- - .../test/unit-test/CMakeLists.txt | 42 +++++++++---------- - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/kuksa-val-server/test/unit-test/CMakeLists.txt b/kuksa-val-server/test/unit-test/CMakeLists.txt -index 55eedc9..6cec94f 100644 ---- a/kuksa-val-server/test/unit-test/CMakeLists.txt -+++ b/kuksa-val-server/test/unit-test/CMakeLists.txt -@@ -16,18 +16,6 @@ enable_testing() - include(CTest) - include(FetchContent) - --FetchContent_Declare( -- googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG release-1.11.0 --) -- --FetchContent_GetProperties(googletest) --if(NOT googletest_POPULATED) -- FetchContent_Populate(googletest) -- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) --endif() -- - ###### - # CMake configuration responsible for building kuksa-val optional unit tests based on core library - -@@ -37,18 +25,30 @@ set(UNITTEST_EXE_NAME "kuksaval-unit-test" ) - - set(BUILD_UNIT_TEST OFF CACHE BOOL "Build unit tests") - --### --# Setup targets -+if(BUILD_UNIT_TEST) -+ FetchContent_Declare( -+ googletest -+ GIT_REPOSITORY https://github.com/google/googletest.git -+ GIT_TAG release-1.11.0 -+ ) - --set(proto_gen_dir "${CMAKE_BINARY_DIR}/proto") --include_directories(${proto_gen_dir}) --include_directories(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) -+ FetchContent_GetProperties(googletest) -+ if(NOT googletest_POPULATED) -+ FetchContent_Populate(googletest) -+ add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) -+ endif() - --# Prevent GoogleTest from overriding our compiler/linker options --# when building with Visual Studio --set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -+ ### -+ # Setup targets -+ -+ set(proto_gen_dir "${CMAKE_BINARY_DIR}/proto") -+ include_directories(${proto_gen_dir}) -+ include_directories(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) -+ -+ # Prevent GoogleTest from overriding our compiler/linker options -+ # when building with Visual Studio -+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - --if(BUILD_UNIT_TEST) - add_executable(${UNITTEST_EXE_NAME} - AccessCheckerTests.cpp - AuthenticatorTests.cpp --- -2.37.3 - diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0005-kuksa-val-server-Add-missing-check_git-dependency.patch b/recipes-connectivity/kuksa-val/kuksa-val/0005-kuksa-val-server-Add-missing-check_git-dependency.patch deleted file mode 100644 index ea866a6e0..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val/0005-kuksa-val-server-Add-missing-check_git-dependency.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4c232caca95606fe4be6f84fe437c4bb506c885e Mon Sep 17 00:00:00 2001 -From: Scott Murray -Date: Wed, 1 Mar 2023 16:25:38 -0500 -Subject: [PATCH] kuksa-val-server: Add missing check_git dependency - -There was no explicit dependency on the check_git target in -kuksa-val-server/src/CMakeLists.txt, so there was a race with -creating buildinfo.h when building parallel, leading to -intermittent build failures on the AGL CI builders. Add the -dependency to improve build robustness. - -Upstream-Status: Pending -Signed-off-by: Scott Murray ---- - kuksa-val-server/src/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kuksa-val-server/src/CMakeLists.txt b/kuksa-val-server/src/CMakeLists.txt -index 9428306..afc570e 100644 ---- a/kuksa-val-server/src/CMakeLists.txt -+++ b/kuksa-val-server/src/CMakeLists.txt -@@ -142,6 +142,7 @@ endif() - if(BUILD_EXE) - add_executable(${SERVER_EXE_NAME} main.cpp - ) -+ add_dependencies(${SERVER_EXE_NAME} check_git) - - if (ENABLE_COVERAGE) - add_coverage(${SERVER_EXE_NAME}) --- -2.39.2 - diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch b/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch deleted file mode 100644 index 0f40a7c1c..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60561b755cbfbb3aa99b1a0d736cc89540636c00 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Wed, 7 Jun 2023 21:16:30 +0000 -Subject: [PATCH] kuksa-val-server: OverlayLoader: explicitly include fstream - header - -Otherwise gcc13 now errors out: - -| .../kuksa-val-server/src/OverlayLoader.cpp: In function 'void applyOverlays(std::shared_ptr, std::vector, std::shared_ptr)': -| .../kuksa-val-server/src/OverlayLoader.cpp:70:24: error: variable 'std::ifstream is' has initializer but incomplete type -| 70 | std::ifstream is(p.generic_string()); -| | ^ - -Upstream-Status: Pending - -Signed-off-by: Denys Dmytriyenko ---- - kuksa-val-server/src/OverlayLoader.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kuksa-val-server/src/OverlayLoader.cpp b/kuksa-val-server/src/OverlayLoader.cpp -index bed9234..abd1945 100644 ---- a/kuksa-val-server/src/OverlayLoader.cpp -+++ b/kuksa-val-server/src/OverlayLoader.cpp -@@ -23,6 +23,7 @@ - /* helper fuctions to load overlays during server startup */ - - #include -+#include - #include - - #include "OverlayLoader.hpp" --- -2.25.1 - diff --git a/recipes-connectivity/kuksa-val/kuksa-val/kuksa-val.service b/recipes-connectivity/kuksa-val/kuksa-val/kuksa-val.service deleted file mode 100644 index 5467e9a47..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val/kuksa-val.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Eclipse KUKSA.val VIS server -After=network.target - -[Service] -User=kuksa -EnvironmentFile=-/etc/default/kuksa-val -ExecStart=/usr/bin/kuksa-val-server $EXTRA_ARGS -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/recipes-connectivity/kuksa-val/kuksa-val_git.bb b/recipes-connectivity/kuksa-val/kuksa-val_git.bb deleted file mode 100644 index 64daba228..000000000 --- a/recipes-connectivity/kuksa-val/kuksa-val_git.bb +++ /dev/null @@ -1,89 +0,0 @@ -SUMMARY = "KUKSA.val, the KUKSA Vehicle Abstraction Layer" -DESCRIPTION = "KUKSA.val provides a COVESA VSS data model describing data in a vehicle." -HOMEPAGE = "https://github.com/eclipse/kuksa.val" -BUGTRACKER = "https://github.com/eclipse/kuksa.val/issues" - -LICENSE = "Apache-2.0 & BSL-1.0 & MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ - file://3rd-party-libs/jsoncons/LICENSE;md5=6ee7f7ed2001e4cde4679fdb8926f820 \ - file://3rd-party-libs/turtle/LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ - file://3rd-party-libs/jwt-cpp/LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff" - -DEPENDS = "boost openssl mosquitto protobuf-native grpc-native grpc" - -require kuksa-val.inc - -SRC_URI += "file://kuksa-val.service \ - file://0001-Make-Boost-requirements-more-liberal.patch;patchdir=.. \ - file://0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch;patchdir=.. \ - file://0003-Make-install-locations-configurable.patch;patchdir=.. \ - file://0004-Disable-default-fetch-and-build-of-googletest.patch;patchdir=.. \ - file://0005-kuksa-val-server-Add-missing-check_git-dependency.patch;patchdir=.. \ - file://0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch;patchdir=.. \ -" - -S = "${WORKDIR}/git/kuksa-val-server" - -inherit cmake pkgconfig systemd useradd - -SYSTEMD_SERVICE:${PN} = "kuksa-val.service" - -USERADD_PACKAGES = "${PN} ${PN}-server-certificates" -USERADDEXTENSION = "useradd-staticids" -GROUPADD_PARAM:${PN} = "-g 900 kuksa ;" -USERADD_PARAM:${PN} = "--system -g 900 -u 900 -o -d / --shell /bin/nologin kuksa ;" -GROUPADD_PARAM:${PN}-server-certificates = "-g 900 kuksa ;" - -# Configure file locations more along the lines of FHS instead of kuksa.val's -# default locations. -EXTRA_OECMAKE = " \ - -DKUKSA_INSTALL_BINDIR=${bindir} \ - -DKUKSA_INSTALL_CERTDIR=${sysconfdir}/kuksa-val \ - -DKUKSA_INSTALL_DATADIR=${datadir}/kuksa-val \ - -DKUKSA_INSTALL_CONFIGDIR=${sysconfdir}/kuksa-val \ -" - -do_install:append() { - # Lower the logging level used in the installed config.ini from the upstream - # default of "ALL", which spams the logs. - sed -i 's/^log-level = .*/log-level = WARNING/' ${D}/${sysconfdir}/kuksa-val/config.ini - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/kuksa-val.service ${D}${systemd_system_unitdir} - fi -} - -# Put certificates into their own packages so we can avoid duplicates -# of them for e.g. cluster clients, and so downstream users can -# replace them with their own certificates. -# -# NOTE: -# Downstream users can replace these packages with alternates by -# having their packages set their RPROVIDES to include the desired -# kuksa-val-certificates-* and explicitly adding their package(s) -# to an image, they will end up getting priority during rootfs -# construction and installed instead of the default ones here. - -PACKAGE_BEFORE_PN += "${PN}-certificates-ca ${PN}-certificates-server ${PN}-certificates-client" - -FILES:${PN}-certificates-ca = " \ - ${sysconfdir}/kuksa-val/CA.pem \ -" - -FILES:${PN}-certificates-server = " \ - ${sysconfdir}/kuksa-val/Server.key \ - ${sysconfdir}/kuksa-val/Server.pem \ - ${sysconfdir}/kuksa-val/jwt.key.pub \ -" -RDEPENDS:${PN}-certificates-server += "${PN}-certificates-ca" - -FILES:${PN}-certificates-client = " \ - ${sysconfdir}/kuksa-val/Client.key \ - ${sysconfdir}/kuksa-val/Client.pem \ -" -RDEPENDS:${PN}-certificate-clients += "${PN}-certificates-ca" - -FILES:${PN} += "${systemd_system_unitdir} ${datadir}" - -RDEPENDS:${PN} += "${PN}-certificates-server ${PN}-certificates-client" -- cgit 1.2.3-korg