Skip to content

Commit a8a1502

Browse files
committed
fix [Dockerfile.l4t-humble]: Fix compilation for r35.4.1
1 parent 8f727de commit a8a1502

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

docker/Dockerfile.l4t-humble

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ ARG ROS2_DIST=humble
1717

1818
# ZED ROS2 Wrapper dependencies version
1919
ARG XACRO_VERSION=2.0.8
20+
ARG DRACO_VERSION=1.5.7
2021
ARG DIAGNOSTICS_VERSION=4.0.0
2122
ARG AMENT_LINT_VERSION=0.12.11
2223
ARG ROBOT_LOCALIZATION_VERSION=3.5.3
2324
ARG ZED_MSGS_VERSION=5.0.0
2425
ARG NMEA_MSGS_VERSION=2.0.0
2526
ARG ANGLES_VERSION=1.15.0
2627
ARG GEOGRAPHIC_INFO_VERSION=1.0.6
28+
ARG RCPPUTILS_VERSION=2.11.2
2729
ARG POINTCLOUD_TRANSPORT_VERSION=1.0.18
2830
ARG POINTCLOUD_TRANSPORT_PLUGINS_VERSION=1.0.11
2931
ARG RMW_CYCLONEDDS_VERSION=1.3.4
@@ -58,7 +60,7 @@ RUN echo "# R${L4T_MAJOR} (release), REVISION: ${L4T_MINOR}" > /etc/nv_tegra_rel
5860
apt-get update -y || true && \
5961
apt-get install -y --no-install-recommends zstd wget less cmake curl gnupg2 \
6062
build-essential python3 python3-pip python3-dev python3-setuptools libusb-1.0-0-dev \
61-
libgeographic-dev libdraco-dev zlib1g-dev -y && \
63+
libgeographic-dev zlib1g-dev -y && \
6264
pip install protobuf && \
6365
wget -q --no-check-certificate -O ZED_SDK_Linux_JP.run \
6466
${ZED_SDK_URL} && \
@@ -70,19 +72,17 @@ RUN echo "# R${L4T_MAJOR} (release), REVISION: ${L4T_MINOR}" > /etc/nv_tegra_rel
7072
# Install the ZED ROS2 Wrapper
7173
ENV ROS_DISTRO=${ROS2_DIST}
7274

73-
# Copy the sources in the Docker image
74-
WORKDIR /root/ros2_ws/src
75-
COPY tmp_sources/ ./
76-
7775
# Install missing dependencies from the sources
7876
WORKDIR /root/ros2_ws/src
7977
RUN wget https://github.com/ros/xacro/archive/refs/tags/${XACRO_VERSION}.tar.gz -O - | tar -xvz && mv xacro-${XACRO_VERSION} xacro && \
78+
wget https://github.com/google/draco/archive/refs/tags/${DRACO_VERSION}.tar.gz -O - | tar -xvz && mv draco-${DRACO_VERSION} draco && cd draco && mkdir -p build && cd build && cmake .. && make install && cd ../.. && \
8079
wget https://github.com/ros/diagnostics/archive/refs/tags/${DIAGNOSTICS_VERSION}.tar.gz -O - | tar -xvz && mv diagnostics-${DIAGNOSTICS_VERSION} diagnostics && \
8180
wget https://github.com/ament/ament_lint/archive/refs/tags/${AMENT_LINT_VERSION}.tar.gz -O - | tar -xvz && mv ament_lint-${AMENT_LINT_VERSION} ament-lint && \
8281
wget https://github.com/cra-ros-pkg/robot_localization/archive/refs/tags/${ROBOT_LOCALIZATION_VERSION}.tar.gz -O - | tar -xvz && mv robot_localization-${ROBOT_LOCALIZATION_VERSION} robot-localization && \
8382
wget https://github.com/stereolabs/zed-ros2-interfaces/archive/refs/tags/${ZED_MSGS_VERSION}.tar.gz -O - | tar -xvz && mv zed-ros2-interfaces-${ZED_MSGS_VERSION} zed-ros2-interfaces && \
8483
wget https://github.com/ros-drivers/nmea_msgs/archive/refs/tags/${NMEA_MSGS_VERSION}.tar.gz -O - | tar -xvz && mv nmea_msgs-${NMEA_MSGS_VERSION} nmea_msgs && \
8584
wget https://github.com/ros/angles/archive/refs/tags/${ANGLES_VERSION}.tar.gz -O - | tar -xvz && mv angles-${ANGLES_VERSION} angles && \
85+
wget https://github.com/ros2/rcpputils/archive/refs/tags/${RCPPUTILS_VERSION}.tar.gz -O - | tar -xvz && mv rcpputils-${RCPPUTILS_VERSION} rcpputils && \
8686
wget https://github.com/ros-perception/point_cloud_transport/archive/refs/tags/${POINTCLOUD_TRANSPORT_VERSION}.tar.gz -O - | tar -xvz && mv point_cloud_transport-${POINTCLOUD_TRANSPORT_VERSION} point_cloud_transport && \
8787
wget https://github.com/ros-perception/point_cloud_transport_plugins/archive/refs/tags/${POINTCLOUD_TRANSPORT_PLUGINS_VERSION}.tar.gz -O - | tar -xvz && mv point_cloud_transport_plugins-${POINTCLOUD_TRANSPORT_PLUGINS_VERSION} point_cloud_transport_plugins && \
8888
wget https://github.com/ros2/rmw_cyclonedds/archive/refs/tags/${RMW_CYCLONEDDS_VERSION}.tar.gz -O - | tar -xvz && mv rmw_cyclonedds-${RMW_CYCLONEDDS_VERSION} rmw_cyclonedds && \
@@ -93,11 +93,22 @@ RUN wget https://github.com/ros/xacro/archive/refs/tags/${XACRO_VERSION}.tar.gz
9393
# Install cython
9494
RUN python3 -m pip install --upgrade cython
9595

96-
# Build the dependencies and the ZED ROS2 Wrapper
96+
# Build the dependencies
9797
WORKDIR /root/ros2_ws
9898
RUN /bin/bash -c "source /opt/ros/$ROS_DISTRO/install/setup.bash && \
99+
colcon build --parallel-workers $(nproc) --symlink-install \
100+
--event-handlers console_direct+ --base-paths src"
101+
102+
# Copy the sources in the Docker image
103+
WORKDIR /root/ros2_ws/src
104+
COPY tmp_sources/ ./
105+
106+
# Build the ZED ROS2 Wrapper
107+
WORKDIR /root/ros2_ws
108+
RUN /bin/bash -c "source /root/ros2_ws/install/setup.bash && \
99109
colcon build --parallel-workers $(nproc) --symlink-install \
100110
--event-handlers console_direct+ --base-paths src \
111+
--packages-select-regex '^zed.*' \
101112
--cmake-args ' -DCMAKE_BUILD_TYPE=Release' \
102113
' -DCMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs' \
103114
' -DCMAKE_CXX_FLAGS="-Wl,--allow-shlib-undefined"' \

0 commit comments

Comments
 (0)