Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install liblttng-ctl-dev instead of python3-lttng in Rolling #725

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Install liblttng-ctl-dev instead of python3-lttng in Rolling #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion linux_docker_resources/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} != humble \); then apt-get update && apt-get install --no-install-recommends -y \
liblttng-ust-dev \
lttng-tools \
python3-babeltrace \
python3-babeltrace; fi
# Iron uses python3-lttng, but then starting after Iron we switch to liblttng-ctl-dev.
RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = iron \); then apt-get update && apt-get install --no-install-recommends -y \
python3-lttng; fi
RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = rolling \); then apt-get update && apt-get install --no-install-recommends -y \
liblttng-ctl-dev; fi

# Install clang if build arg is true
RUN if test ${COMPILE_WITH_CLANG} = true; then apt-get update && apt-get install --no-install-recommends -y clang libc++-dev libc++abi-dev; fi
Expand Down
3 changes: 2 additions & 1 deletion linux_docker_resources/Dockerfile-RHEL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ RUN dnf install \
libyaml-devel \
libzstd-devel \
$(if test ${EL_RELEASE/.*/} != 8; then echo lttng-tools; fi) \
$(if test ${EL_RELEASE/.*/} != 8 -a ${ROS_DISTRO} = rolling; then echo lttng-tools-devel; fi) \
$(if test ${EL_RELEASE/.*/} != 8; then echo lttng-ust-devel; fi) \
mesa-libGL-devel \
mesa-libGLU-devel \
Expand All @@ -137,7 +138,7 @@ RUN dnf install \
python3-importlib-metadata \
$(if test ${EL_RELEASE/.*/} = 8; then echo python3-importlib-resources; fi) \
python3-lark-parser \
$(if test ${EL_RELEASE/.*/} != 8; then echo python3-lttng; fi) \
$(if test ${EL_RELEASE/.*/} != 8 -a ${ROS_DISTRO} != rolling; then echo python3-lttng; fi) \
python3-lxml \
$(if test ${EL_RELEASE/.*/} != 9; then echo python3-matplotlib; fi) \
$(if test ${EL_RELEASE/.*/} = 8; then echo python3-mock; fi) \
Expand Down