Skip to content

Commit ad71281

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`. This PR also fixes #251
1 parent ec6680e commit ad71281

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

libmicroros.mk

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ $(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; \
@@ -78,10 +81,10 @@ $(EXTENSIONS_DIR)/micro_ros_src/src:
7881
git clone -b rolling https://github.com/ros2/ros2_tracing src/ros2_tracing; \
7982
git clone -b rolling https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \
8083
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; \
84+
touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \
85+
touch src/rcl_logging/rcl_logging_implementation/COLCON_IGNORE; \
86+
touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \
87+
touch src/rclc/rclc_examples/COLCON_IGNORE; \
8588
touch src/rcl/rcl_yaml_param_parser/COLCON_IGNORE; \
8689
touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \
8790
touch src/ros2_tracing/lttngpy/COLCON_IGNORE; \
@@ -113,7 +116,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/install: $(EXTENSIONS_DIR)/esp32_toolchain.cmake
113116

114117
patch_atomic:$(EXTENSIONS_DIR)/micro_ros_src/install
115118
# Workaround https://github.com/micro-ROS/micro_ros_espidf_component/issues/18
116-
ifeq ($(IDF_TARGET),$(filter $(IDF_TARGET),esp32s2 esp32c3 esp32c6))
119+
ifeq ($(IDF_TARGET),$(filter $(IDF_TARGET),esp32 esp32s2 esp32s3 esp32c3 esp32c6))
117120
echo $(UROS_DIR)/atomic_workaround; \
118121
mkdir $(UROS_DIR)/atomic_workaround; cd $(UROS_DIR)/atomic_workaround; \
119122
$(X_AR) x $(UROS_DIR)/install/lib/librcutils.a; \

0 commit comments

Comments
 (0)