Skip to content

Commit 18fe3f2

Browse files
committed
Fix rolling builds
1 parent cf037b2 commit 18fe3f2

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

libmicroros.mk

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ $(EXTENSIONS_DIR)/micro_ros_dev/install:
4747
touch src/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE; \
4848
colcon build --cmake-args -DBUILD_TESTING=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=gcc;
4949

50+
# ros2/rclc needs to be pinned to an older version until
51+
# ros2/rcl#1269 is added in micro-ROS/rcl as ros2/rclc#435 depends on it.
52+
# ros2/rosidl needs to be pinned to an older version as ros2/rosidl#942 added rosidl_buffer as
53+
# a dependency for various rosidl packages and we can't build it currently.
5054
$(EXTENSIONS_DIR)/micro_ros_src/src:
5155
rm -rf micro_ros_src; \
5256
mkdir micro_ros_src; cd micro_ros_src; \
@@ -60,11 +64,17 @@ $(EXTENSIONS_DIR)/micro_ros_src/src:
6064
git clone -b ros2 https://github.com/eProsima/micro-CDR src/micro-CDR; \
6165
git clone -b rolling https://github.com/micro-ROS/rcl src/rcl; \
6266
git clone -b rolling https://github.com/ros2/rclc src/rclc; \
67+
cd src/rclc; \
68+
git reset --hard 2283a6d76c3f41a964d03610a3305166d8c2caaa; \
69+
cd ../..; \
6370
git clone -b rolling https://github.com/micro-ROS/rcutils src/rcutils; \
6471
git clone -b rolling https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \
6572
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \
6673
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \
6774
git clone -b rolling https://github.com/ros2/rosidl src/rosidl; \
75+
cd src/rosidl; \
76+
git reset --hard 5f4ace0288ecf942307ed62b9239ab5986884676; \
77+
cd ../..; \
6878
git clone -b rolling https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \
6979
git clone -b rolling https://github.com/ros2/rmw src/rmw; \
7080
git clone -b rolling https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \
@@ -78,13 +88,16 @@ $(EXTENSIONS_DIR)/micro_ros_src/src:
7888
git clone -b rolling https://github.com/ros2/ros2_tracing src/ros2_tracing; \
7989
git clone -b rolling https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \
8090
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; \
8591
touch src/rcl/rcl_yaml_param_parser/COLCON_IGNORE; \
86-
touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \
92+
touch src/rclc/rclc_examples/COLCON_IGNORE; \
93+
touch src/rcl_logging/rcl_logging_implementation/COLCON_IGNORE; \
94+
touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \
8795
touch src/ros2_tracing/lttngpy/COLCON_IGNORE; \
96+
touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \
97+
touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \
98+
touch src/rosidl/rosidl_buffer/COLCON_IGNORE; \
99+
touch src/rosidl/rosidl_buffer_backend/COLCON_IGNORE; \
100+
touch src/rosidl/rosidl_buffer_backend_registry/COLCON_IGNORE; \
88101
cp -rf $(EXTRA_ROS_PACKAGES) src/extra_packages || :; \
89102
test -f src/extra_packages/extra_packages.repos && cd src/extra_packages && vcs import --input extra_packages.repos || :;
90103

0 commit comments

Comments
 (0)