From 3a28e75c75e456bff4ca83e6be10e19fc3d18295 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 11 Nov 2021 12:47:16 +0100 Subject: [PATCH] Fix rosdep (#414) * Fix rosdep * Update --- config/host/generic/create.sh | 2 +- scripts/create_agent_ws.sh | 10 +++++++--- scripts/create_firmware_ws.sh | 7 ++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config/host/generic/create.sh b/config/host/generic/create.sh index c8c8d196..427cd222 100755 --- a/config/host/generic/create.sh +++ b/config/host/generic/create.sh @@ -4,7 +4,7 @@ ros2 run micro_ros_setup create_ws.sh src $PREFIX/config/$RTOS/client_ros2_packa # add appropriate colcon.meta cp $PREFIX/config/$RTOS/$PLATFORM/client-host-colcon.meta src/colcon.meta -rosdep install -y --from-paths src -i src --skip-keys="$SKIP" +rosdep install -y --from-paths src -i src --skip-keys="$SKIP" -r touch src/uros/rclc/rclc_examples/COLCON_IGNORE touch src/uros/rclc/rclc_lifecycle/COLCON_IGNORE \ No newline at end of file diff --git a/scripts/create_agent_ws.sh b/scripts/create_agent_ws.sh index 9b67af10..32e68ddd 100755 --- a/scripts/create_agent_ws.sh +++ b/scripts/create_agent_ws.sh @@ -6,7 +6,12 @@ set -o pipefail PREFIX=$(ros2 pkg prefix micro_ros_setup) TARGETDIR=src -SKIP="rosidl_typesupport_opensplice_c rosidl_typesupport_opensplice_cpp rmw_opensplice_cpp rmw_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_connext_cpp microxrcedds_agent microxrcedds_client microcdr" + +if [ -z ${EXTERNAL_SKIP+x} ]; then + EXTERNAL_SKIP="" +fi + +SKIP="rosidl_typesupport_opensplice_c rosidl_typesupport_opensplice_cpp rmw_opensplice_cpp rmw_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_connext_cpp microxrcedds_agent microxrcedds_client microcdr rmw_connextdds $EXTERNAL_SKIP" if [ $# -gt 0 ] then @@ -18,5 +23,4 @@ fi # populate the workspace ros2 run micro_ros_setup create_ws.sh $TARGETDIR $PREFIX/config/agent_ros2_packages.txt $PREFIX/config/agent_uros_packages.repos -rosdep install --from-paths $TARGETDIR -i $TARGETDIR -y \ - --skip-keys="$SKIP" +rosdep install --from-paths $TARGETDIR -i $TARGETDIR -y --skip-keys="$SKIP" diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh index 93bc0071..17cef1ae 100755 --- a/scripts/create_firmware_ws.sh +++ b/scripts/create_firmware_ws.sh @@ -68,7 +68,12 @@ echo $RTOS > $FW_TARGETDIR/PLATFORM echo $PLATFORM >> $FW_TARGETDIR/PLATFORM # Setting common enviroment -SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1" + +if [ -z ${EXTERNAL_SKIP+x} ]; then + EXTERNAL_SKIP="" +fi + +SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1 rmw_connextdds $EXTERNAL_SKIP" # Check generic build if [ $PLATFORM != "generic" ] && [ -d "$PREFIX/config/$RTOS/generic" ]; then