From 39cd8d5827f66d30fa41552324538d0c6a581a9a Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Mon, 4 Mar 2024 20:47:00 +0300 Subject: [PATCH] Fix ROS build --- builder/image-build-ros.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/builder/image-build-ros.sh b/builder/image-build-ros.sh index 84bd5ec06..d86ff93c6 100755 --- a/builder/image-build-ros.sh +++ b/builder/image-build-ros.sh @@ -67,7 +67,14 @@ vcs import --input noetic.rosinstall ./src #cd ~/ros_catkin_ws echo "--- Resolve dependencies" -rosdep install --from-paths ./src --ignore-packages-from-source --rosdistro $ROS_DISTRO -y --os=debian:bullseye --skip-keys="python3-catkin-pkg-modules libboost-thread python3-rosdep-modules" +rosdep install --from-paths ./src --ignore-packages-from-source --rosdistro $ROS_DISTRO -y --os=debian:bullseye --skip-keys="python3-catkin-pkg-modules libboost-thread python3-rosdep-modules" || true + +echo "--- Install missing dependencies" +apt-get install -y liborocos-kdl1.5 geographiclib-tools libgeographiclib-dev + +echo "-- Install geographiclib datasets" +wget https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh +./install_geographiclib_datasets.sh echo "--- Apply patches" wget https://github.com/ros/rosconsole/pull/58.patch @@ -76,6 +83,9 @@ patch -p1 -d src/rosconsole < 58.patch wget https://github.com/ros/ros_comm/pull/2353.patch patch -p2 -d src/ros_comm < 2353.patch +wget https://github.com/AJahueyM/web_video_server/commit/5b722eb0822bcc3fe45fefe7b393b87bfe004417.patch +patch -p2 -d src/web_video_server < 5b722eb0822bcc3fe45fefe7b393b87bfe004417.patch + echo "--- Build ROS" # https://github.com/ros/catkin/issues/863#issuecomment-290392074 ./src/catkin/bin/catkin_make_isolated --install -DCMAKE_BUILD_TYPE=Release