Code Review / AGL / meta-agl-demo.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
kuksa-val: Upgrade to latest
[AGL/meta-agl-demo.git] / recipes-connectivity / kuksa-val / kuksa-val / 0003-Make-install-locations-configurable.patch
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
index ba5419a..8375d07 100644 (file)
--- 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
@@ -1,7 +1,7 @@
-From 535993001d8a24162e972b4a4e88387f94c9f539 Mon Sep 17 00:00:00 2001
+From b9df9bcf058e072e4c67dc8cc6ab41c3db745cbf Mon Sep 17 00:00:00 2001
 From: Scott Murray <scott.murray@konsulko.com>
-Date: Mon, 23 May 2022 15:21:07 -0400
-Subject: [PATCH 3/4] Make install locations configurable
+Date: Thu, 6 Oct 2022 15:42:51 -0400
+Subject: [PATCH] Make install locations configurable
 
 Make binary, certificate, and configuration file install locations
 configurable, including generation and installation of an accurate
@@ -15,47 +15,47 @@ Upstream-Status: Pending
 
 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
 ---
- config.ini         |  7 -------
- config.ini.in      |  7 +++++++
- src/CMakeLists.txt | 52 ++++++++++++++++++++++++++++++++++++----------
- src/config.hpp.in  | 21 +++++++++++++++++++
- src/main.cpp       |  5 +++--
- 5 files changed, 72 insertions(+), 20 deletions(-)
- delete mode 100644 config.ini
- create mode 100644 config.ini.in
- create mode 100644 src/config.hpp.in
+ kuksa-val-server/config.ini         |  7 ----
+ kuksa-val-server/config.ini.in      |  7 ++++
+ kuksa-val-server/src/CMakeLists.txt | 54 ++++++++++++++++++++++-------
+ kuksa-val-server/src/config.hpp.in  | 27 +++++++++++++++
+ kuksa-val-server/src/main.cpp       |  5 +--
+ 5 files changed, 79 insertions(+), 21 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/config.ini b/config.ini
+diff --git a/kuksa-val-server/config.ini b/kuksa-val-server/config.ini
 deleted file mode 100644
-index f3162d4..0000000
---- a/config.ini
+index 34326aa..0000000
+--- a/kuksa-val-server/config.ini
 +++ /dev/null
 @@ -1,7 +0,0 @@
--vss = vss_release_2.2.json
+-vss = vss_release_3.0.json
 -log-level = ALL
 -cert-path = .
 -
 -[mqtt]
 -    publish = 
 -    topic-prefix = vss
-diff --git a/config.ini.in b/config.ini.in
+diff --git a/kuksa-val-server/config.ini.in b/kuksa-val-server/config.ini.in
 new file mode 100644
-index 0000000..5bdce91
+index 0000000..3d888e5
 --- /dev/null
-+++ b/config.ini.in
++++ b/kuksa-val-server/config.ini.in
 @@ -0,0 +1,7 @@
-+vss = @KUKSA_DEFAULT_DATADIR@/vss_release_2.2.json
++vss = @KUKSA_DEFAULT_DATADIR@/vss_release_3.0.json
 +log-level = ALL
 +cert-path = @KUKSA_DEFAULT_CERTDIR@
 +
 +[mqtt]
 +    publish = 
 +    topic-prefix = vss
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0ff5f9c..b7d4d4f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -162,6 +162,35 @@ if(BUILD_EXE)
+diff --git a/kuksa-val-server/src/CMakeLists.txt b/kuksa-val-server/src/CMakeLists.txt
+index ea75ef7..e791a13 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
  
@@ -88,58 +88,66 @@ index 0ff5f9c..b7d4d4f 100644
 +  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)
-@@ -171,19 +200,20 @@ if(BUILD_EXE)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../data/vss-core/vss_release_2.0.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../data/vss-core/vss_release_2.1.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../data/vss-core/vss_release_2.2.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+   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)
+@@ -171,20 +200,21 @@ if(BUILD_EXE)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.1.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../data/vss-core/vss_release_2.2.json ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+   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}/../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}/../../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( 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}/../../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_BINARY_DIR}/config.ini DESTINATION ${KUKSA_INSTALL_CONFIGDIR})
  
  
-   #GRPC client
-diff --git a/src/config.hpp.in b/src/config.hpp.in
+   # CPack
+diff --git a/kuksa-val-server/src/config.hpp.in b/kuksa-val-server/src/config.hpp.in
 new file mode 100644
-index 0000000..89586c2
+index 0000000..24226d2
 --- /dev/null
-+++ b/src/config.hpp.in
-@@ -0,0 +1,21 @@
-+/*
-+ * ******************************************************************************
++++ b/kuksa-val-server/src/config.hpp.in
+@@ -0,0 +1,27 @@
++/**********************************************************************
 + * Copyright (c) 2022 Konsulko Group
 + *
-+ * All rights reserved. This program and the accompanying materials
-+ * are made available under the terms of the Eclipse Public License v2.0
-+ * which accompanies this distribution, and is available at
-+ * https://www.eclipse.org/org/documents/epl-2.0/index.php
++ * 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___
 +
@@ -150,11 +158,11 @@ index 0000000..89586c2
 +#cmakedefine KUKSA_DEFAULT_CERTDIR "@KUKSA_DEFAULT_CERTDIR@"
 +
 +#endif
-diff --git a/src/main.cpp b/src/main.cpp
-index 417e2e8..fdfeacd 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -40,6 +40,7 @@
+diff --git a/kuksa-val-server/src/main.cpp b/kuksa-val-server/src/main.cpp
+index 234171a..2f7011a 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"
@@ -162,7 +170,7 @@ index 417e2e8..fdfeacd 100644
  
  
  #include "../buildinfo.h"
-@@ -101,7 +102,7 @@ int main(int argc, const char *argv[]) {
+@@ -106,7 +107,7 @@ int main(int argc, const char *argv[]) {
    program_options::options_description desc{"OPTIONS"};
    desc.add_options()
      ("help,h", "Help screen")
@@ -171,15 +179,15 @@ index 417e2e8..fdfeacd 100644
        "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"
-@@ -110,7 +111,7 @@ int main(int argc, const char *argv[]) {
+@@ -115,7 +116,7 @@ int main(int argc, const char *argv[]) {
        "log-level = ALL\n")
-     ("vss", program_options::value<boost::filesystem::path>()->required(), "[mandatory] Path to VSS data file describing VSS data tree structure which `kuksa-val-server` shall handle. Sample 'vss_release_2.1.json' file can be found under [data](./data/vss-core/vss_release_2.1.json)")
+     ("vss", program_options::value<boost::filesystem::path>()->required(), "[mandatory] Path to VSS data file describing VSS data tree structure which `kuksa-val-server` shall handle. Sample 'vss_release_3.0.json' file can be found under [data](./data/vss-core/vss_release_3.0.json)")
      ("overlays", program_options::value<boost::filesystem::path>(), "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<boost::filesystem::path>()->required()->default_value(boost::filesystem::path(".")),
 +    ("cert-path", program_options::value<boost::filesystem::path>()->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 REST API connections, and also shall not fail connections due to self-signed certificates.")
+     ("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.35.1
+2.37.3
 
meta-agl-demo layer (demo/staging/"one-shot")