From 9ccf80eebbd93dd46628237f10f87a1c0b1c344e Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 10 Jun 2017 20:42:02 +0300 Subject: [PATCH 01/15] bump version to 20170610 --- board/common/overlay/etc/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version index 1d666246ea..1aacab6879 100644 --- a/board/common/overlay/etc/version +++ b/board/common/overlay/etc/version @@ -1,4 +1,4 @@ os_name="motionEyeOS" os_short_name="motioneyeos" os_prefix="meye" -os_version="20170502" +os_version="20170610" From a69192e9045a39b6829972bd31291f8ec3b60006 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 11 Jun 2017 16:08:16 +0300 Subject: [PATCH 02/15] print a console message pointing the user to use a web browser --- board/common/overlay/etc/issue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/common/overlay/etc/issue b/board/common/overlay/etc/issue index b9d3c46ab7..90990df230 100644 --- a/board/common/overlay/etc/issue +++ b/board/common/overlay/etc/issue @@ -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. + From 684eecfbdd3fcc02cf4d015be7f2579024f71579 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 11 Jun 2017 21:20:01 +0300 Subject: [PATCH 03/15] Delete .travis.yml --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4f1b03503e..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,5 +0,0 @@ -before_install: - - sudo apt-get -qq update - - sudo apt-get install -y bc - -script: ./build.sh raspberrypi all > /dev/null From cad1a9c85e6ef1b1a9dffa59e487c3aef8a918c7 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 6 Jul 2017 21:41:32 +0300 Subject: [PATCH 04/15] update motioneye --- package/motioneye/motioneye.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk index 29fe62e585..4a6f16e80c 100644 --- a/package/motioneye/motioneye.mk +++ b/package/motioneye/motioneye.mk @@ -4,7 +4,7 @@ # ############################################################# -MOTIONEYE_VERSION = b88712683382db22efbebaa643f65d8f4b9ec704 +MOTIONEYE_VERSION = 488081061dee4f5692bfd3f62b39f7bb3db772b2 MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION)) MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz MOTIONEYE_LICENSE = GPLv3 From ad4e3d2bf4384756dc528f5b5af4f7e22d579a09 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 6 Jul 2017 21:43:26 +0300 Subject: [PATCH 05/15] bump version to 20170707 --- board/common/overlay/etc/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version index 1aacab6879..b6f2391fd5 100644 --- a/board/common/overlay/etc/version +++ b/board/common/overlay/etc/version @@ -1,4 +1,4 @@ os_name="motionEyeOS" os_short_name="motioneyeos" os_prefix="meye" -os_version="20170610" +os_version="20170707" From e246d41ba40dca3f1136b899cb7981b776bd1dc2 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 7 Jul 2017 23:29:41 +0300 Subject: [PATCH 06/15] /data/output is now created by datapart init script --- board/common/overlay/etc/init.d/S00datapart | 1 + 1 file changed, 1 insertion(+) diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart index d8da86778b..32fea9c8f2 100755 --- a/board/common/overlay/etc/init.d/S00datapart +++ b/board/common/overlay/etc/init.d/S00datapart @@ -46,6 +46,7 @@ case "$1" in mkdir /data/etc mkdir /data/log mkdir -m 775 /data/media + mkdir -m 775 /data/output cp /etc/version /data/etc/version ln -s /usr/share/zoneinfo/UTC /data/etc/localtime touch /data/etc/adjtime From 8d5ae8f839404b9b281aae321e32342b7b63aa2d Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 9 Jul 2017 19:43:42 +0300 Subject: [PATCH 07/15] bump version --- board/common/overlay/etc/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version index b6f2391fd5..9d0bf78530 100644 --- a/board/common/overlay/etc/version +++ b/board/common/overlay/etc/version @@ -1,4 +1,4 @@ os_name="motionEyeOS" os_short_name="motioneyeos" os_prefix="meye" -os_version="20170707" +os_version="20170710" From 5f2387e52baa1693004913afc5edd80e0438e91b Mon Sep 17 00:00:00 2001 From: Owen Walpole Date: Sat, 29 Jul 2017 23:21:01 -0500 Subject: [PATCH 08/15] silence which output --- build.sh | 2 ++ writeimage.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build.sh b/build.sh index dac91efc6d..68a516cb06 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,9 @@ 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) +exec &> /dev/null gzip=$(which pigz || which gzip) +exec 1>&1 2>&2 if [ "$board" == "all" ]; then boards=$(ls $basedir/configs/*_defconfig | grep -v initramfs | grep -oE '\w+_defconfig$' | cut -d '_' -f 1) diff --git a/writeimage.sh b/writeimage.sh index 99895df526..8abbd8b5b5 100755 --- a/writeimage.sh +++ b/writeimage.sh @@ -76,7 +76,9 @@ if ! [ -f $DISK_IMG ]; then exit 1 fi +exec &> /dev/null gunzip=$(which unpigz || which gunzip) +exec 1>&1 2>&2 if [[ $DISK_IMG == *.gz ]]; then msg "decompressing the gzipped image" From b4c343f1b592c177dfeaa00d8456b0becd140898 Mon Sep 17 00:00:00 2001 From: Owen Walpole Date: Sun, 30 Jul 2017 12:05:53 -0500 Subject: [PATCH 09/15] make redirection more readable --- build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 68a516cb06..039a06f983 100755 --- a/build.sh +++ b/build.sh @@ -13,9 +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) -exec &> /dev/null -gzip=$(which pigz || which gzip) -exec 1>&1 2>&2 +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) From 2ec01b758940f0fdee3a7cfc435e7cf5ffe35d12 Mon Sep 17 00:00:00 2001 From: Owen Walpole Date: Sun, 30 Jul 2017 12:06:57 -0500 Subject: [PATCH 10/15] make redirection more readable --- writeimage.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/writeimage.sh b/writeimage.sh index 8abbd8b5b5..2bc1793ca8 100755 --- a/writeimage.sh +++ b/writeimage.sh @@ -76,9 +76,7 @@ if ! [ -f $DISK_IMG ]; then exit 1 fi -exec &> /dev/null -gunzip=$(which unpigz || which gunzip) -exec 1>&1 2>&2 +gunzip=$(which unpigz 2> /dev/null || which gunzip 2> /dev/null) if [[ $DISK_IMG == *.gz ]]; then msg "decompressing the gzipped image" From 9838b6c0544d60a6e528c1b54fd257a16518cf66 Mon Sep 17 00:00:00 2001 From: Joo Aun Saw Date: Tue, 15 Aug 2017 13:40:12 +1000 Subject: [PATCH 11/15] reduce bcm2835-v4l2 video size to reclaim some RAM --- board/raspberrypi/overlay/etc/modules | 2 +- board/raspberrypi2/overlay/etc/modules | 2 +- board/raspberrypi3/overlay/etc/modules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/raspberrypi/overlay/etc/modules b/board/raspberrypi/overlay/etc/modules index 90ed5031ad..0353ca9abc 100644 --- a/board/raspberrypi/overlay/etc/modules +++ b/board/raspberrypi/overlay/etc/modules @@ -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 diff --git a/board/raspberrypi2/overlay/etc/modules b/board/raspberrypi2/overlay/etc/modules index 90ed5031ad..0353ca9abc 100644 --- a/board/raspberrypi2/overlay/etc/modules +++ b/board/raspberrypi2/overlay/etc/modules @@ -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 diff --git a/board/raspberrypi3/overlay/etc/modules b/board/raspberrypi3/overlay/etc/modules index 90ed5031ad..0353ca9abc 100644 --- a/board/raspberrypi3/overlay/etc/modules +++ b/board/raspberrypi3/overlay/etc/modules @@ -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 From b676e2ba9d5020795ac8f6c00d281ad9d032dfd7 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 27 Aug 2017 15:32:13 +0300 Subject: [PATCH 12/15] 20170827 post upgrade script: create /data/varlib directory --- board/common/overlay/usr/share/post-upgrade/20170827.sh | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 board/common/overlay/usr/share/post-upgrade/20170827.sh diff --git a/board/common/overlay/usr/share/post-upgrade/20170827.sh b/board/common/overlay/usr/share/post-upgrade/20170827.sh old mode 100644 new mode 100755 index fc28fd2c2a..df7cf827be --- a/board/common/overlay/usr/share/post-upgrade/20170827.sh +++ b/board/common/overlay/usr/share/post-upgrade/20170827.sh @@ -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 From 7f8dbd0abfa58824ba4c544ca52d62bb6b0d07d0 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 28 Aug 2017 21:34:18 +0300 Subject: [PATCH 13/15] Update passwd --- board/common/overlay/etc/passwd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/common/overlay/etc/passwd b/board/common/overlay/etc/passwd index afbaaa5a8b..70149c7bde 100644 --- a/board/common/overlay/etc/passwd +++ b/board/common/overlay/etc/passwd @@ -13,4 +13,4 @@ dbus:x:81:81:dbus:/var/run/dbus:/bin/sh ftp:x:83:83:ftp:/home/ftp:/bin/sh sshd:x:103:99:sshd:/var:/bin/sh nobody:x:99:99:nobody:/home:/bin/sh -admin:x:0:0::/home/ftp:/bin/sh +admin:x:0:0::/root:/bin/sh From d23b4f2543820e08228765cd09098ed786405dd9 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 6 Sep 2017 22:37:11 +0300 Subject: [PATCH 14/15] sync after changing admin password --- board/common/overlay/usr/sbin/adminpasswd | 1 + 1 file changed, 1 insertion(+) diff --git a/board/common/overlay/usr/sbin/adminpasswd b/board/common/overlay/usr/sbin/adminpasswd index bea2456ebd..4169299418 100755 --- a/board/common/overlay/usr/sbin/adminpasswd +++ b/board/common/overlay/usr/sbin/adminpasswd @@ -36,3 +36,4 @@ if [ -d /etc/adminpasswd.d ]; then done fi +sync From e8fec5980d439b5fe20d08f7d9f11922f41714af Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 8 Sep 2017 22:19:51 +0300 Subject: [PATCH 15/15] udev init script: always exit 0 when starting --- board/common/overlay/etc/init.d/S12udev | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/common/overlay/etc/init.d/S12udev b/board/common/overlay/etc/init.d/S12udev index 2c2bbdd61b..ce1c2af7f8 100755 --- a/board/common/overlay/etc/init.d/S12udev +++ b/board/common/overlay/etc/init.d/S12udev @@ -15,6 +15,8 @@ start() { /sbin/udevadm trigger --type=subsystems --action=add /sbin/udevadm trigger --type=devices --action=add /sbin/udevadm settle --timeout=30 + + return 0 } stop() {