diff --git a/action.yml b/action.yml index 964a400..d59c9e0 100644 --- a/action.yml +++ b/action.yml @@ -59,14 +59,14 @@ runs: shell: bash -eux {0} run: | cd ros-workspace/src/ros2/rcutils - git apply ${GITHUB_WORKSPACE}/rcutils.patch + git apply ${GITHUB_WORKSPACE}/patches/rcutils.patch - - name: Install additional packages + - name: Install patches for Iron only shell: bash -eux {0} if: ${{ inputs.ros_distro == 'iron' }} run: | - echo 'Installing lttng' - sudo apt install -y liblttng-ust-dev lttng-tools + cd ros-workspace/src/ros2/ros2_tracing/tracetools + git apply ${GITHUB_WORKSPACE}/patches/iron_tracetools.patch - name: Copy environment file to workspace shell: bash -eux {0} diff --git a/patches/iron_tracetools.patch b/patches/iron_tracetools.patch new file mode 100644 index 0000000..4a9aa03 --- /dev/null +++ b/patches/iron_tracetools.patch @@ -0,0 +1,13 @@ +diff --git a/tracetools/CMakeLists.txt b/tracetools/CMakeLists.txt +index cd829d5..56526cc 100644 +--- a/tracetools/CMakeLists.txt ++++ b/tracetools/CMakeLists.txt +@@ -23,7 +23,7 @@ else() + set(STATUS_CHECKING_TOOL_DEFAULT ON) + endif() + option(TRACETOOLS_DISABLED "Explicitly disable support for tracing" ${DISABLED_DEFAULT}) +-option(TRACETOOLS_TRACEPOINTS_EXCLUDED "Do not include tracepoints" OFF) ++option(TRACETOOLS_TRACEPOINTS_EXCLUDED "Do not include tracepoints" ON) + option(TRACETOOLS_NO_RDYNAMIC "Disable export of -rdynamic link flag" OFF) + option(TRACETOOLS_STATUS_CHECKING_TOOL "Enable the status checking tool" ${STATUS_CHECKING_TOOL_DEFAULT}) + diff --git a/rcutils.patch b/patches/rcutils.patch similarity index 100% rename from rcutils.patch rename to patches/rcutils.patch