summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2025-11-20 23:22:36 +0800
committerKhem Raj <raj.khem@gmail.com>2025-11-20 08:37:05 -0800
commit2fa968086107bfa05b489f3ff2be39288f80a3ba (patch)
tree8519f24c40e1ebfa6e26bea08dd9ba2a26b05fa8 /meta-networking
parent374b784b220b4f60dfbbb176aa58cec2a2b6eef2 (diff)
downloadmeta-openembedded-2fa968086107bfa05b489f3ff2be39288f80a3ba.tar.gz
vsomeip: upgrade 3.5.10 -> 3.5.11
ChangeLog: https://github.com/COVESA/vsomeip/releases/tag/3.5.11 * Refresh local patches * Fix build with boost 1.89 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch19
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0008-Replace-io_service-with-io_context.patch51
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip/0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch40
-rw-r--r--meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.11.bb (renamed from meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb)4
4 files changed, 99 insertions, 15 deletions
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
index c25df03d3b..2c96c4945d 100644
--- 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
@@ -1,4 +1,4 @@
1From 47b976736e4f57447339081ab5a40435b3b2d5a8 Mon Sep 17 00:00:00 2001 1From 1ca5cf52db05a44e5e469bc394c0a1b32fb943f6 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 4 Nov 2025 22:10:33 +0800 3Date: Tue, 4 Nov 2025 22:10:33 +0800
4Subject: [PATCH] Replace address::from_string with make_address 4Subject: [PATCH] Replace address::from_string with make_address
@@ -17,14 +17,14 @@ Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/973]
17 17
18Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 18Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
19--- 19---
20 implementation/routing/src/routing_manager_impl.cpp | 4 ++-- 20 implementation/routing/src/routing_manager_impl.cpp | 2 +-
21 1 file changed, 2 insertions(+), 2 deletions(-) 21 1 file changed, 1 insertion(+), 1 deletion(-)
22 22
23diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp 23diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
24index 3723fe5b..8a252c0b 100644 24index a3dc5242..7b9619c9 100644
25--- a/implementation/routing/src/routing_manager_impl.cpp 25--- a/implementation/routing/src/routing_manager_impl.cpp
26+++ b/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 27@@ -1421,7 +1421,7 @@ void routing_manager_impl::on_message(const byte_t* _data, length_t _size, endpo
28 if (is_forwarded) { 28 if (is_forwarded) {
29 trace::header its_header; 29 trace::header its_header;
30 const boost::asio::ip::address_v4 its_remote_address = 30 const boost::asio::ip::address_v4 its_remote_address =
@@ -33,15 +33,6 @@ index 3723fe5b..8a252c0b 100644
33 trace::protocol_e its_protocol = _receiver->is_local() ? trace::protocol_e::local 33 trace::protocol_e its_protocol = _receiver->is_local() ? trace::protocol_e::local
34 : _receiver->is_reliable() ? trace::protocol_e::tcp 34 : _receiver->is_reliable() ? trace::protocol_e::tcp
35 : trace::protocol_e::udp; 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-- 36--
462.34.1 372.34.1
47 38
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0008-Replace-io_service-with-io_context.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0008-Replace-io_service-with-io_context.patch
new file mode 100644
index 0000000000..db0363ebc7
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0008-Replace-io_service-with-io_context.patch
@@ -0,0 +1,51 @@
1From 4b2d82748eaf53a700002d05c6629fa6f5df3dcf Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Thu, 20 Nov 2025 17:27:39 +0800
4Subject: [PATCH] Replace io_service with io_context
5
6boost::asio::io_service has been removed in boost 1.87. Replace it with
7boost::asio::io_context.
8
9Fix:
10test/common/include/common/process_manager.hpp:10:10: fatal error:
11boost/asio/io_service.hpp: No such file or directory
12 10 | #include <boost/asio/io_service.hpp>
13 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
14
15Upstream-Status: Pending
16
17Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
18---
19 test/common/include/common/process_manager.hpp | 9 ++++++---
20 1 file changed, 6 insertions(+), 3 deletions(-)
21
22diff --git a/test/common/include/common/process_manager.hpp b/test/common/include/common/process_manager.hpp
23index e09d530e..23731785 100644
24--- a/test/common/include/common/process_manager.hpp
25+++ b/test/common/include/common/process_manager.hpp
26@@ -6,8 +6,11 @@
27 #pragma once
28
29 #include <boost/date_time/posix_time/posix_time.hpp>
30-#include <boost/process.hpp>
31-#include <boost/asio/io_service.hpp>
32+#define BOOST_PROCESS_VERSION 1
33+#include <boost/process/v1/child.hpp>
34+#include <boost/process/v1/env.hpp>
35+#include <boost/process/v1/detail/on_exit.hpp>
36+#include <boost/asio/io_context.hpp>
37
38 #include <iostream>
39
40@@ -97,7 +100,7 @@ private:
41 */
42 void spawn() {
43 std::unique_lock<std::mutex> lock(process_mutex_);
44- boost::asio::io_service io;
45+ boost::asio::io_context io;
46
47 // Handle env vars
48 boost::process::environment cp_env;
49--
502.34.1
51
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch
new file mode 100644
index 0000000000..ad68b5354a
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch
@@ -0,0 +1,40 @@
1From 7dec71178aee905fac28712594f91969c6070b81 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Thu, 20 Nov 2025 17:26:27 +0800
4Subject: [PATCH] cached_event_tests/CMakeLists.txt: update
5 cmake_minimum_required
6
7Update cmake_minimum_required to make it consistent with the others.
8
9Fix configuration error in higher versions of CMake:
10CMake Error at test/network_tests/cached_event_tests/CMakeLists.txt:6
11(cmake_minimum_required):
12 Compatibility with CMake < 3.5 has been removed from CMake.
13
14 Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
15 to tell CMake that the project requires at least <min> but has been updated
16 to work with policies introduced by <max> or earlier.
17
18Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/977]
19
20Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
21---
22 test/network_tests/cached_event_tests/CMakeLists.txt | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/test/network_tests/cached_event_tests/CMakeLists.txt b/test/network_tests/cached_event_tests/CMakeLists.txt
26index 4a68ae29..a2fbff86 100644
27--- a/test/network_tests/cached_event_tests/CMakeLists.txt
28+++ b/test/network_tests/cached_event_tests/CMakeLists.txt
29@@ -3,7 +3,7 @@
30 # License, v. 2.0. If a copy of the MPL was not distributed with this
31 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
32
33-cmake_minimum_required(VERSION 3.4)
34+cmake_minimum_required(VERSION 3.4...3.22)
35
36 # Configure necessary files into the build folder.
37 set(configuration_files
38--
392.34.1
40
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.11.bb
index 0455e23caa..e8b72743ec 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.11.bb
@@ -17,9 +17,11 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=
17 file://0005-Replace-address-from_string-with-make_address.patch \ 17 file://0005-Replace-address-from_string-with-make_address.patch \
18 file://0006-Fix-scanning-64-bit-integer-types.patch \ 18 file://0006-Fix-scanning-64-bit-integer-types.patch \
19 file://0007-Do-not-treat-warnings-as-errors-with-clang.patch \ 19 file://0007-Do-not-treat-warnings-as-errors-with-clang.patch \
20 file://0008-Replace-io_service-with-io_context.patch \
21 file://0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch \
20 " 22 "
21 23
22SRCREV = "c4e0db329da9b63f511f3c2456c040582daf9305" 24SRCREV = "f58ba578c8c04e02dcf08d3ebcb9a71ca1e203ea"
23SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c" 25SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"
24 26
25COMPATIBLE_HOST:mips = "null" 27COMPATIBLE_HOST:mips = "null"