summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch8
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch8
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch (renamed from meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch)21
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch42
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch47
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch41
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch128
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch40
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb (renamed from meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb)32
-rw-r--r--meta-oe/conf/layer.conf4
-rw-r--r--meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb2
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb (renamed from meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb)8
-rw-r--r--meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb3
-rw-r--r--meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb2
14 files changed, 313 insertions, 73 deletions
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 0ddcb642bc..ffbe4e6744 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 @@
1From 2f931baf290477b586309189445bf87e3bc5d5ba Mon Sep 17 00:00:00 2001 1From 0be97662524d86a24647f7c37b0a66b18da7b72c Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 2 Mar 2022 14:51:13 +0800 3Date: Wed, 2 Mar 2022 14:51:13 +0800
4Subject: [PATCH] Fix pkgconfig dir for multilib 4Subject: [PATCH] Fix pkgconfig dir for multilib
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/CMakeLists.txt b/CMakeLists.txt 13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index ab399a69..beae6eaf 100644 14index 8445ecc8..12c3b947 100644
15--- a/CMakeLists.txt 15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt 16+++ b/CMakeLists.txt
17@@ -637,7 +637,7 @@ endif() 17@@ -661,7 +661,7 @@ endif()
18 # create pkg-config file 18 # create pkg-config file
19 if(NOT WIN32) 19 if(NOT WIN32)
20 configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY) 20 configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY)
@@ -24,5 +24,5 @@ index ab399a69..beae6eaf 100644
24 24
25 ############################################################################## 25 ##############################################################################
26-- 26--
272.25.1 272.34.1
28 28
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 bdaf343606..6dd854e94e 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 @@
1From ebaa3206ee125741314272cddafa04fa71bd2d1e Mon Sep 17 00:00:00 2001 1From c9d03f6b100d1be8bee75caf933e10fcbb599db3 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 9 Mar 2022 11:48:44 +0800 3Date: Wed, 9 Mar 2022 11:48:44 +0800
4Subject: [PATCH] Install example configuration files to /etc/vsomeip 4Subject: [PATCH] Install example configuration files to /etc/vsomeip
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/CMakeLists.txt b/CMakeLists.txt 13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index beae6eaf..d791c12e 100644 14index 12c3b947..b42f8688 100644
15--- a/CMakeLists.txt 15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt 16+++ b/CMakeLists.txt
17@@ -536,7 +536,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig) 17@@ -578,7 +578,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig)
18 endif () 18 endif ()
19 19
20 install ( 20 install (
@@ -24,5 +24,5 @@ index beae6eaf..d791c12e 100644
24 24
25 # Add all targets to the build-tree export set 25 # Add all targets to the build-tree export set
26-- 26--
272.25.1 272.34.1
28 28
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch
index 2d789627a3..cada06e98e 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-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 @@
1From ec2d36466c9050ee282ea1c3bb1b5f1f61c96ecb Mon Sep 17 00:00:00 2001 1From 8054f459d47cde818ed9d1eb1e49efb4a8d4b3df Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Mon, 17 Jul 2023 14:33:32 +0800 3Date: Mon, 17 Jul 2023 14:33:32 +0800
4Subject: [PATCH] Do not specify PIE flag explicitly 4Subject: [PATCH] Do not specify PIE flag explicitly
@@ -23,9 +23,11 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
23 CMakeLists.txt | 4 ++-- 23 CMakeLists.txt | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-) 24 1 file changed, 2 insertions(+), 2 deletions(-)
25 25
26diff --git a/CMakeLists.txt b/CMakeLists.txt
27index b42f8688..c39184e9 100644
26--- a/CMakeLists.txt 28--- a/CMakeLists.txt
27+++ b/CMakeLists.txt 29+++ b/CMakeLists.txt
28@@ -70,7 +70,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" 30@@ -73,7 +73,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
29 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") 31 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
30 # This is only relevant for GCC and causes warnings on Clang 32 # This is only relevant for GCC and causes warnings on Clang
31 set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc") 33 set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc")
@@ -34,12 +36,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
34 endif() 36 endif()
35 37
36 set(NO_DEPRECATED "") 38 set(NO_DEPRECATED "")
37@@ -78,7 +78,7 @@ endif() 39@@ -82,7 +82,7 @@ endif()
38 if(NOT DEFINED _FORTIFY_SOURCE) 40 if(NOT DEFINED _FORTIFY_SOURCE)
39 set(_FORTIFY_SOURCE 2) 41 set(_FORTIFY_SOURCE 2)
40 endif() 42 endif()
41- 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") 43- 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")
42+ 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") 44+ 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")
43 45
44 # force all use of std::mutex and std::recursive_mutex to use runtime init 46 # force all use of std::mutex and std::recursive_mutex to use runtime init
45 # instead of static initialization so mutexes can be hooked to enable PI as needed 47 # instead of static initialization so mutexes can be hooked to enable PI as needed
48--
492.34.1
50
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch
new file mode 100644
index 0000000000..45fffa733f
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch
@@ -0,0 +1,42 @@
1From 2a5c3fbfd863a69eafce6a13b273f5c17cbf4062 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Mon, 3 Nov 2025 23:06:35 +0800
4Subject: [PATCH] Fix build with boost 1.89
5
6The Boost.System stub library has been removed in Boost 1.89.0[1], which
7causes a CMake error:
8
9CMake Error at Boost-1.89.0/BoostConfig.cmake:141 (find_package):
10 Could not find a package configuration file provided by "boost_system"
11 (requested version 1.89.0) with any of the following names:
12 boost_systemConfig.cmake
13 boost_system-config.cmake
14
15Drop 'system' from the COMPONENTS in find_package to fix this issue[2].
16
17[1] https://github.com/boostorg/system/commit/7a495bb46d7ccd808e4be2a6589260839b0fd3a3
18[2] https://github.com/boostorg/system/issues/132
19
20Upstream-Status: Pending
21
22Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
23---
24 CMakeLists.txt | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/CMakeLists.txt b/CMakeLists.txt
28index c39184e9..ddc1eed8 100644
29--- a/CMakeLists.txt
30+++ b/CMakeLists.txt
31@@ -189,7 +189,7 @@ add_definitions(-DVSOMEIP_INTERNAL_SUPPRESS_DEPRECATED)
32 find_package(Threads REQUIRED)
33
34 # Boost
35-find_package( Boost 1.66 COMPONENTS system thread filesystem REQUIRED )
36+find_package( Boost 1.66 COMPONENTS thread filesystem REQUIRED )
37 if(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
38 include_directories(${Boost_INCLUDE_DIR} )
39 else()
40--
412.34.1
42
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch
new file mode 100644
index 0000000000..c25df03d3b
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch
@@ -0,0 +1,47 @@
1From 47b976736e4f57447339081ab5a40435b3b2d5a8 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 4 Nov 2025 22:10:33 +0800
4Subject: [PATCH] Replace address::from_string with make_address
5
6boost::asio::ip::address::from_string is deprecated since boost 1.87[1].
7Replace it with make_address.
8
9Fix:
10implementation/routing/src/routing_manager_impl.cpp:1406:98: error: 'from_string' is not a member of 'boost::asio::ip::address_v4'
11 1406 | _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6");
12 | ^~~~~~~~~~~
13
14[1] https://github.com/boostorg/asio/commit/c0d1cfce7767599c4cf00df36f8017a1073339ae
15
16Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/973]
17
18Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
19---
20 implementation/routing/src/routing_manager_impl.cpp | 4 ++--
21 1 file changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
24index 3723fe5b..8a252c0b 100644
25--- a/implementation/routing/src/routing_manager_impl.cpp
26+++ b/implementation/routing/src/routing_manager_impl.cpp
27@@ -1404,7 +1404,7 @@ void routing_manager_impl::on_message(const byte_t* _data, length_t _size, endpo
28 if (is_forwarded) {
29 trace::header its_header;
30 const boost::asio::ip::address_v4 its_remote_address =
31- _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6");
32+ _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::make_address_v4("6.6.6.6");
33 trace::protocol_e its_protocol = _receiver->is_local() ? trace::protocol_e::local
34 : _receiver->is_reliable() ? trace::protocol_e::tcp
35 : trace::protocol_e::udp;
36@@ -1442,7 +1442,7 @@ bool routing_manager_impl::on_message(service_t _service, instance_t _instance,
37 std::shared_ptr<endpoint> _receiver = its_info->get_endpoint(_reliable);
38 if (_receiver && _receiver.get()) {
39 if(!is_acl_message_allowed(_receiver.get(), _service, _instance,
40- boost::asio::ip::address_v4::from_string("127.0.0.1"))) {
41+ boost::asio::ip::make_address_v4("127.0.0.1"))) {
42 return false;
43 }
44 }
45--
462.34.1
47
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch
deleted file mode 100644
index 25d66514f8..0000000000
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 8676ef287bb25b49668be4336387bdf83a0cae5c Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Mon, 1 Jan 2024 17:02:41 +0800
4Subject: [PATCH] test/common/CMakeLists.txt: add missing link with dlt
5
6The libvsomeip_utilities library uses functions e.g.
7dlt_check_library_version/dlt_register_app/dlt_unregister_app which are
8provided by dlt therefore add it to linker flags.
9
10Fixes:
11x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_check_library_version
12>>> referenced by test/common/libvsomeip_utilities.so
13
14x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_register_app
15>>> referenced by test/common/libvsomeip_utilities.so
16
17x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_unregister_app
18>>> referenced by test/common/libvsomeip_utilities.so
19
20Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/602]
21
22Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
23---
24 test/common/CMakeLists.txt | 1 +
25 1 file changed, 1 insertion(+)
26
27diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
28index d4d14534..afc8c2d6 100644
29--- a/test/common/CMakeLists.txt
30+++ b/test/common/CMakeLists.txt
31@@ -27,6 +27,7 @@ TARGET_LINK_LIBRARIES (
32 ${Boost_LIBRARIES}
33 ${DL_LIBRARY}
34 ${TEST_LINK_LIBRARIES}
35+ ${DLT_LIBRARIES}
36 )
37
38 # ----------------------------------------------------------------------------
39--
402.25.1
41
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch
new file mode 100644
index 0000000000..f4653d0010
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch
@@ -0,0 +1,128 @@
1From 67878aa198e17f13a6d1a0de72bf06a872aec472 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 4 Nov 2025 12:50:51 +0800
4Subject: [PATCH] Fix scanning 64-bit integer types
5
6Fix build error on 32-bit host:
7test/network_tests/cpu_load_tests/cpu_load_measurer.cpp:89:24: error: format '%lu' expects argument of type 'long unsigned int*',
8but argument 3 has type 'uint64_t*' {aka 'long long unsigned int*'} [-Werror=format=]
9 89 | "%lu %lu %ld %ld", // utime, stime, cutime, cstime
10 | ~~^
11 | |
12 | long unsigned int*
13 | %llu
14 90 | &utime, &stime, &cutime, &cstime)
15 | ~~~~~~
16 | |
17 | uint64_t* {aka long long unsigned int*}
18
19Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/974]
20
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
22---
23 implementation/routing/src/routing_manager_impl.cpp | 4 +++-
24 test/network_tests/cpu_load_tests/cpu_load_measurer.cpp | 6 ++++--
25 test/network_tests/memory_tests/memory_test_client.cpp | 4 +++-
26 test/network_tests/memory_tests/memory_test_service.cpp | 4 +++-
27 4 files changed, 13 insertions(+), 5 deletions(-)
28
29diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
30index 8a252c0b..9fb6c32c 100644
31--- a/implementation/routing/src/routing_manager_impl.cpp
32+++ b/implementation/routing/src/routing_manager_impl.cpp
33@@ -10,6 +10,7 @@
34 #include <fstream>
35 #include <forward_list>
36 #include <thread>
37+#include <cinttypes>
38
39 #if defined(__linux__) || defined(__QNX__)
40 #include <unistd.h>
41@@ -3914,7 +3915,8 @@ void routing_manager_impl::memory_log_timer_cbk(boost::system::error_code const&
42 std::uint64_t its_dirtypages(0);
43
44 if (EOF
45- == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data,
46+ == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
47+ &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data,
48 &its_dirtypages)) {
49 VSOMEIP_ERROR << "memory_log_timer_cbk: error reading: errno " << errno;
50 }
51diff --git a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
52index aaf91174..dfe27e8c 100644
53--- a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
54+++ b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
55@@ -12,6 +12,7 @@
56 #include <vector>
57 #include <stdexcept>
58 #include <cstdio>
59+#include <cinttypes>
60
61 #include <sys/types.h>
62 #include <unistd.h>
63@@ -86,7 +87,7 @@ std::uint64_t cpu_load_measurer::read_proc_pid_stat() {
64 std::int64_t cstime(0);
65 if (std::fscanf(f,
66 "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "
67- "%lu %lu %ld %ld", // utime, stime, cutime, cstime
68+ "%" SCNu64 " %" SCNu64 " %" SCNi64 " %" SCNi64, // utime, stime, cutime, cstime
69 &utime, &stime, &cutime, &cstime)
70 == EOF) {
71 std::cerr << "Failed to read " + path << std::endl;
72@@ -116,7 +117,8 @@ std::uint64_t cpu_load_measurer::read_proc_stat(std::uint64_t* _idle) {
73 std::uint64_t steal(0);
74 std::uint64_t guest(0);
75 std::uint64_t guest_nice(0);
76- if (std::fscanf(f, "%*s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest,
77+ if (std::fscanf(f, "%*s %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
78+ &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest,
79 &guest_nice)
80 == EOF) {
81 std::cerr << "Failed to read /proc/stat" << std::endl;
82diff --git a/test/network_tests/memory_tests/memory_test_client.cpp b/test/network_tests/memory_tests/memory_test_client.cpp
83index 102c8218..d922ad81 100644
84--- a/test/network_tests/memory_tests/memory_test_client.cpp
85+++ b/test/network_tests/memory_tests/memory_test_client.cpp
86@@ -6,6 +6,7 @@
87 #include <chrono>
88 #include <iomanip>
89 #include <cstring>
90+#include <cinttypes>
91
92 #include <vsomeip/internal/logger.hpp>
93 #include "memory_test_client.hpp"
94@@ -30,7 +31,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
95 std::uint64_t its_dirtypages(0);
96
97 if (EOF
98- == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
99+ == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
100+ &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
101 &its_data, &its_dirtypages)) {
102 VSOMEIP_ERROR << "check_memory: error reading: errno " << errno;
103 }
104diff --git a/test/network_tests/memory_tests/memory_test_service.cpp b/test/network_tests/memory_tests/memory_test_service.cpp
105index a8547395..751c6f9e 100644
106--- a/test/network_tests/memory_tests/memory_test_service.cpp
107+++ b/test/network_tests/memory_tests/memory_test_service.cpp
108@@ -5,6 +5,7 @@
109
110 #include <vsomeip/internal/logger.hpp>
111 #include <cstring>
112+#include <cinttypes>
113
114 #include "memory_test_service.hpp"
115
116@@ -28,7 +29,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
117 std::uint64_t its_dirtypages(0);
118
119 if (EOF
120- == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
121+ == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
122+ &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
123 &its_data, &its_dirtypages)) {
124 VSOMEIP_ERROR << "check_memory: error reading: errno " << errno;
125 }
126--
1272.34.1
128
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch
new file mode 100644
index 0000000000..31e7efcf33
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0007-Do-not-treat-warnings-as-errors-with-clang.patch
@@ -0,0 +1,40 @@
1From 74c6e762097ad8016d1410bd1beaef1398f02901 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 5 Nov 2025 22:17:14 +0800
4Subject: [PATCH] Do not treat warnings as errors with clang
5
6There are some warnings when building with clang which are treated as
7errors and fails the build.
8
9Upstream-Status: Inappropriate [oe specific]
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 CMakeLists.txt | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index ddc1eed8..62b096e7 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -73,7 +73,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
21 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
22 # This is only relevant for GCC and causes warnings on Clang
23 set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc")
24- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now")
25+ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now -Werror")
26 endif()
27
28 set(NO_DEPRECATED "")
29@@ -82,7 +82,7 @@ endif()
30 if(NOT DEFINED _FORTIFY_SOURCE)
31 set(_FORTIFY_SOURCE 2)
32 endif()
33- 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")
34+ 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")
35
36 # force all use of std::mutex and std::recursive_mutex to use runtime init
37 # instead of static initialization so mutexes can be hooked to enable PI as needed
38--
392.34.1
40
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb
index f854078004..0455e23caa 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb
@@ -7,25 +7,27 @@ SECTION = "net"
7LICENSE = "MPL-2.0" 7LICENSE = "MPL-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
9 9
10GTEST_VER = "1.15.2" 10GTEST_VER = "1.17.0"
11SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=vsomeip \ 11SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=vsomeip \
12 https://github.com/google/googletest/releases/download/v${GTEST_VER}/googletest-${GTEST_VER}.tar.gz;name=gtest;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/ \ 12 https://github.com/google/googletest/releases/download/v${GTEST_VER}/googletest-${GTEST_VER}.tar.gz;name=gtest;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/ \
13 file://0001-Fix-pkgconfig-dir-for-multilib.patch \ 13 file://0001-Fix-pkgconfig-dir-for-multilib.patch \
14 file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \ 14 file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \
15 file://0004-Do-not-specify-PIE-flag-explicitly.patch \ 15 file://0003-Do-not-specify-PIE-flag-explicitly.patch \
16 file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ 16 file://0004-Fix-build-with-boost-1.89.patch \
17 file://0005-Replace-address-from_string-with-make_address.patch \
18 file://0006-Fix-scanning-64-bit-integer-types.patch \
19 file://0007-Do-not-treat-warnings-as-errors-with-clang.patch \
17 " 20 "
18 21
19SRCREV = "6461369b3874c844642c9adaac9d1b7406794ab8" 22SRCREV = "c4e0db329da9b63f511f3c2456c040582daf9305"
20SRC_URI[gtest.sha256sum] = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926" 23SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"
21 24
22COMPATIBLE_HOST:mips = "null" 25COMPATIBLE_HOST:mips = "null"
23COMPATIBLE_HOST:mips64 = "null" 26COMPATIBLE_HOST:mips64 = "null"
24COMPATIBLE_HOST:powerpc = "null" 27COMPATIBLE_HOST:powerpc = "null"
25COMPATIBLE_HOST:libc-musl = 'null' 28COMPATIBLE_HOST:libc-musl = 'null'
26 29
27DEPENDS = "boost dlt-daemon googletest" 30DEPENDS = "boost dlt-daemon"
28
29 31
30inherit cmake pkgconfig 32inherit cmake pkgconfig
31 33
@@ -43,9 +45,10 @@ EXTRA_OECMAKE += "-DTEST_IP_MASTER=10.0.3.1 \
43 45
44RDEPENDS:${PN}-test = "bash lsof" 46RDEPENDS:${PN}-test = "bash lsof"
45 47
46do_compile:append() { 48OECMAKE_TARGET_COMPILE += "vsomeip_ctrl examples build_tests"
47 cmake_runcmake_build --target examples 49
48 cmake_runcmake_build --target build_tests 50do_compile:prepend() {
51 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
49} 52}
50 53
51do_install:append() { 54do_install:append() {
@@ -58,13 +61,17 @@ do_install:append() {
58 install -d ${D}/opt/${PN}-test/test/test/common 61 install -d ${D}/opt/${PN}-test/test/test/common
59 cp -rf ${S}/test/common/examples_policies \ 62 cp -rf ${S}/test/common/examples_policies \
60 ${D}/opt/${PN}-test/test/test/common/ 63 ${D}/opt/${PN}-test/test/test/common/
64
65 install -d ${D}/opt/${PN}-test/test/common
61 install -m 0755 ${B}/test/common/libvsomeip_utilities.so \ 66 install -m 0755 ${B}/test/common/libvsomeip_utilities.so \
62 ${D}/opt/${PN}-test/test/test/common/ 67 ${D}/opt/${PN}-test/test/common/
63 68
64 for d in unit_tests network_tests; do 69 for d in unit_tests network_tests; do
65 install -d ${D}/opt/${PN}-test/test/$d 70 install -d ${D}/opt/${PN}-test/test/$d
66 cp -rf ${B}/test/$d/*_tests ${D}/opt/${PN}-test/test/$d 71 cp -rf ${B}/test/$d/*_tests ${D}/opt/${PN}-test/test/$d
72 find ${D}/opt/${PN}-test/test/$d -maxdepth 2 \( -name "*.cmake" -o -name "CMakeFiles" \) -exec rm -rf {} \;
67 done 73 done
74 sed -i -e 's#../..${B}#/opt/${PN}-test#g' ${D}/opt/${PN}-test/test/network_tests/lazy_load_tests/vsomeip/vsomeip_policy_extensions.json
68} 75}
69 76
70PACKAGES += "${PN}-test" 77PACKAGES += "${PN}-test"
@@ -75,4 +82,5 @@ FILES:${PN}-dbg += " \
75FILES:${PN}-test = " \ 82FILES:${PN}-test = " \
76 /opt/${PN}-test \ 83 /opt/${PN}-test \
77 " 84 "
78SKIP_RECIPE[vsomeip] ?= "Does not work with boost >= 1.87" 85
86INSANE_SKIP += "32bit-time"
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 851219765e..760edbce3e 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -56,8 +56,10 @@ PREFERRED_RPROVIDER_libdevmapper = "lvm2"
56PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native" 56PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native"
57PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2" 57PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2"
58PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" 58PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf"
59# Configures whether coreutils or uutils-coreutils is used. 59# Those lines configure whether coreutils or uutils-coreutils is used.
60PREFERRED_PROVIDER_coreutils = "coreutils" 60PREFERRED_PROVIDER_coreutils = "coreutils"
61PREFERRED_PROVIDER_coreutils-native = "coreutils-native"
62PREFERRED_PROVIDER_nativesdk-coreutils = "nativesdk-coreutils"
61PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader" 63PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader"
62PREFERRED_RPROVIDER_virtual-redis ?= "redis" 64PREFERRED_RPROVIDER_virtual-redis ?= "redis"
63 65
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb
index 1e207f7fb4..38b3e97dd2 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb
@@ -63,6 +63,8 @@ python __anonymous() {
63 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) 63 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog))
64} 64}
65 65
66BBCLASSEXTEND = "native nativesdk"
67
66do_compile:prepend() { 68do_compile:prepend() {
67 export LIBSTDBUF_DIR="${libdir}/coreutils" 69 export LIBSTDBUF_DIR="${libdir}/coreutils"
68} 70}
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
index d3a01e444c..439ab800f8 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.gtkmm.org/"
3SECTION = "libs" 3SECTION = "libs"
4 4
5LICENSE = "LGPL-2.1-only & GPL-2.0-only" 5LICENSE = "LGPL-2.1-only & GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ 6LIC_FILES_CHKSUM = " \
7 file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" 7 file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \
8 file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \
9"
8 10
9DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native" 11DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
10 12
@@ -14,7 +16,7 @@ inherit gnomebase features_check
14 16
15REQUIRED_DISTRO_FEATURES = "opengl x11" 17REQUIRED_DISTRO_FEATURES = "opengl x11"
16 18
17SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda" 19SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833"
18 20
19EXTRA_OEMESON = "-Dbuild-demos=false" 21EXTRA_OEMESON = "-Dbuild-demos=false"
20 22
diff --git a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb
index 6f862804ce..d83c37e850 100644
--- a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb
+++ b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb
@@ -14,7 +14,10 @@ SRC_URI[sha256sum] = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c415
14inherit pypi setuptools3 14inherit pypi setuptools3
15 15
16RDEPENDS:${PN} += "\ 16RDEPENDS:${PN} += "\
17 python3-misc \
17 python3-crypt \ 18 python3-crypt \
18 python3-logging \ 19 python3-logging \
19 python3-netclient \ 20 python3-netclient \
20" 21"
22
23BBCLASSEXTEND = "native" \ No newline at end of file
diff --git a/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb b/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb
index 7a4ac0e796..6a54d3a79a 100644
--- a/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb
+++ b/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb
@@ -7,3 +7,5 @@ inherit pypi setuptools3
7SRC_URI[sha256sum] = "881fb75bb1654ed55d86060bb067f2c716f8e155f57bb73fd444e53713aafec8" 7SRC_URI[sha256sum] = "881fb75bb1654ed55d86060bb067f2c716f8e155f57bb73fd444e53713aafec8"
8 8
9RDEPENDS:${PN} += "python3-six python3-logging" 9RDEPENDS:${PN} += "python3-six python3-logging"
10
11BBCLASSEXTEND = "native" \ No newline at end of file
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-06 05:28:47 +0000