From a45377787a343814c0de53ff8169c39c58bf36be Mon Sep 17 00:00:00 2001 From: Adrian <67166322+Caedael@users.noreply.github.com> Date: Wed, 13 May 2026 13:22:31 +0200 Subject: [PATCH 1/2] Change cp command to use -rfL option (#335) Resolve symlinks from the `extra_packages` directory (cherry picked from commit 2f73852d03348d8078148bb729a26a31d291e2f6) # Conflicts: # libmicroros.mk --- libmicroros.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libmicroros.mk b/libmicroros.mk index 0f0507f7..a5b31fd3 100644 --- a/libmicroros.mk +++ b/libmicroros.mk @@ -79,7 +79,13 @@ $(EXTENSIONS_DIR)/micro_ros_src/src: 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; \ +<<<<<<< HEAD cp -rf $(EXTRA_ROS_PACKAGES) src/extra_packages || :; \ +======= + touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \ + touch src/ros2_tracing/lttngpy/COLCON_IGNORE; \ + cp -rfL $(EXTRA_ROS_PACKAGES) src/extra_packages || :; \ +>>>>>>> 2f73852 (Change cp command to use -rfL option (#335)) test -f src/extra_packages/extra_packages.repos && cd src/extra_packages && vcs import --input extra_packages.repos || :; From 2c7190d072db9f114c46cf3cd8e4e5b05114e175 Mon Sep 17 00:00:00 2001 From: Aarav Gupta Date: Wed, 13 May 2026 17:01:41 +0530 Subject: [PATCH 2/2] Fix conflict in libmicroros.mk --- libmicroros.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libmicroros.mk b/libmicroros.mk index a5b31fd3..5f202bec 100644 --- a/libmicroros.mk +++ b/libmicroros.mk @@ -79,13 +79,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/src: 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; \ -<<<<<<< HEAD - cp -rf $(EXTRA_ROS_PACKAGES) src/extra_packages || :; \ -======= - touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \ - touch src/ros2_tracing/lttngpy/COLCON_IGNORE; \ cp -rfL $(EXTRA_ROS_PACKAGES) src/extra_packages || :; \ ->>>>>>> 2f73852 (Change cp command to use -rfL option (#335)) test -f src/extra_packages/extra_packages.repos && cd src/extra_packages && vcs import --input extra_packages.repos || :;