From 41f81f35e6b41d70b0c1156dc7ee34719b543b3c Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Fri, 12 Apr 2024 00:25:52 +0300 Subject: [PATCH] Don't install rosdep using pip --- builder/image-ros.sh | 9 ++++----- builder/image-software.sh | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index 020ebd72..c9bcbe8b 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -70,6 +70,10 @@ my_travis_retry() { return $result } +echo_stamp "Install ROS" +my_travis_retry apt-get install -y ros-${ROS_DISTRO}-ros-base +export ROS_IP='127.0.0.1' # needed for running tests + # TODO: 'kinetic-rosdep-clover.yaml' should add only if we use our repo? echo_stamp "Init rosdep" my_travis_retry rosdep init @@ -80,11 +84,6 @@ my_travis_retry rosdep update echo_stamp "Populate rosdep for ROS user" my_travis_retry sudo -u pi ROS_OS_OVERRIDE=debian:$VERSION_CODENAME rosdep update -echo_stamp "Install ROS" -my_travis_retry apt-get install -y ros-${ROS_DISTRO}-ros-base - -export ROS_IP='127.0.0.1' # needed for running tests - # echo_stamp "Reconfiguring Clover repository for simplier unshallowing" cd /home/pi/catkin_ws/src/clover git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" diff --git a/builder/image-software.sh b/builder/image-software.sh index 46270f9e..073029a2 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -137,9 +137,6 @@ pip3 --version echo "Enable installing packages with pip" mv /usr/lib/python3.11/EXTERNALLY-MANAGED /usr/lib/python3.11/EXTERNALLY-MANAGED.old -echo_stamp "Install rosdep" -my_travis_retry pip3 install -U rosdep - echo_stamp "Install and enable Butterfly (web terminal)" # echo_stamp "Workaround for tornado >= 6.0 breaking butterfly" # export CRYPTOGRAPHY_DONT_BUILD_RUST=1