From 8c9316398534b7869511cdbff18d78dc4e08ac63 Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Thu, 1 Nov 2018 15:19:18 -0400 Subject: [PATCH 01/10] Update chroot-script.sh --- builder/chroot-script.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index f9ac33b..c507aba 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -147,7 +147,8 @@ apt-get -o Dpkg::Options::=--force-confdef \ pi-bluetooth \ lsb-release \ gettext \ - cloud-init + cloud-init \ + git # install special Docker enabled kernel @@ -220,3 +221,13 @@ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* echo "HYPRIOT_DEVICE=\"$HYPRIOT_DEVICE\"" >> /etc/os-release echo "HYPRIOT_IMAGE_VERSION=\"$HYPRIOT_IMAGE_VERSION\"" >> /etc/os-release cp /etc/os-release /boot/os-release + +# install Witty Pi energy manager +echo "Installing Witty pi mini packages" +mkdir /home/wittypi +git clone https://github.com/uugear/Witty-Pi-2.git /home/wittypi +chmod +1 /home/wittypi/installWittyPi.sh +./home/wittypi/installWittyPi.sh +wget https://gitlab.com/imvec/anoiacam/blob/8dc8b9c798d2d6c79ec4267b90b8175fd84c7682/schedule.wpi /home/wittypi/wittyPi +rm -rf /home/wittypi/wittyPi/daemon.sh +wget https://gitlab.com/imvec/anoiacam/blob/11d387a98e0283f91e9ae7118a6456a4360caa7c/daemon.sh /home/wittypi/wittyPi From 9d6d8d3dd8652ef923fcaf3a5a00b99487cefab2 Mon Sep 17 00:00:00 2001 From: IMVEC Date: Thu, 1 Nov 2018 22:29:41 +0100 Subject: [PATCH 02/10] Update chroot-script.sh --- builder/chroot-script.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index f9ac33b..44fc9d2 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -220,3 +220,12 @@ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* echo "HYPRIOT_DEVICE=\"$HYPRIOT_DEVICE\"" >> /etc/os-release echo "HYPRIOT_IMAGE_VERSION=\"$HYPRIOT_IMAGE_VERSION\"" >> /etc/os-release cp /etc/os-release /boot/os-release + + echo "Installing Witty pi mini packages" +mkdir /home/wittypi +git clone https://github.com/uugear/Witty-Pi-2.git /home/wittypi +chmod +1 /home/wittypi/installWittyPi.sh +./home/wittypi/installWittyPi.sh +wget https://github.com/imvectech/miscelaneous/blob/master/schedule.wpi /home/wittypi/wittyPi +rm -rf /home/wittypi/wittyPi/daemon.sh +wget https://github.com/imvectech/miscelaneous/blob/master/daemon.sh /home/wittypi/wittyPi From 9faf75b9814c664c910416c455579c2159099a5f Mon Sep 17 00:00:00 2001 From: IMVEC Date: Fri, 2 Nov 2018 21:23:53 +0100 Subject: [PATCH 03/10] Update chroot-script.sh --- builder/chroot-script.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 44fc9d2..417b481 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -221,11 +221,23 @@ echo "HYPRIOT_DEVICE=\"$HYPRIOT_DEVICE\"" >> /etc/os-release echo "HYPRIOT_IMAGE_VERSION=\"$HYPRIOT_IMAGE_VERSION\"" >> /etc/os-release cp /etc/os-release /boot/os-release - echo "Installing Witty pi mini packages" +# Install Witty pi software + timelapse script and some pythin components + echo "Installing ANOIAcam ingredients" +yes | apt-get update +yes | apt-get install python-pip +yes | apt-get install python-picamera +yes | pip install DateTime +yes | apt-get install git +mkdir /home/imvec/ +mkdir /home/imvec/ANOIAcam +mkdir /home/imvec/ANOIAcam/scripts +mkdir /home/imvec/ANOIAcam/pictures +wget https://gitlab.com/imvec/anoiacam/blob/master/timelapse.py /home/imvec/ANOIAcam/scripts mkdir /home/wittypi -git clone https://github.com/uugear/Witty-Pi-2.git /home/wittypi +yes | git clone https://github.com/uugear/Witty-Pi-2.git /home/wittypi chmod +1 /home/wittypi/installWittyPi.sh -./home/wittypi/installWittyPi.sh -wget https://github.com/imvectech/miscelaneous/blob/master/schedule.wpi /home/wittypi/wittyPi +cd /home/wittypi +yes | ./installWittyPi.sh +wget https://gitlab.com/imvec/anoiacam/blob/master/schedule.wpi /home/wittypi/wittyPi rm -rf /home/wittypi/wittyPi/daemon.sh -wget https://github.com/imvectech/miscelaneous/blob/master/daemon.sh /home/wittypi/wittyPi +wget https://gitlab.com/imvec/anoiacam/blob/master/daemon.sh /home/wittypi/wittyPi From cf3183a1051ace85d926637a95ce751702a2f6a7 Mon Sep 17 00:00:00 2001 From: IMVEC Date: Sat, 3 Nov 2018 13:53:34 +0100 Subject: [PATCH 04/10] Update chroot-script.sh --- builder/chroot-script.sh | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 417b481..d8de3d9 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -221,23 +221,15 @@ echo "HYPRIOT_DEVICE=\"$HYPRIOT_DEVICE\"" >> /etc/os-release echo "HYPRIOT_IMAGE_VERSION=\"$HYPRIOT_IMAGE_VERSION\"" >> /etc/os-release cp /etc/os-release /boot/os-release -# Install Witty pi software + timelapse script and some pythin components - echo "Installing ANOIAcam ingredients" -yes | apt-get update -yes | apt-get install python-pip -yes | apt-get install python-picamera -yes | pip install DateTime -yes | apt-get install git -mkdir /home/imvec/ -mkdir /home/imvec/ANOIAcam -mkdir /home/imvec/ANOIAcam/scripts -mkdir /home/imvec/ANOIAcam/pictures -wget https://gitlab.com/imvec/anoiacam/blob/master/timelapse.py /home/imvec/ANOIAcam/scripts -mkdir /home/wittypi -yes | git clone https://github.com/uugear/Witty-Pi-2.git /home/wittypi -chmod +1 /home/wittypi/installWittyPi.sh -cd /home/wittypi -yes | ./installWittyPi.sh -wget https://gitlab.com/imvec/anoiacam/blob/master/schedule.wpi /home/wittypi/wittyPi +# install Witty pi energy manager software +echo "Installing Witty Pi 2 software" +apt-get update +mkdir /home/publiclab/wittypi +apt-get install git +git clone https://github.com/uugear/Witty-Pi-2.git /home/publiclab/wittypi +chmod +1 /home/publiclab/wittypi/installWittyPi.sh +cd /home/publiclab/wittypi +./installWittyPi.sh +wget https://github.com/imvectech/miscelaneous/blob/master/schedule.wpi /home/publiclab/wittypi/wittyPi rm -rf /home/wittypi/wittyPi/daemon.sh -wget https://gitlab.com/imvec/anoiacam/blob/master/daemon.sh /home/wittypi/wittyPi +wget https://github.com/imvectech/miscelaneous/blob/master/daemon.sh /home/publiclab/wittypi/wittyPi From 77526c9f44ae342595c0b17d5b2d1727fa21a607 Mon Sep 17 00:00:00 2001 From: IMVEC Date: Sat, 3 Nov 2018 13:55:19 +0100 Subject: [PATCH 05/10] Update chroot-script.sh --- builder/chroot-script.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index d8de3d9..4546af9 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -223,13 +223,13 @@ cp /etc/os-release /boot/os-release # install Witty pi energy manager software echo "Installing Witty Pi 2 software" -apt-get update +yes | apt-get update mkdir /home/publiclab/wittypi -apt-get install git -git clone https://github.com/uugear/Witty-Pi-2.git /home/publiclab/wittypi +yes | apt-get install git +yes | git clone https://github.com/uugear/Witty-Pi-2.git /home/publiclab/wittypi chmod +1 /home/publiclab/wittypi/installWittyPi.sh cd /home/publiclab/wittypi -./installWittyPi.sh +yes | ./installWittyPi.sh wget https://github.com/imvectech/miscelaneous/blob/master/schedule.wpi /home/publiclab/wittypi/wittyPi rm -rf /home/wittypi/wittyPi/daemon.sh wget https://github.com/imvectech/miscelaneous/blob/master/daemon.sh /home/publiclab/wittypi/wittyPi From 0f18831b120300a748078b40c442f6c4b0c797e4 Mon Sep 17 00:00:00 2001 From: IMVEC Date: Sat, 3 Nov 2018 18:28:18 +0100 Subject: [PATCH 06/10] Update chroot-script.sh --- builder/chroot-script.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 4546af9..f03a5f9 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -179,6 +179,11 @@ disable_camera_led=1 gpu_mem=128 " >> boot/config.txt +# enable i2C +echo " +dtparam=i2c1=on +" >> boot/config.txt + # /etc/modules echo "snd_bcm2835 " >> /etc/modules From e356961655bf40b3affd5f69c5af1e2ee3aa32ac Mon Sep 17 00:00:00 2001 From: IMVEC Date: Sun, 4 Nov 2018 11:19:43 +0100 Subject: [PATCH 07/10] Update chroot-script.sh --- builder/chroot-script.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index f03a5f9..bff9968 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -228,13 +228,6 @@ cp /etc/os-release /boot/os-release # install Witty pi energy manager software echo "Installing Witty Pi 2 software" -yes | apt-get update -mkdir /home/publiclab/wittypi -yes | apt-get install git -yes | git clone https://github.com/uugear/Witty-Pi-2.git /home/publiclab/wittypi -chmod +1 /home/publiclab/wittypi/installWittyPi.sh -cd /home/publiclab/wittypi -yes | ./installWittyPi.sh -wget https://github.com/imvectech/miscelaneous/blob/master/schedule.wpi /home/publiclab/wittypi/wittyPi -rm -rf /home/wittypi/wittyPi/daemon.sh -wget https://github.com/imvectech/miscelaneous/blob/master/daemon.sh /home/publiclab/wittypi/wittyPi +wget http://www.uugear.com/repo/WittyPi2/installWittyPi.sh +chmod +1 installWittyPi.sh +yes | sudo sh installWittyPi.sh From 00a3aaabf9cd391f1e7ded423dfe9d041a83f0d1 Mon Sep 17 00:00:00 2001 From: IMVEC Date: Mon, 5 Nov 2018 22:15:58 +0100 Subject: [PATCH 08/10] Previous installation of i2c-tools --- builder/chroot-script.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index bff9968..5a130ac 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -227,7 +227,11 @@ echo "HYPRIOT_IMAGE_VERSION=\"$HYPRIOT_IMAGE_VERSION\"" >> /etc/os-release cp /etc/os-release /boot/os-release # install Witty pi energy manager software +echo "Installing i2c-tools" +apt-get install i2c-tools +mkdir /home/imvec +cd /home/imvec echo "Installing Witty Pi 2 software" wget http://www.uugear.com/repo/WittyPi2/installWittyPi.sh -chmod +1 installWittyPi.sh -yes | sudo sh installWittyPi.sh +sh installWittyPi.sh +apt-get update From 940f1407c31171ae560857de57dbcf5d9424c89b Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Fri, 9 Nov 2018 15:43:36 -0500 Subject: [PATCH 09/10] Update chroot-script.sh --- builder/chroot-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 5a130ac..040fd1a 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -234,4 +234,4 @@ cd /home/imvec echo "Installing Witty Pi 2 software" wget http://www.uugear.com/repo/WittyPi2/installWittyPi.sh sh installWittyPi.sh -apt-get update +# apt-get update From 7dbed4efdcfed176a9faaae64e9e17e4d0949277 Mon Sep 17 00:00:00 2001 From: IMVEC Date: Sat, 17 Nov 2018 03:04:18 +0100 Subject: [PATCH 10/10] Update chroot-script.sh Install i2c-tools before clean apt-get cache and lists. Install Witty pi software usinf installWittyPi.sh script --- builder/chroot-script.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 040fd1a..e8034e8 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -217,6 +217,9 @@ chmod +x usr/local/bin/rpi-serial-console # fix eth0 interface name ln -s /dev/null /etc/systemd/network/99-default.link +# install I2C tools +apt-get install i2c-tools + # cleanup APT cache and lists apt-get clean rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -227,11 +230,8 @@ echo "HYPRIOT_IMAGE_VERSION=\"$HYPRIOT_IMAGE_VERSION\"" >> /etc/os-release cp /etc/os-release /boot/os-release # install Witty pi energy manager software -echo "Installing i2c-tools" -apt-get install i2c-tools -mkdir /home/imvec -cd /home/imvec -echo "Installing Witty Pi 2 software" +cd /home wget http://www.uugear.com/repo/WittyPi2/installWittyPi.sh -sh installWittyPi.sh +yes | sh installWittyPi.sh +rm -rf /home/installWittyPi.sh # apt-get update