Merge branch 'pr/crschardt/120' into opi-gpio-line-names

Author: thatcomputerguy0101

.github/workflows/main.yml

@@ -98,6 +98,7 @@ jobs:
         minimum_free_mb: 2000
         image_url: ${{ matrix.base_image }}
         root_location: ${{ matrix.root_location || 'partition=2' }}
+        boot_partition:
         shrink_image: ${{ matrix.shrink_image || 'yes' }}
         commands: |
             set -e

install_dev_pi.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # silence log spam from dpkg
 cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF
 Dpkg::Progress-Fancy "0";
@@ -15,8 +20,8 @@ chmod +x ./install.sh
 ./install.sh --install-nm=yes --arch=aarch64
 
 # and edit boot partition
-install -m 644 config.txt /boot/
-install -m 644 userconf.txt /boot/
+install -m 644 config.txt /boot/firmware
+install -m 644 userconf.txt /boot/firmware
 
 # configure hostname
 echo "photonvision" > /etc/hostname
@@ -46,3 +51,5 @@ apt-get clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /boot/firmware

install_limelight.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # silence log spam from dpkg
 cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF
 Dpkg::Progress-Fancy "0";
@@ -15,11 +20,11 @@ chmod +x ./install.sh
 ./install.sh --install-nm=yes --arch=aarch64 --version="$1"
 
 # edit boot partition
-install -m 644 limelight/config.txt /boot/
-install -m 644 userconf.txt /boot/
+install -m 644 limelight/config.txt /boot/firmware/
+install -m 644 userconf.txt /boot/firmware/
 
 # install LL DTS
-dtc -O dtb limelight/gloworm-dt.dts -o /boot/dt-blob.bin
+dtc -O dtb limelight/gloworm-dt.dts -o /boot/firmware/dt-blob.bin
 
 # Kill wifi and other networking things
 install -v -m 644 -D -t /etc/systemd/system/dhcpcd.service.d/ files/wait.conf
@@ -45,3 +50,5 @@ apt-get clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /boot/firmware

install_limelight3.sh

@@ -7,5 +7,12 @@ set -ex +u
 chmod +x ./install_pi.sh
 ./install_pi.sh
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # Add the one extra file for the LL3
-wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/dt-blob.bin
+wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/firmware/dt-blob.bin
+
+umount /boot/firmware

install_limelight3g.sh

@@ -7,8 +7,15 @@ set -ex +u
 chmod +x ./install_pi.sh
 ./install_pi.sh
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # Install our new config.txt with OV9281 overlay
-install -m 644 limelight3g/config.txt /boot/
+install -m 644 limelight3g/config.txt /boot/firmware
 
 # Add the one extra file for the LL3
-wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/dt-blob.bin
+wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/firmware/dt-blob.bin
+
+umount /boot/firmware

install_limelight4.sh

@@ -7,5 +7,12 @@ set -ex +u
 chmod +x ./install_pi.sh
 ./install_pi.sh
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # Install our new config.txt with OV9281 overlay
-install -m 644 limelight4/config.txt /boot/
+install -m 644 limelight4/config.txt /boot/firmware
+
+umount /boot/firmware

install_luma_p1.sh

@@ -7,9 +7,16 @@ set -ex +u
 chmod +x ./install_pi.sh
 ./install_pi.sh
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # Install our new config.txt with OV9281 overlay
-install -m 644 luma_p1/config.txt /boot/
+install -m 644 luma_p1/config.txt /boot/firmware
 
 # Add the database file for the p1 hardware config and default pipeline
 mkdir -p /opt/photonvision/photonvision_config
 install -v -m 644 luma_p1/photon.sqlite /opt/photonvision/photonvision_config/photon.sqlite
+
+umount /boot/firmware

install_opi5.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /CIDATA
+mkdir --parent /CIDATA
+mount "${loopdev}p1" /CIDATA
+ls -la /CIDATA
+
 # Create pi/raspberry login
 if id "pi" >/dev/null 2>&1; then
     echo 'user found'
@@ -62,9 +67,9 @@ apt-get --yes -qq install libc6 libstdc++6
 rm -f /etc/netplan/00-default-nm-renderer.yaml
 
 # set NetworkManager as the renderer in cloud-init
-cp -f ./OPi5_CIDATA/network-config /boot/network-config
+cp -f ./OPi5_CIDATA/network-config /CIDATA/network-config
 # add customized user-data file for cloud-init
-cp -f ./OPi5_CIDATA/user-data /boot/user-data
+cp -f ./OPi5_CIDATA/user-data /CIDATA/user-data
 
 # configure GPIO line names
 dtc -@ -I dts -O dtb -o $(echo /usr/lib/firmware/*-rockchip)/device-tree/rockchip/overlay/rk3588-line-names.dtbo ./files/rk3588-line-names.dtso
@@ -101,3 +106,5 @@ apt-get --yes -qq clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /CIDATA

install_pi.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # silence log spam from dpkg
 cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF
 Dpkg::Progress-Fancy "0";
@@ -15,8 +20,8 @@ chmod +x ./install.sh
 ./install.sh -v "$1" --install-nm=yes --arch=aarch64 --version="$1"
 
 # and edit boot partition
-install -m 644 config.txt /boot/
-install -m 644 userconf.txt /boot/
+install -m 644 config.txt /boot/firmware
+install -m 644 userconf.txt /boot/firmware
 
 # configure hostname
 echo "photonvision" > /etc/hostname
@@ -46,3 +51,5 @@ apt-get clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /boot/firmware