CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-26 11:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't install rosdep using pip

Browse Source
This commit is contained in:
Oleg Kalachev
2024-04-12 00:25:52 +03:00
parent e7ae321b54
commit 41f81f35e6
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builder/image-ros.sh
View File

@@ -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/*"

3
builder/image-software.sh
View File

@@ -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