Fix rosdep (micro-ROS#414)

* Fix rosdep * Update
nomumu · Nov 11, 2021 · 3a28e75 · 3a28e75
1 parent 3e5b966
commit 3a28e75
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git 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
diff --git 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
@@ -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