From f532372535213ce9f9a9e6de4051d8591c15deb1 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 19 Sep 2018 21:32:43 +0300 Subject: [PATCH] Attempt 4 to fix build, temporarily move Butterfly install to ros_install --- image_builder/scripts/ros_install.sh | 10 ++++++++++ image_builder/scripts/software_install.sh | 11 ++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/image_builder/scripts/ros_install.sh b/image_builder/scripts/ros_install.sh index ebeeb53ac..70383e120 100755 --- a/image_builder/scripts/ros_install.sh +++ b/image_builder/scripts/ros_install.sh @@ -165,4 +165,14 @@ apt-get clean # Remove local mirror repository key #apt-key del COEX-MIRROR +echo -e "\033[0;31m\033[1m$(date) | #14 Install Butterfly\033[0m\033[0m" +# install and enable Butterfly (web terminal) +# TODO: move it back to software_install +# Had to move it here, as we don't have `clever` directory in software_install +pip3 install butterfly +pip3 install butterfly[systemd] +ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.service /lib/systemd/system/ +ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.socket /lib/systemd/system/ +systemctl enable butterfly.socket + echo -e "\033[0;31m\033[1m$(date) | END of ROS INSTALLATION\033[0m\033[0m" diff --git a/image_builder/scripts/software_install.sh b/image_builder/scripts/software_install.sh index 86995ddbf..cb82a03b6 100755 --- a/image_builder/scripts/software_install.sh +++ b/image_builder/scripts/software_install.sh @@ -28,7 +28,8 @@ apt-get install --no-install-recommends -y \ libjpeg8-dev=8d1-2 \ tcpdump \ ltrace \ - libpoco-dev=1.7.6+dfsg1-5+deb9u1 + libpoco-dev=1.7.6+dfsg1-5+deb9u1 \ + libffi-dev # for butterfly # Deny byobu to check available updates sed -i "s/updates_available//" /usr/share/byobu/status/status @@ -46,14 +47,6 @@ rm build/conf/sites/default ln -s /home/pi/catkin_ws/src/clever/deploy/monkey ./build/conf/sites/default cd /home/pi -# install and enable Butterfly (web terminal) -apt-get install libffi-dev -pip3 install butterfly -pip3 install butterfly[systemd] -ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.service /lib/systemd/system/ -ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.socket /lib/systemd/system/ -systemctl enable butterfly.socket - echo -e "\033[0;31m\033[1m$(date) | #2 Adding mjpg-streamer at /home/pi\033[0m\033[0m" # https://github.com/jacksonliam/mjpg-streamer