From a1c47bfecd4dcb8d270af16ee5717d57bca4d3eb Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Mon, 17 Sep 2018 02:05:31 -0500 Subject: [PATCH 1/7] Add rpicam software --- builder/chroot-script.sh | 8 ++++++++ builder/files/etc/rpicam_config.txt | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 builder/files/etc/rpicam_config.txt diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index f9ac33b..2d7888b 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -209,6 +209,14 @@ echo "Installing rpi-serial-console script" wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console chmod +x usr/local/bin/rpi-serial-console +echo "Installing RPi Cam Web Interface" +wget -q https://github.com/silvanmelchior/RPi_Cam_Web_Interface/archive/master.zip -O /tmp/rpicam.zip +cd /tmp/ +unzip rpicam.zip +cd RPi_Cam_Web_Interface-master +cp /etc/rpicam_config.txt config.txt +./install.sh --q + # fix eth0 interface name ln -s /dev/null /etc/systemd/network/99-default.link diff --git a/builder/files/etc/rpicam_config.txt b/builder/files/etc/rpicam_config.txt new file mode 100644 index 0000000..325c3f4 --- /dev/null +++ b/builder/files/etc/rpicam_config.txt @@ -0,0 +1,8 @@ +rpicamdir="cam" +webserver="" +webport="80" +user="" +webpasswd="" +autostart="yes" +jpglink="no" +phpversion="7" From 3fb9ebb6175ba9ce1361898e7c10ff7a1620ca56 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Mon, 17 Sep 2018 02:18:12 -0500 Subject: [PATCH 2/7] Add unzip --- builder/chroot-script.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 2d7888b..e874c11 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -147,6 +147,7 @@ apt-get -o Dpkg::Options::=--force-confdef \ pi-bluetooth \ lsb-release \ gettext \ + unzip \ cloud-init From c0d54309090b86fab665f8aa4750bc262ca21909 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Tue, 18 Sep 2018 00:39:34 -0500 Subject: [PATCH 3/7] Fix parameter for RPicam installation --- builder/chroot-script.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index e874c11..a791a39 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -148,6 +148,7 @@ apt-get -o Dpkg::Options::=--force-confdef \ lsb-release \ gettext \ unzip \ + motion \ cloud-init @@ -216,7 +217,7 @@ cd /tmp/ unzip rpicam.zip cd RPi_Cam_Web_Interface-master cp /etc/rpicam_config.txt config.txt -./install.sh --q +bash ./install.sh q # fix eth0 interface name ln -s /dev/null /etc/systemd/network/99-default.link From 1d717aecf195cd36a9ec7038581fa4c168f1fbb7 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Tue, 18 Sep 2018 01:05:22 -0500 Subject: [PATCH 4/7] Add rc.local --- builder/files/etc/rc.local | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 builder/files/etc/rc.local diff --git a/builder/files/etc/rc.local b/builder/files/etc/rc.local new file mode 100755 index 0000000..65634df --- /dev/null +++ b/builder/files/etc/rc.local @@ -0,0 +1,14 @@ +#!/bin/sh -e +# +# rc.local +# +# This script is executed at the end of each multiuser runlevel. +# Make sure that the script will "exit 0" on success or any other +# value on error. +# +# In order to enable or disable this script just change the execution +# bits. +# +# By default this script does nothing. + +exit 0 From fdadde8e60f1ea2523b816d0ed7376bddaa8d8d9 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Thu, 20 Sep 2018 00:29:43 -0500 Subject: [PATCH 5/7] Added gpac (MP4Box) to fix video recording --- builder/chroot-script.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index a791a39..5180d25 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -149,6 +149,7 @@ apt-get -o Dpkg::Options::=--force-confdef \ gettext \ unzip \ motion \ + gpac \ cloud-init From 37eed3881794c2d8830be2d37845d8103ee255e3 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Thu, 20 Sep 2018 00:59:10 -0500 Subject: [PATCH 6/7] Add gstreamer and other deps --- builder/chroot-script.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 5180d25..eedabc0 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -147,7 +147,9 @@ apt-get -o Dpkg::Options::=--force-confdef \ pi-bluetooth \ lsb-release \ gettext \ - unzip \ + zip \ + libav-tools \ + gstreamer1.0-tools \ motion \ gpac \ cloud-init From 40e7265013768a60b4682cd67270c09508450b6d Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Thu, 20 Sep 2018 01:17:20 -0500 Subject: [PATCH 7/7] Fix deps and add basic HTML menu --- builder/chroot-script.sh | 1 + builder/files/var/www/index.html | 3 +++ 2 files changed, 4 insertions(+) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index eedabc0..fe77ab4 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -147,6 +147,7 @@ apt-get -o Dpkg::Options::=--force-confdef \ pi-bluetooth \ lsb-release \ gettext \ + unzip \ zip \ libav-tools \ gstreamer1.0-tools \ diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html index 88af205..a838a28 100644 --- a/builder/files/var/www/index.html +++ b/builder/files/var/www/index.html @@ -16,5 +16,8 @@

Public Lab Pi Kit

You've correctly connected to your Pi!

+

+ RPi Cam Web Interface +