image_builder: fix lxml

https://github.com/ArduPilot/pymavlink

builder/image-software.sh

@@ -34,48 +34,36 @@ echo_stamp() {
 
 echo_stamp "Software installing"
 apt-get install --no-install-recommends -y \
-  unzip=6.0-21 \
-  zip=3.0-11 \
-  ipython=5.1.0-3 \
-  ipython3=5.1.0-3 \
-  screen=4.5.0-6 \
-  byobu=5.112-1  \
-  nmap=7.40-1 \
-  lsof=4.89+dfsg-0.1 \
-  git=1:2.11.0-3+deb9u3 \
-  dnsmasq=2.76-5+rpt1+deb9u1  \
-  tmux=2.3-4 \
-  vim=2:8.0.0197-4+deb9u1 \
-  cmake=3.7.2-1 \
-  python-pip=9.0.1-2+rpt2 \
-  python3-pip=9.0.1-2+rpt2 \
-  libjpeg8-dev=8d1-2 \
-  tcpdump \
-  libpoco-dev=1.7.6+dfsg1-5+deb9u1 \
-  python-rosdep=0.12.2-1 \
-  python-rosinstall-generator=0.1.14-1 \
-  python-wstool=0.1.17-1 \
-  python-rosinstall=0.7.8-1 \
-  build-essential=12.3 \
-  mjpg-streamer=2.0
-  > /dev/null \
-  && echo_stamp "Everything was installed!" "SUCCESS" \
-  || (echo_stamp "Some packages wasn't installed!" "ERROR"; exit 1)
-
-# echo_stamp "Installation OpenCV"
-# apt-get install --no-install-recommends -y \
-#   ros-kinetic-opencv3=3.3.1-0stretch \
-#   > /dev/null \
-#   && echo_stamp "OpenCV3 was installed!" "SUCCESS" \
-#   || (echo_stamp "OpenCV3 wasn't installed!" "ERROR"; exit 1)
-
-# echo_stamp "Adding mjpg-streamer at /home/pi"
-# # https://github.com/jacksonliam/mjpg-streamer
-# git clone https://github.com/urpylka/mjpg-streamer.git /home/pi/mjpg-streamer \
-# && cd /home/pi/mjpg-streamer/mjpg-streamer-experimental \
-# && make > /dev/null \
-# && make install \
-# && chown -Rf pi:pi /home/pi/mjpg-streamer
+unzip=6.0-21 \
+zip=3.0-11 \
+ipython=5.1.0-3 \
+ipython3=5.1.0-3 \
+screen=4.5.0-6 \
+byobu=5.112-1  \
+nmap=7.40-1 \
+lsof=4.89+dfsg-0.1 \
+git=1:2.11.0-3+deb9u3 \
+dnsmasq=2.76-5+rpt1+deb9u1  \
+tmux=2.3-4 \
+vim=2:8.0.0197-4+deb9u1 \
+cmake=3.7.2-1 \
+python-pip=9.0.1-2+rpt2 \
+python3-pip=9.0.1-2+rpt2 \
+libjpeg8-dev=8d1-2 \
+tcpdump \
+libpoco-dev=1.7.6+dfsg1-5+deb9u1 \
+python-rosdep=0.12.2-1 \
+python-rosinstall-generator=0.1.14-1 \
+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)
 
 echo_stamp "Add .vimrc"
 cat << EOF > /home/pi/.vimrc

clever/requirements.txt

@@ -1,4 +1,5 @@
+future
+lxml==4.2.5
 flask==0.12.2
 geopy==1.11.0
-lxml==4.2.5
 pymavlink==2.2.10