From be6b0e52673283a4b6b01386a6a0f4c94ada3c11 Mon Sep 17 00:00:00 2001 From: Aarav Gupta Date: Wed, 25 Feb 2026 17:53:58 +0530 Subject: [PATCH] Fix rolling builds A new package was added to `rcl_logging` called `rcl_logging_implementation`. It depends on `rcpputils`, which I wasn't able to get building. Therefore, we are skipping building that package using `COLCON_IGNORE`. https://github.com/ros2/rclc needs to be pinned to an older version until https://github.com/ros2/rcl/pull/1269 is added in https://github.com/micro-ROS/rcl. This PR also fixes https://github.com/micro-ROS/micro_ros_espidf_component/issues/251. --- libmicroros.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libmicroros.mk b/libmicroros.mk index 47f94faf..7a43a9a3 100644 --- a/libmicroros.mk +++ b/libmicroros.mk @@ -60,6 +60,9 @@ $(EXTENSIONS_DIR)/micro_ros_src/src: git clone -b ros2 https://github.com/eProsima/micro-CDR src/micro-CDR; \ git clone -b rolling https://github.com/micro-ROS/rcl src/rcl; \ git clone -b rolling https://github.com/ros2/rclc src/rclc; \ + cd src/rclc; \ + git reset --hard 2283a6d76c3f41a964d03610a3305166d8c2caaa; \ + cd ../..; \ git clone -b rolling https://github.com/micro-ROS/rcutils src/rcutils; \ git clone -b rolling https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \ git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \ @@ -78,10 +81,10 @@ $(EXTENSIONS_DIR)/micro_ros_src/src: git clone -b rolling https://github.com/ros2/ros2_tracing src/ros2_tracing; \ git clone -b rolling https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \ git clone -b rolling https://github.com/ros2/rosidl_core src/rosidl_core; \ - touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \ - touch src/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE; \ - touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \ - touch src/rclc/rclc_examples/COLCON_IGNORE; \ + touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \ + touch src/rcl_logging/rcl_logging_implementation/COLCON_IGNORE; \ + touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \ + touch src/rclc/rclc_examples/COLCON_IGNORE; \ touch src/rcl/rcl_yaml_param_parser/COLCON_IGNORE; \ touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \ touch src/ros2_tracing/lttngpy/COLCON_IGNORE; \ @@ -113,7 +116,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/install: $(EXTENSIONS_DIR)/esp32_toolchain.cmake patch_atomic:$(EXTENSIONS_DIR)/micro_ros_src/install # Workaround https://github.com/micro-ROS/micro_ros_espidf_component/issues/18 -ifeq ($(IDF_TARGET),$(filter $(IDF_TARGET),esp32s2 esp32c3 esp32c6)) +ifeq ($(IDF_TARGET),$(filter $(IDF_TARGET),esp32 esp32s2 esp32s3 esp32c3 esp32c6)) echo $(UROS_DIR)/atomic_workaround; \ mkdir $(UROS_DIR)/atomic_workaround; cd $(UROS_DIR)/atomic_workaround; \ $(X_AR) x $(UROS_DIR)/install/lib/librcutils.a; \