diff --git a/image_builder/scripts/init_image.sh b/image_builder/scripts/init_image.sh index 8807b594..86d6e8cf 100755 --- a/image_builder/scripts/init_image.sh +++ b/image_builder/scripts/init_image.sh @@ -35,7 +35,8 @@ apt-get update \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116 echo "deb http://packages.ros.org/ros/ubuntu stretch main" > /etc/apt/sources.list.d/ros-latest.list -echo "deb http://repo.coex.space/rpi-ros-kinetic/ stretch main" > /etc/apt/sources.list.d/rpi-ros-kinetic.list +echo "deb http://repo.coex.space/rpi-ros-kinetic stretch main" > /etc/apt/sources.list.d/rpi-ros-kinetic.list +echo "deb http://repo.coex.space/clever stretch main" > /etc/apt/sources.list.d/clever.list echo_stamp "Update apt cache" diff --git a/image_builder/scripts/software_install.sh b/image_builder/scripts/software_install.sh index 0f0e6e18..29828630 100755 --- a/image_builder/scripts/software_install.sh +++ b/image_builder/scripts/software_install.sh @@ -51,6 +51,7 @@ apt-get install --no-install-recommends -y \ 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) @@ -62,13 +63,13 @@ apt-get install --no-install-recommends -y \ # && 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 +# 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 echo_stamp "Add .vimrc" cat << EOF > /home/pi/.vimrc