diff --git a/patch/ros-jazzy-hardware-interface.unix.patch b/patch/ros-jazzy-hardware-interface.unix.patch index aa88149f3..9a80fd028 100644 --- a/patch/ros-jazzy-hardware-interface.unix.patch +++ b/patch/ros-jazzy-hardware-interface.unix.patch @@ -14,14 +14,6 @@ index b4e0f6cab..896175fad 100644 # using this instead of visibility macros # S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -@@ -54,6 +49,7 @@ target_include_directories(mock_components PUBLIC - $ - $ - ) -+target_link_libraries(mock_components PUBLIC hardware_interface) - ament_target_dependencies(mock_components PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) - - pluginlib_export_plugin_description_file( diff --git a/include/hardware_interface/async_components.hpp b/include/hardware_interface/async_components.hpp index 052c4ba92..85efed01f 100644 --- a/include/hardware_interface/async_components.hpp diff --git a/pkg_additional_info.yaml b/pkg_additional_info.yaml index 36385f884..b3e78d546 100644 --- a/pkg_additional_info.yaml +++ b/pkg_additional_info.yaml @@ -2,6 +2,8 @@ angles: build_number: 3 backward_ros: build_number: 3 +hardware_interface: + build_number: 3 ros_workspace: build_number: 3 rviz_common: diff --git a/rosdistro_snapshot.yaml b/rosdistro_snapshot.yaml index 130a8914e..1308e6e12 100644 --- a/rosdistro_snapshot.yaml +++ b/rosdistro_snapshot.yaml @@ -1880,9 +1880,9 @@ gz_utils_vendor: url: https://github.com/ros2-gbp/gz_utils_vendor-release.git version: 0.0.4 hardware_interface: - tag: release/jazzy/hardware_interface/4.23.0-1 + tag: release/jazzy/hardware_interface/4.25.0-1 url: https://github.com/ros2-gbp/ros2_control-release.git - version: 4.23.0 + version: 4.25.0 hardware_interface_testing: tag: release/jazzy/hardware_interface_testing/4.23.0-1 url: https://github.com/ros2-gbp/ros2_control-release.git diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml index d7b9ad216..20f6d67cc 100644 --- a/vinca_linux_64.yaml +++ b/vinca_linux_64.yaml @@ -81,6 +81,5 @@ packages_select_by_deps: - rmw_zenoh_cpp - flex_sync - patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml index d0efe43be..d7b9ad216 100644 --- a/vinca_linux_aarch64.yaml +++ b/vinca_linux_aarch64.yaml @@ -82,6 +82,5 @@ packages_select_by_deps: - flex_sync - patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml diff --git a/vinca_osx.yaml b/vinca_osx.yaml index 3e7950c07..3b820991d 100644 --- a/vinca_osx.yaml +++ b/vinca_osx.yaml @@ -91,7 +91,5 @@ packages_select_by_deps: - flex_sync - gripper_controllers - - patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml index 7aabf44f7..52cdaf730 100644 --- a/vinca_osx_arm64.yaml +++ b/vinca_osx_arm64.yaml @@ -90,6 +90,5 @@ packages_select_by_deps: - flex_sync - gripper_controllers - patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml diff --git a/vinca_win.yaml b/vinca_win.yaml index 1dec11a9d..26ce1cd97 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -94,7 +94,6 @@ packages_select_by_deps: - flex_sync - patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml