summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2026-03-28 06:52:41 +0000
committerCoprDistGit <infra@openeuler.org>2026-03-28 06:52:41 +0000
commit759fc614d6b72993a792d49731d0c9294ab2202d (patch)
tree6d9de81ab86e28ab6f0f2e5ff012859fb445beb7
parent45aee390b61cadef9a9860e54e8856458b66f6cc (diff)
automatic import of nav2-util
-rw-r--r--nav2-util.spec3
-rw-r--r--ros-humble-nav2-util-1.1.20-fix-lifecycle-bond.patch24
2 files changed, 26 insertions, 1 deletions
diff --git a/nav2-util.spec b/nav2-util.spec
index b03a96a..0af9911 100644
--- a/nav2-util.spec
+++ b/nav2-util.spec
@@ -16,6 +16,7 @@ Summary: TODO
License: Apache-2.0 and BSD-3-Clause
Source0: %{RosPkgName}-%{version}.tar.gz
+Patch0: ros-humble-nav2-util-1.1.20-fix-lifecycle-bond.patch
Requires: ros-%{ros_distro}-nav2-common
Requires: ros-%{ros_distro}-geometry-msgs
@@ -79,7 +80,7 @@ Provides: %{name}-runtime = %{version}-%{release}
TODO
%prep
-%autosetup -c -n %{name}-%{version}
+%autosetup -c -n %{name}-%{version} -p1
%build
# Needed to bootstrap since the ros_workspace package does not yet exist.
diff --git a/ros-humble-nav2-util-1.1.20-fix-lifecycle-bond.patch b/ros-humble-nav2-util-1.1.20-fix-lifecycle-bond.patch
new file mode 100644
index 0000000..4b921d2
--- /dev/null
+++ b/ros-humble-nav2-util-1.1.20-fix-lifecycle-bond.patch
@@ -0,0 +1,24 @@
+diff -Naur nav2-util-1.1.20_orig/include/nav2_util/lifecycle_node.hpp nav2-util-1.1.20/include/nav2_util/lifecycle_node.hpp
+--- nav2-util-1.1.20_orig/include/nav2_util/lifecycle_node.hpp 2024-01-01 00:00:00.000000000 +0800
++++ nav2-util-1.1.20/include/nav2_util/lifecycle_node.hpp 2024-01-01 00:00:00.000000000 +0800
+@@ -204,7 +204,7 @@
+ std::shared_ptr<tf2_ros::Buffer> tf_;
+ std::shared_ptr<tf2_ros::TransformListener> transform_listener_;
+
+- std::unique_ptr<bond::Bond> bond_{nullptr};
++ std::shared_ptr<bond::Bond> bond_{nullptr};
+ };
+
+ } // namespace nav2_util
+diff -Naur nav2-util-1.1.20_orig/src/lifecycle_node.cpp nav2-util-1.1.20/src/lifecycle_node.cpp
+--- nav2-util-1.1.20_orig/src/lifecycle_node.cpp 2024-01-01 00:00:00.000000000 +0800
++++ nav2-util-1.1.20/src/lifecycle_node.cpp 2024-01-01 00:00:00.000000000 +0800
+@@ -73,7 +73,7 @@
+ {
+ RCLCPP_INFO(get_logger(), "Creating bond (%s) to lifecycle manager.", this->get_name());
+
+- bond_ = std::make_unique<bond::Bond>(
++ bond_ = std::make_shared<bond::Bond>(
+ std::string("bond"),
+ this->get_name(),
+ shared_from_this());