From ffaf3863d7010ac39cac05696ad7558a7c09b120 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 11 Nov 2021 10:43:04 +0100 Subject: [PATCH 1/2] Fix rosdep --- scripts/create_agent_ws.sh | 5 ++--- scripts/create_firmware_ws.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/create_agent_ws.sh b/scripts/create_agent_ws.sh index 9b67af10..897c1942 100755 --- a/scripts/create_agent_ws.sh +++ b/scripts/create_agent_ws.sh @@ -6,7 +6,7 @@ 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" +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 +18,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..a182c584 100755 --- a/scripts/create_firmware_ws.sh +++ b/scripts/create_firmware_ws.sh @@ -68,7 +68,7 @@ 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" +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 From ff58384c8cd75a580423bbef9dad9b37279f8896 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 11 Nov 2021 10:56:14 +0100 Subject: [PATCH 2/2] Update --- config/host/generic/create.sh | 2 +- scripts/create_agent_ws.sh | 5 +++++ scripts/create_firmware_ws.sh | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) 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 897c1942..32e68ddd 100755 --- a/scripts/create_agent_ws.sh +++ b/scripts/create_agent_ws.sh @@ -6,6 +6,11 @@ set -o pipefail PREFIX=$(ros2 pkg prefix micro_ros_setup) TARGETDIR=src + +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 ] diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh index a182c584..17cef1ae 100755 --- a/scripts/create_firmware_ws.sh +++ b/scripts/create_firmware_ws.sh @@ -68,6 +68,11 @@ echo $RTOS > $FW_TARGETDIR/PLATFORM echo $PLATFORM >> $FW_TARGETDIR/PLATFORM # Setting common enviroment + +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