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

image_builder: use deb package for mjpg-streamer

Browse Source
This commit is contained in:
Artem Smirnov
2018-09-20 17:34:57 +05:00
parent 7e47914abe
commit 1ecc2774d7
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
image_builder/scripts/init_image.sh
View File

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

15
image_builder/scripts/software_install.sh
View File

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