mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 22:26:31 +00:00
Merge branch 'master' into dev
This commit is contained in:
commit
374e4d4c9d
@ -1,5 +0,0 @@
|
||||
before_install:
|
||||
- sudo apt-get -qq update
|
||||
- sudo apt-get install -y bc
|
||||
|
||||
script: ./build.sh raspberrypi all > /dev/null
|
@ -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.
|
||||
|
||||
|
3
board/common/overlay/usr/share/post-upgrade/20170827.sh
Normal file → Executable file
3
board/common/overlay/usr/share/post-upgrade/20170827.sh
Normal file → Executable 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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
2
build.sh
2
build.sh
@ -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)
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user