Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: publiclab/pi-builder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8e0cb8dd9aec514d0cfe155e159e9f6db299fb6b
Choose a base ref
..
head repository: publiclab/pi-builder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c2a2d14e70db3e380b22059366a5bef399448f0
Choose a head ref
Showing with 3 additions and 68 deletions.
  1. +1 −1 builder/build.sh
  2. +0 −39 builder/chroot-script.sh
  3. +0 −14 builder/files/etc/rc.local
  4. +0 −8 builder/files/etc/rpicam_config.txt
  5. +0 −4 builder/files/var/www/index.html
  6. +2 −2 versions.config
2 changes: 1 addition & 1 deletion builder/build.sh
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ ls -alh /image_with_kernel_*.tar.gz

# download the ready-made raw image for the RPi
if [ ! -f "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" ]; then
wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://jenkins.laboratoriopublico.org/job/image-builder-raw/ws/${RAW_IMAGE}.zip"
wget -q -O "${BUILD_RESULT_PATH}/${RAW_IMAGE}.zip" "https://github.com/hypriot/image-builder-raw/releases/download/${RAW_IMAGE_VERSION}/${RAW_IMAGE}.zip"
fi

# verify checksum of the ready-made raw image
39 changes: 0 additions & 39 deletions builder/chroot-script.sh
Original file line number Diff line number Diff line change
@@ -147,12 +147,6 @@ apt-get -o Dpkg::Options::=--force-confdef \
pi-bluetooth \
lsb-release \
gettext \
unzip \
zip \
libav-tools \
gstreamer1.0-tools \
motion \
gpac \
cloud-init


@@ -211,43 +205,10 @@ lighttpd-enable-mod fastcgi-php
systemctl disable dhcpcd
systemctl disable hciuart

echo "Installing infragram"

# install npm/node:
curl -o node-v9.7.1-linux-armv6l.tar.gz https://nodejs.org/dist/v9.7.1/node-v9.7.1-linux-armv6l.tar.gz
tar -xzf node-v9.7.1-linux-armv6l.tar.gz
sudo cp -r node-v9.7.1-linux-armv6l/* /usr/local/
sudo apt-get install git

cd /var/www/

# install infragram in the web public folder:
echo "Installing infragram"
git clone https://github.com/publiclab/infragram.git
cd infragram
npm install
cd /var/www/

echo "Installing image-sequencer"
# install image-sequencer in the web public folder:
git clone https://github.com/publiclab/image-sequencer.git
cd image-sequencer
npm install

cd /

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
bash ./install.sh q

# fix eth0 interface name
ln -s /dev/null /etc/systemd/network/99-default.link

14 changes: 0 additions & 14 deletions builder/files/etc/rc.local

This file was deleted.

8 changes: 0 additions & 8 deletions builder/files/etc/rpicam_config.txt

This file was deleted.

4 changes: 0 additions & 4 deletions builder/files/var/www/index.html
Original file line number Diff line number Diff line change
@@ -26,9 +26,5 @@ <h2>Public Lab Pi Camera Kit</h2>
<p>If you're seeing this in a pop-up, close it and open <a href="http://pi.local">http://pi.local</a> in a browser.</p>
<p>On Android devices, you may have to turn off cellular data to use this in a browser.</p>

<p><a class="btn" href="http://pi.local/infragram/pi/">Access Infragram software</a></p>
<p><a class="btn" href="http://pi.local/cam/">Access the camera</a></p>
<p><a class="btn" href="http://pi.local/image-sequencer/examples/">Access Image Sequencer software</a></p>

</body>
</html>
4 changes: 2 additions & 2 deletions versions.config
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ ROOTFS_TAR_CHECKSUM="d1e7e6d48a25b4a206c5df99ecb8815388ec6945e4f97e78413d5a80778

# name of the ready made raw image for RPi
RAW_IMAGE="rpi-raw.img"
RAW_IMAGE_VERSION="master"
RAW_IMAGE_CHECKSUM="e32c0b9f3cdb9c60bad97a724103fc1283cdc135848e6142d588cd96fac1d6a8"
RAW_IMAGE_VERSION="v0.2.2"
RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6"

# specific versions of kernel/firmware and docker tools
export KERNEL_BUILD="20180422-141901"