mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

vsomeip: upgrade 3.5.11 -> 3.7.3

Browse Source 
ChangeLog:
https://github.com/COVESA/vsomeip/releases/tag/3.6.0
https://github.com/COVESA/vsomeip/releases/tag/3.6.1
https://github.com/COVESA/vsomeip/releases/tag/3.6.2
https://github.com/COVESA/vsomeip/releases/tag/3.7.0
https://github.com/COVESA/vsomeip/releases/tag/3.7.1
https://github.com/COVESA/vsomeip/releases/tag/3.7.2
https://github.com/COVESA/vsomeip/releases/tag/3.7.3

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Yi Zhao
2026-06-16 18:41:11 +08:00
committed by Khem Raj
parent 5c3b52eb61
commit 12ef5929c8
10 changed files with 39 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 0be97662524d86a24647f7c37b0a66b18da7b72c Mon Sep 17 00:00:00 2001
From 3d1ddf162616978eeb9af8e2f64d4b3b63dba0f6 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 2 Mar 2022 14:51:13 +0800
Subject: [PATCH] Fix pkgconfig dir for multilib
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8445ecc8..12c3b947 100644
index aa4ad1cc..27e7b517 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -661,7 +661,7 @@ endif()
@@ -670,7 +670,7 @@ endif()
# create pkg-config file
if(NOT WIN32)
configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY)
meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From c9d03f6b100d1be8bee75caf933e10fcbb599db3 Mon Sep 17 00:00:00 2001
From 17f606e9ede2e3a1871c98dffff89e5285dd8c21 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 9 Mar 2022 11:48:44 +0800
Subject: [PATCH] Install example configuration files to /etc/vsomeip
@@ -11,11 +11,11 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12c3b947..b42f8688 100644
index 27e7b517..67ecb365 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -578,7 +578,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig)
endif ()
@@ -586,7 +586,7 @@ install (
)
install (
- FILES ${EXAMPLE_CONFIG_FILES} DESTINATION etc/vsomeip COMPONENT config
meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch
+6 -6
View File
@@ -1,4 +1,4 @@
From 8054f459d47cde818ed9d1eb1e49efb4a8d4b3df Mon Sep 17 00:00:00 2001
From 0b68560853035ff557e60902144be71bcbe0e3bc Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 17 Jul 2023 14:33:32 +0800
Subject: [PATCH] Do not specify PIE flag explicitly
@@ -24,10 +24,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b42f8688..c39184e9 100644
index 67ecb365..bda9c69a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -78,7 +78,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# This is only relevant for GCC and causes warnings on Clang
set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc")
@@ -36,12 +36,12 @@ index b42f8688..c39184e9 100644
endif()
set(NO_DEPRECATED "")
@@ -82,7 +82,7 @@ endif()
@@ -87,7 +87,7 @@ endif()
if(NOT DEFINED _FORTIFY_SOURCE)
set(_FORTIFY_SOURCE 2)
endif()
- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -fPIE -Wno-inconsistent-missing-override")
+ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -Wno-inconsistent-missing-override")
- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -fPIE -Wno-inconsistent-missing-override")
+ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -Wno-inconsistent-missing-override")
# force all use of std::mutex and std::recursive_mutex to use runtime init
# instead of static initialization so mutexes can be hooked to enable PI as needed
meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch
-42
View File
@@ -1,42 +0,0 @@
From 2a5c3fbfd863a69eafce6a13b273f5c17cbf4062 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 3 Nov 2025 23:06:35 +0800
Subject: [PATCH] Fix build with boost 1.89
The Boost.System stub library has been removed in Boost 1.89.0[1], which
causes a CMake error:
CMake Error at Boost-1.89.0/BoostConfig.cmake:141 (find_package):
Could not find a package configuration file provided by "boost_system"
(requested version 1.89.0) with any of the following names:
boost_systemConfig.cmake
boost_system-config.cmake
Drop 'system' from the COMPONENTS in find_package to fix this issue[2].
[1] https://github.com/boostorg/system/commit/7a495bb46d7ccd808e4be2a6589260839b0fd3a3
[2] https://github.com/boostorg/system/issues/132
Upstream-Status: Pending
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c39184e9..ddc1eed8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,7 @@ add_definitions(-DVSOMEIP_INTERNAL_SUPPRESS_DEPRECATED)
find_package(Threads REQUIRED)
# Boost
-find_package( Boost 1.66 COMPONENTS system thread filesystem REQUIRED )
+find_package( Boost 1.66 COMPONENTS thread filesystem REQUIRED )
if(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
include_directories(${Boost_INCLUDE_DIR} )
else()
--
2.34.1
meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch → meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-scanning-64-bit-integer-types.patch
+15 -15
View File
@@ -1,4 +1,4 @@
From 67878aa198e17f13a6d1a0de72bf06a872aec472 Mon Sep 17 00:00:00 2001
From 097d74721be56a1e6c1551cf53965d1055746b65 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Tue, 4 Nov 2025 12:50:51 +0800
Subject: [PATCH] Fix scanning 64-bit integer types
@@ -27,29 +27,29 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
index 8a252c0b..9fb6c32c 100644
index 8a2f1fdf..3e98143b 100644
--- a/implementation/routing/src/routing_manager_impl.cpp
+++ b/implementation/routing/src/routing_manager_impl.cpp
@@ -10,6 +10,7 @@
#include <fstream>
@@ -9,6 +9,7 @@
#include <sstream>
#include <forward_list>
#include <thread>
+#include <cinttypes>
#if defined(__linux__) || defined(__QNX__)
#include <unistd.h>
@@ -3914,7 +3915,8 @@ void routing_manager_impl::memory_log_timer_cbk(boost::system::error_code const&
@@ -3307,7 +3308,8 @@ void routing_manager_impl::memory_log_timer_cbk(boost::system::error_code const&
std::uint64_t its_dirtypages(0);
if (EOF
- == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data,
+ == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
+ &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data,
&its_dirtypages)) {
+ &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data,
&its_dirtypages)) {
VSOMEIP_ERROR << "memory_log_timer_cbk: error reading: errno " << errno;
}
diff --git a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
index aaf91174..dfe27e8c 100644
index 7386b0bb..7fe7af5f 100644
--- a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
+++ b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
@@ -12,6 +12,7 @@
@@ -80,7 +80,7 @@ index aaf91174..dfe27e8c 100644
== EOF) {
std::cerr << "Failed to read /proc/stat" << std::endl;
diff --git a/test/network_tests/memory_tests/memory_test_client.cpp b/test/network_tests/memory_tests/memory_test_client.cpp
index 102c8218..d922ad81 100644
index 9d3aedfd..a502c8e9 100644
--- a/test/network_tests/memory_tests/memory_test_client.cpp
+++ b/test/network_tests/memory_tests/memory_test_client.cpp
@@ -6,6 +6,7 @@
@@ -90,8 +90,8 @@ index 102c8218..d922ad81 100644
+#include <cinttypes>
#include <vsomeip/internal/logger.hpp>
#include "memory_test_client.hpp"
@@ -30,7 +31,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
#include "common/test_main.hpp"
@@ -31,7 +32,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
std::uint64_t its_dirtypages(0);
if (EOF
@@ -102,18 +102,18 @@ index 102c8218..d922ad81 100644
VSOMEIP_ERROR << "check_memory: error reading: errno " << errno;
}
diff --git a/test/network_tests/memory_tests/memory_test_service.cpp b/test/network_tests/memory_tests/memory_test_service.cpp
index a8547395..751c6f9e 100644
index 549adbef..0b78a207 100644
--- a/test/network_tests/memory_tests/memory_test_service.cpp
+++ b/test/network_tests/memory_tests/memory_test_service.cpp
@@ -5,6 +5,7 @@
@@ -6,6 +6,7 @@
#include <vsomeip/internal/logger.hpp>
#include <cstring>
#include "common/test_main.hpp"
+#include <cinttypes>
#include "memory_test_service.hpp"
@@ -28,7 +29,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
@@ -29,7 +30,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
std::uint64_t its_dirtypages(0);
if (EOF
meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch → meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Do-not-treat-warnings-as-errors-with-clang.patch
+6 -6
View File
@@ -1,4 +1,4 @@
From 74c6e762097ad8016d1410bd1beaef1398f02901 Mon Sep 17 00:00:00 2001
From 6d5da6a08d04c314bd5065dcb178beb10dc609e2 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 5 Nov 2025 22:17:14 +0800
Subject: [PATCH] Do not treat warnings as errors with clang
@@ -14,10 +14,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddc1eed8..62b096e7 100644
index bda9c69a..718ff23d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -78,7 +78,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# This is only relevant for GCC and causes warnings on Clang
set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc")
@@ -26,12 +26,12 @@ index ddc1eed8..62b096e7 100644
endif()
set(NO_DEPRECATED "")
@@ -82,7 +82,7 @@ endif()
@@ -87,7 +87,7 @@ endif()
if(NOT DEFINED _FORTIFY_SOURCE)
set(_FORTIFY_SOURCE 2)
endif()
- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -Wno-inconsistent-missing-override")
+ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Wno-inconsistent-missing-override")
- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -Wno-inconsistent-missing-override")
+ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-conversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Wno-inconsistent-missing-override")
# force all use of std::mutex and std::recursive_mutex to use runtime init
# instead of static initialization so mutexes can be hooked to enable PI as needed
meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch
-38
View File
@@ -1,38 +0,0 @@
From 1ca5cf52db05a44e5e469bc394c0a1b32fb943f6 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Tue, 4 Nov 2025 22:10:33 +0800
Subject: [PATCH] Replace address::from_string with make_address
boost::asio::ip::address::from_string is deprecated since boost 1.87[1].
Replace it with make_address.
Fix:
implementation/routing/src/routing_manager_impl.cpp:1406:98: error: 'from_string' is not a member of 'boost::asio::ip::address_v4'
1406 | _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6");
| ^~~~~~~~~~~
[1] https://github.com/boostorg/asio/commit/c0d1cfce7767599c4cf00df36f8017a1073339ae
Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/973]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
implementation/routing/src/routing_manager_impl.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
index a3dc5242..7b9619c9 100644
--- a/implementation/routing/src/routing_manager_impl.cpp
+++ b/implementation/routing/src/routing_manager_impl.cpp
@@ -1421,7 +1421,7 @@ void routing_manager_impl::on_message(const byte_t* _data, length_t _size, endpo
if (is_forwarded) {
trace::header its_header;
const boost::asio::ip::address_v4 its_remote_address =
- _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6");
+ _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::make_address_v4("6.6.6.6");
trace::protocol_e its_protocol = _receiver->is_local() ? trace::protocol_e::local
: _receiver->is_reliable() ? trace::protocol_e::tcp
: trace::protocol_e::udp;
--
2.34.1
meta-networking/recipes-protocols/vsomeip/vsomeip/0008-Replace-io_service-with-io_context.patch
-51
View File
@@ -1,51 +0,0 @@
From 4b2d82748eaf53a700002d05c6629fa6f5df3dcf Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Thu, 20 Nov 2025 17:27:39 +0800
Subject: [PATCH] Replace io_service with io_context
boost::asio::io_service has been removed in boost 1.87. Replace it with
boost::asio::io_context.
Fix:
test/common/include/common/process_manager.hpp:10:10: fatal error:
boost/asio/io_service.hpp: No such file or directory
10 | #include <boost/asio/io_service.hpp>
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Upstream-Status: Pending
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
test/common/include/common/process_manager.hpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/test/common/include/common/process_manager.hpp b/test/common/include/common/process_manager.hpp
index e09d530e..23731785 100644
--- a/test/common/include/common/process_manager.hpp
+++ b/test/common/include/common/process_manager.hpp
@@ -6,8 +6,11 @@
#pragma once
#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/process.hpp>
-#include <boost/asio/io_service.hpp>
+#define BOOST_PROCESS_VERSION 1
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/detail/on_exit.hpp>
+#include <boost/asio/io_context.hpp>
#include <iostream>
@@ -97,7 +100,7 @@ private:
*/
void spawn() {
std::unique_lock<std::mutex> lock(process_mutex_);
- boost::asio::io_service io;
+ boost::asio::io_context io;
// Handle env vars
boost::process::environment cp_env;
--
2.34.1
meta-networking/recipes-protocols/vsomeip/vsomeip/0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch
-40
View File
@@ -1,40 +0,0 @@
From 7dec71178aee905fac28712594f91969c6070b81 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Thu, 20 Nov 2025 17:26:27 +0800
Subject: [PATCH] cached_event_tests/CMakeLists.txt: update
cmake_minimum_required
Update cmake_minimum_required to make it consistent with the others.
Fix configuration error in higher versions of CMake:
CMake Error at test/network_tests/cached_event_tests/CMakeLists.txt:6
(cmake_minimum_required):
Compatibility with CMake < 3.5 has been removed from CMake.
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
to tell CMake that the project requires at least <min> but has been updated
to work with policies introduced by <max> or earlier.
Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/977]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
test/network_tests/cached_event_tests/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/network_tests/cached_event_tests/CMakeLists.txt b/test/network_tests/cached_event_tests/CMakeLists.txt
index 4a68ae29..a2fbff86 100644
--- a/test/network_tests/cached_event_tests/CMakeLists.txt
+++ b/test/network_tests/cached_event_tests/CMakeLists.txt
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.4...3.22)
# Configure necessary files into the build folder.
set(configuration_files
--
2.34.1
meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.11.bb → meta-networking/recipes-protocols/vsomeip/vsomeip_3.7.3.bb
+5 -11
View File
@@ -13,15 +13,11 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=
file://0001-Fix-pkgconfig-dir-for-multilib.patch \
file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \
file://0003-Do-not-specify-PIE-flag-explicitly.patch \
file://0004-Fix-build-with-boost-1.89.patch \
file://0005-Replace-address-from_string-with-make_address.patch \
file://0006-Fix-scanning-64-bit-integer-types.patch \
file://0007-Do-not-treat-warnings-as-errors-with-clang.patch \
file://0008-Replace-io_service-with-io_context.patch \
file://0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch \
file://0004-Fix-scanning-64-bit-integer-types.patch \
file://0005-Do-not-treat-warnings-as-errors-with-clang.patch \
"
SRCREV = "f58ba578c8c04e02dcf08d3ebcb9a71ca1e203ea"
SRCREV = "6171fdfe109a3af8fb64190136029aadd1fa0c6f"
SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"
COMPATIBLE_HOST:mips = "null"
@@ -38,6 +34,8 @@ EXTRA_OECMAKE = "-DINSTALL_LIB_DIR:PATH=${baselib} \
-DGTEST_ROOT=${S}/googletest-${GTEST_VER} \
"
EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_CXX_COMPILER_CLANG_SCAN_DEPS=${STAGING_BINDIR_NATIVE}/clang-scan-deps"
# For vsomeip-test
EXTRA_OECMAKE += "-DTEST_IP_MASTER=10.0.3.1 \
-DTEST_IP_SLAVE=10.0.3.2 \
@@ -66,10 +64,6 @@ do_install:append() {
cp -rf ${S}/test/common/examples_policies \
${D}/opt/${PN}-test/test/test/common/
install -d ${D}/opt/${PN}-test/test/common
install -m 0755 ${B}/test/common/libvsomeip_utilities.so \
${D}/opt/${PN}-test/test/common/
for d in unit_tests network_tests; do
install -d ${D}/opt/${PN}-test/test/$d
cp -rf ${B}/test/$d/*_tests ${D}/opt/${PN}-test/test/$d