Merge branch 'master' into dev

This commit is contained in:
Calin Crisan 2017-10-02 22:51:34 +03:00
commit 374e4d4c9d
8 changed files with 12 additions and 10 deletions

View File

@ -1,5 +0,0 @@
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y bc
script: ./build.sh raspberrypi all > /dev/null

View File

@ -1 +1,5 @@
Welcome to \n!
If you want to see a friendly user interface,
point your web browser to the IP address of this board.

View File

@ -1,5 +1,8 @@
#!/bin/bash
# create the persisted /var/lib directory (/data/varlib)
mkdir -p /data/varlib
# add password_hook motioneye setting
grep password_hook /data/etc/motioneye.conf &>/dev/null || echo -e 'password_hook /usr/libexec/meyepasswd' >> /data/etc/motioneye.conf

View File

@ -1,4 +1,4 @@
bcm2835-v4l2 max_video_width=2592 max_video_height=1944
bcm2835-v4l2 max_video_width=1920 max_video_height=1200
bcm2835-wdt
i2c-bcm2708
i2c-dev

View File

@ -1,4 +1,4 @@
bcm2835-v4l2 max_video_width=2592 max_video_height=1944
bcm2835-v4l2 max_video_width=1920 max_video_height=1200
bcm2835-wdt
i2c-bcm2708
i2c-dev

View File

@ -1,4 +1,4 @@
bcm2835-v4l2 max_video_width=2592 max_video_height=1944
bcm2835-v4l2 max_video_width=1920 max_video_height=1200
bcm2835-wdt
i2c-bcm2708
i2c-dev

View File

@ -13,7 +13,7 @@ cd $(dirname $0)
basedir=$(pwd)
osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name)
osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version)
gzip=$(which pigz || which gzip)
gzip=$(which pigz 2> /dev/null || which gzip 2> /dev/null)
if [ "$board" == "all" ]; then
boards=$(ls $basedir/configs/*_defconfig | grep -v initramfs | grep -oE '\w+_defconfig$' | cut -d '_' -f 1)

View File

@ -76,7 +76,7 @@ if ! [ -f $DISK_IMG ]; then
exit 1
fi
gunzip=$(which unpigz || which gunzip)
gunzip=$(which unpigz 2> /dev/null || which gunzip 2> /dev/null)
if [[ $DISK_IMG == *.gz ]]; then
msg "decompressing the gzipped image"