diff mbox series

[meta-oe] vsomeip: upgrade 3.5.10 -> 3.5.11

Message ID 20251120152236.2980604-1-yi.zhao@windriver.com
State Under Review
Headers show
Series [meta-oe] vsomeip: upgrade 3.5.10 -> 3.5.11 | expand

Commit Message

Yi Zhao Nov. 20, 2025, 3:22 p.m. UTC
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>
---
 ...ddress-from_string-with-make_address.patch | 19 ++-----
 ...8-Replace-io_service-with-io_context.patch | 51 +++++++++++++++++++
 ...ts-CMakeLists.txt-update-cmake_minim.patch | 40 +++++++++++++++
 .../{vsomeip_3.5.10.bb => vsomeip_3.5.11.bb}  |  4 +-
 4 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 meta-networking/recipes-protocols/vsomeip/vsomeip/0008-Replace-io_service-with-io_context.patch
 create mode 100644 meta-networking/recipes-protocols/vsomeip/vsomeip/0009-cached_event_tests-CMakeLists.txt-update-cmake_minim.patch
 rename meta-networking/recipes-protocols/vsomeip/{vsomeip_3.5.10.bb => vsomeip_3.5.11.bb} (94%)
diff mbox series

Patch

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 @@ 
-From 47b976736e4f57447339081ab5a40435b3b2d5a8 Mon Sep 17 00:00:00 2001
+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
@@ -17,14 +17,14 @@  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 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 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 3723fe5b..8a252c0b 100644
+index a3dc5242..7b9619c9 100644
 --- a/implementation/routing/src/routing_manager_impl.cpp
 +++ b/implementation/routing/src/routing_manager_impl.cpp
-@@ -1404,7 +1404,7 @@ void routing_manager_impl::on_message(const byte_t* _data, length_t _size, endpo
+@@ -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 =
@@ -33,15 +33,6 @@  index 3723fe5b..8a252c0b 100644
          trace::protocol_e its_protocol = _receiver->is_local() ? trace::protocol_e::local
                  : _receiver->is_reliable()                     ? trace::protocol_e::tcp
                                                                 : trace::protocol_e::udp;
-@@ -1442,7 +1442,7 @@ bool routing_manager_impl::on_message(service_t _service, instance_t _instance,
-         std::shared_ptr<endpoint> _receiver = its_info->get_endpoint(_reliable);
-         if (_receiver && _receiver.get()) {
-             if(!is_acl_message_allowed(_receiver.get(), _service, _instance,
--                    boost::asio::ip::address_v4::from_string("127.0.0.1"))) {
-+                    boost::asio::ip::make_address_v4("127.0.0.1"))) {
-                 return false;
-             }
-         }
 -- 
 2.34.1
 
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 @@ 
+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
+
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 @@ 
+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
+
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.11.bb
similarity index 94%
rename from meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.10.bb
rename to 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=
            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 \
           "
 
-SRCREV = "c4e0db329da9b63f511f3c2456c040582daf9305"
+SRCREV = "f58ba578c8c04e02dcf08d3ebcb9a71ca1e203ea"
 SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"
 
 COMPATIBLE_HOST:mips = "null"