rudefox/burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't install openCV on drideOSZ

Browse Source
This commit is contained in:
Yossi 2017-06-14 13:42:24 +03:00
parent 4df2c00cee
commit bc3721a7bb
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -130,6 +130,8 @@ fi
export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"} export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"}
export OS_TYPE=$1
export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export SCRIPT_DIR="${BASE_DIR}/scripts" export SCRIPT_DIR="${BASE_DIR}/scripts"
export WORK_DIR=${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"} export WORK_DIR=${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}

12
stage2/01-sys-tweaks/01-run.sh
View File

@ -46,7 +46,7 @@ on_chroot << EOF
#------------------------------------------------------- #-------------------------------------------------------
# Script to check if all is good before install script runs # Script to check if all is good before install script runs
#------------------------------------------------------- #-------------------------------------------------------
echo OS_TYPE
echo "====== Dride install script ======" echo "====== Dride install script ======"
echo "" echo ""
echo "" echo ""
@ -90,8 +90,8 @@ echo "========== Installing build-essential ============"
sudo apt-get install build-essential -y sudo apt-get install build-essential -y
echo "========== Installing libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libjasper-dev python2.7-dev ============" echo "========== Installing libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libjasper-dev python2.7-dev gpac ============"
sudo apt-get install cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libjasper-dev python2.7-dev -y sudo apt-get install cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libjasper-dev python2.7-dev gpac -y
# Install Node # Install Node
@ -117,7 +117,7 @@ sudo pip install "picamera[array]==1.12"
echo "" >> /boot/config.txt echo "" >> /boot/config.txt
echo "#enable piCaera" >> /boot/config.txt echo "#enable piCaera" >> /boot/config.txt
echo "start_x=1" >> /boot/config.txt echo "start_x=1" >> /boot/config.txt
echo "gpu_mem=256" >> /boot/config.txt echo "gpu_mem=128" >> /boot/config.txt
@ -248,7 +248,7 @@ sudo systemctl disable gpsd.socket
if [ OS_TYPE == "drideOS" ]; then
echo "========== Downloading and installing OpenCV ============" echo "========== Downloading and installing OpenCV ============"
cd / cd /
# git clone https://github.com/Itseez/opencv.git --depth 1 # git clone https://github.com/Itseez/opencv.git --depth 1
@ -273,7 +273,7 @@ cd /
sudo rm opencv-3.1.0.zip sudo rm opencv-3.1.0.zip
# TODO: Add a test if openCV was installed correctly # TODO: Add a test if openCV was installed correctly
fi
echo "========== Setup sound to I2S ============" echo "========== Setup sound to I2S ============"
sudo curl -sS https://dride.io/code/i2samp.sh | bash sudo curl -sS https://dride.io/code/i2samp.sh | bash