diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch index 52ec294579..5e410ae93b 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch @@ -1,4 +1,4 @@ -From 3d1ddf162616978eeb9af8e2f64d4b3b63dba0f6 Mon Sep 17 00:00:00 2001 +From 1737c66707c3d7cbbd355c05af2e1b479568bd57 Mon Sep 17 00:00:00 2001 From: Yi Zhao 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index aa4ad1cc..27e7b517 100644 +index b160ac4..7b2aaa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -670,7 +670,7 @@ endif() +@@ -575,7 +575,7 @@ endif() # create pkg-config file if(NOT WIN32) configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY) @@ -23,6 +23,3 @@ index aa4ad1cc..27e7b517 100644 endif() ############################################################################## --- -2.34.1 - diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch index dde27b37f7..ebeb8cb10b 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch @@ -1,4 +1,4 @@ -From 17f606e9ede2e3a1871c98dffff89e5285dd8c21 Mon Sep 17 00:00:00 2001 +From 05ffeb652a838a07346c3eeb8c312fb861d415e4 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 9 Mar 2022 11:48:44 +0800 Subject: [PATCH] Install example configuration files to /etc/vsomeip @@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27e7b517..67ecb365 100644 +index 7b2aaa8..332f8f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -586,7 +586,7 @@ install ( +@@ -490,7 +490,7 @@ install ( ) install ( @@ -23,6 +23,3 @@ index 27e7b517..67ecb365 100644 ) # Add all targets to the build-tree export set --- -2.34.1 - diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch index 066fc1c4c5..fe30e0f8cb 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch @@ -1,4 +1,4 @@ -From 0b68560853035ff557e60902144be71bcbe0e3bc Mon Sep 17 00:00:00 2001 +From 9a894772b6bfd266d8516b1dcde72092194ea84b Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 17 Jul 2023 14:33:32 +0800 Subject: [PATCH] Do not specify PIE flag explicitly @@ -24,13 +24,13 @@ Signed-off-by: Yi Zhao 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 67ecb365..bda9c69a 100644 +index 332f8f2..f07d408 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") + set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${PROJECT_SOURCE_DIR}/exportmap.gcc") - set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -pie -Wno-tsan -Wl,-z,relro,-z,now") + set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now") endif() @@ -40,11 +40,8 @@ index 67ecb365..bda9c69a 100644 if(NOT DEFINED _FORTIFY_SOURCE) set(_FORTIFY_SOURCE 2) endif() -- 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") +- 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 -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 -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 --- -2.34.1 - + # _FORTIFY_SOURCE requires an optimized build; defining it under -O0 + # is a no-op at best and a hard error with newer glibc + -Werror. diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-scanning-64-bit-integer-types.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-scanning-64-bit-integer-types.patch index ff3510618a..c03c3bef7b 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-scanning-64-bit-integer-types.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-scanning-64-bit-integer-types.patch @@ -1,4 +1,4 @@ -From 097d74721be56a1e6c1551cf53965d1055746b65 Mon Sep 17 00:00:00 2001 +From c93089e134ba5ff9f2d99668feb909d2b82be323 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 4 Nov 2025 12:50:51 +0800 Subject: [PATCH] Fix scanning 64-bit integer types @@ -22,24 +22,22 @@ Signed-off-by: Yi Zhao --- implementation/routing/src/routing_manager_impl.cpp | 4 +++- test/network_tests/cpu_load_tests/cpu_load_measurer.cpp | 6 ++++-- - test/network_tests/memory_tests/memory_test_client.cpp | 4 +++- - test/network_tests/memory_tests/memory_test_service.cpp | 4 +++- - 4 files changed, 13 insertions(+), 5 deletions(-) + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp -index 8a2f1fdf..3e98143b 100644 +index 27d9a3c..11e9f36 100644 --- a/implementation/routing/src/routing_manager_impl.cpp +++ b/implementation/routing/src/routing_manager_impl.cpp -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include +@@ -4,6 +4,7 @@ + // file, You can obtain one at http://mozilla.org/MPL/2.0/. - #if defined(__linux__) || defined(__QNX__) - #include -@@ -3307,7 +3308,8 @@ void routing_manager_impl::memory_log_timer_cbk(boost::system::error_code const& - std::uint64_t its_dirtypages(0); + #include "vsomeip/defines.hpp" ++#include + #include + #include + #include +@@ -3536,7 +3537,8 @@ void routing_manager_impl::memory_log_timer_cbk(boost::system::error_code const& + 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, @@ -49,19 +47,19 @@ index 8a2f1fdf..3e98143b 100644 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 7386b0bb..7fe7af5f 100644 +index 630e0a7..ff07b6a 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 @@ +@@ -11,6 +11,7 @@ + #include #include #include - #include +#include + #include #include - #include -@@ -86,7 +87,7 @@ std::uint64_t cpu_load_measurer::read_proc_pid_stat() { - std::int64_t cstime(0); +@@ -86,7 +87,7 @@ uint64_t cpu_load_measurer::read_proc_pid_stat() { + int64_t cstime(0); if (std::fscanf(f, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u " - "%lu %lu %ld %ld", // utime, stime, cutime, cstime @@ -69,60 +67,13 @@ index 7386b0bb..7fe7af5f 100644 &utime, &stime, &cutime, &cstime) == EOF) { std::cerr << "Failed to read " + path << std::endl; -@@ -116,7 +117,8 @@ std::uint64_t cpu_load_measurer::read_proc_stat(std::uint64_t* _idle) { - std::uint64_t steal(0); - std::uint64_t guest(0); - std::uint64_t guest_nice(0); +@@ -116,7 +117,8 @@ uint64_t cpu_load_measurer::read_proc_stat(uint64_t* _idle) { + uint64_t steal(0); + uint64_t guest(0); + uint64_t guest_nice(0); - if (std::fscanf(f, "%*s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest, + if (std::fscanf(f, "%*s %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64, + &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest, &guest_nice) == 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 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 @@ - #include - #include - #include -+#include - - #include - #include "common/test_main.hpp" -@@ -31,7 +32,8 @@ void check_memory(std::vector& test_memory_, std::atomic& s - 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, -+ == 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)) { - 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 549adbef..0b78a207 100644 ---- a/test/network_tests/memory_tests/memory_test_service.cpp -+++ b/test/network_tests/memory_tests/memory_test_service.cpp -@@ -6,6 +6,7 @@ - #include - #include - #include "common/test_main.hpp" -+#include - - #include "memory_test_service.hpp" - -@@ -29,7 +30,8 @@ void check_memory(std::vector& test_memory_, std::atomic& s - 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, -+ == 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)) { - VSOMEIP_ERROR << "check_memory: error reading: errno " << errno; - } --- -2.34.1 - diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Do-not-treat-warnings-as-errors-with-clang.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Do-not-treat-warnings-as-errors-with-clang.patch index a9c00baa5e..36c66cd4c0 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Do-not-treat-warnings-as-errors-with-clang.patch +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Do-not-treat-warnings-as-errors-with-clang.patch @@ -1,4 +1,4 @@ -From 6d5da6a08d04c314bd5065dcb178beb10dc609e2 Mon Sep 17 00:00:00 2001 +From 9a7c3dc1c796e9f870eb05baa55ef41622f14a41 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 5 Nov 2025 22:17:14 +0800 Subject: [PATCH] Do not treat warnings as errors with clang @@ -14,13 +14,13 @@ Signed-off-by: Yi Zhao 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index bda9c69a..718ff23d 100644 +index f07d408..beafdc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") + set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${PROJECT_SOURCE_DIR}/exportmap.gcc") - set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now") + set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now -Werror") endif() @@ -30,11 +30,8 @@ index bda9c69a..718ff23d 100644 if(NOT DEFINED _FORTIFY_SOURCE) set(_FORTIFY_SOURCE 2) endif() -- 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") +- 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 -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 -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 --- -2.34.1 - + # _FORTIFY_SOURCE requires an optimized build; defining it under -O0 + # is a no-op at best and a hard error with newer glibc + -Werror. diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.7.3.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.8.0.bb similarity index 88% rename from meta-networking/recipes-protocols/vsomeip/vsomeip_3.7.3.bb rename to meta-networking/recipes-protocols/vsomeip/vsomeip_3.8.0.bb index dc110fd9ca..0c21230e6d 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.7.3.bb +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.8.0.bb @@ -17,7 +17,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name= file://0005-Do-not-treat-warnings-as-errors-with-clang.patch \ " -SRCREV = "6171fdfe109a3af8fb64190136029aadd1fa0c6f" +SRCREV = "f1518b369f5ee9684fd01af0f9d147fb04523060" SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c" COMPATIBLE_HOST:mips = "null" @@ -49,8 +49,10 @@ RDEPENDS:${PN}-test = "bash lsof" OECMAKE_TARGET_COMPILE += "vsomeip_ctrl examples build_tests" -do_compile:prepend() { - sed -i -e 's#${S}/build#/opt/${PN}-test#g' ${S}/test/unit_tests/security_policy_manager_impl_tests/policy_manager_impl_unit_test_macro.hpp +# Point the policy manager unit test at its installed location instead of ${B} +do_configure:prepend() { + sed -i -e 's#UNIT_TEST_BUILD_DIR_PATH="${CMAKE_CURRENT_BINARY_DIR}"#UNIT_TEST_BUILD_DIR_PATH="/opt/${PN}-test/test/unit_tests/security_policy_manager_impl_tests"#' \ + ${S}/test/unit_tests/security_policy_manager_impl_tests/CMakeLists.txt } do_install:append() {