Skip to content

Commit d2c43d8

Browse files
committed
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 ros2/rcl#1269 is added in https://github.com/micro-ROS/rcl. https://github.com/ros2/rosidl needs to be pinned to an older version due to breaking changes made with ros2/rosidl#941
1 parent cf037b2 commit d2c43d8

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

libmicroros.mk

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,17 @@ $(EXTENSIONS_DIR)/micro_ros_src/src:
6060
git clone -b ros2 https://github.com/eProsima/micro-CDR src/micro-CDR; \
6161
git clone -b rolling https://github.com/micro-ROS/rcl src/rcl; \
6262
git clone -b rolling https://github.com/ros2/rclc src/rclc; \
63+
cd src/rclc; \
64+
git reset --hard 2283a6d76c3f41a964d03610a3305166d8c2caaa; \
65+
cd ../..; \
6366
git clone -b rolling https://github.com/micro-ROS/rcutils src/rcutils; \
6467
git clone -b rolling https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \
6568
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \
6669
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \
6770
git clone -b rolling https://github.com/ros2/rosidl src/rosidl; \
71+
cd src/rosidl; \
72+
git reset --hard 2e9ab2d70097cbfa5bb48ae4486a8a1c15a3936c; \
73+
cd ../..; \
6874
git clone -b rolling https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \
6975
git clone -b rolling https://github.com/ros2/rmw src/rmw; \
7076
git clone -b rolling https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \
@@ -78,10 +84,10 @@ $(EXTENSIONS_DIR)/micro_ros_src/src:
7884
git clone -b rolling https://github.com/ros2/ros2_tracing src/ros2_tracing; \
7985
git clone -b rolling https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \
8086
git clone -b rolling https://github.com/ros2/rosidl_core src/rosidl_core; \
81-
touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \
82-
touch src/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE; \
83-
touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \
84-
touch src/rclc/rclc_examples/COLCON_IGNORE; \
87+
touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \
88+
touch src/rcl_logging/rcl_logging_implementation/COLCON_IGNORE; \
89+
touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \
90+
touch src/rclc/rclc_examples/COLCON_IGNORE; \
8591
touch src/rcl/rcl_yaml_param_parser/COLCON_IGNORE; \
8692
touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \
8793
touch src/ros2_tracing/lttngpy/COLCON_IGNORE; \

0 commit comments

Comments
 (0)