diff --git a/builder/assets/kinetic-rosdep-clever.yaml b/builder/assets/kinetic-rosdep-clever.yaml index 9a2e04aa..630e70b7 100644 --- a/builder/assets/kinetic-rosdep-clever.yaml +++ b/builder/assets/kinetic-rosdep-clever.yaml @@ -79,6 +79,9 @@ image_transport: libmavconn: debian: stretch: [ros-kinetic-libmavconn] +lxml: + debian: + stretch: [python-lxml=3.7.1-1] mavlink: debian: stretch: [ros-kinetic-mavlink] diff --git a/builder/image-ros.sh b/builder/image-ros.sh index ebd77a6f..9a587683 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -134,11 +134,10 @@ echo_stamp "Installing CLEVER" \ && git clone ${REPO} /home/pi/catkin_ws/src/clever \ && cd /home/pi/catkin_ws/src/clever \ && git checkout ${REF} \ -&& pip install wheel \ -&& pip install -r /home/pi/catkin_ws/src/clever/clever/requirements.txt \ && cd /home/pi/catkin_ws \ && resolve_rosdep $(pwd) \ -&& ls -l /opt/ros/kinetic \ +&& pip install wheel \ +&& pip install -r /home/pi/catkin_ws/src/clever/clever/requirements.txt \ && source /opt/ros/kinetic/setup.bash \ && catkin_make -j${NUMBER_THREADS} -DCMAKE_BUILD_TYPE=Release \ && ln -s /root/roscore.service /lib/systemd/system/roscore.service \ diff --git a/builder/image-software.sh b/builder/image-software.sh index b3c4b754..86e5e1b7 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -78,9 +78,6 @@ python-wstool=0.1.17-1 \ python-rosinstall=0.7.8-1 \ build-essential=12.3 \ mjpg-streamer=2.0 \ -python-dev \ -libxml2-dev=2.9.4+dfsg1-2.2+deb9u2 \ -libxslt1-dev=1.1.29-2.1 \ > /dev/null \ && echo_stamp "Everything was installed!" "SUCCESS" \ || (echo_stamp "Some packages wasn't installed!" "ERROR"; exit 1) diff --git a/clever/package.xml b/clever/package.xml index e9fc6414..c287f114 100644 --- a/clever/package.xml +++ b/clever/package.xml @@ -23,6 +23,7 @@ ros_cpp nodelet mavros + lxml rosbridge_server diff --git a/clever/requirements.txt b/clever/requirements.txt index e2002e24..579c0031 100644 --- a/clever/requirements.txt +++ b/clever/requirements.txt @@ -1,5 +1,3 @@ -future -lxml==4.2.5 flask==0.12.2 geopy==1.11.0 pymavlink==2.2.10