From cba70d47ffeca348fec456df89904fb0c87381af Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Thu, 4 Jan 2024 07:57:45 -0700
Subject: [PATCH] Use photon-image-modifier for Pi images (#1081)

Upgrades to Debian 12 as the base for our Pi images and adds an orange pi 5 build.

This uses the latest stable libcamera, which has weird AWB bugs with the OV5647/pi camera v1.
---
 .github/workflows/build.yml | 10 ++++++++--
 scripts/generatePiImage.sh  |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 58d2356305..31179fd867 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -262,6 +262,7 @@ jobs:
     needs: [build-package]
 
     if: ${{ github.event_name != 'pull_request' }}
+
     strategy:
       fail-fast: false
       matrix:
@@ -269,11 +270,15 @@ jobs:
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: RaspberryPi
-            image_url: https://api.github.com/repos/photonvision/photon-pi-gen/releases/tags/v2023.1.3_arm64
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_raspi.img.xz
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: limelight2
-            image_url: https://api.github.com/repos/photonvision/photon-pi-gen/releases/tags/v2023.2.2_limelight-arm64
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_limelight.img.xz
+          - os: ubuntu-latest
+            artifact-name: LinuxArm64
+            image_suffix: orangepi5
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_opi5.img.xz
 
     runs-on: ${{ matrix.os }}
     name: "Build image - ${{ matrix.image_url }}"
@@ -286,6 +291,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: jar-${{ matrix.artifact-name }}
+      # TODO- replace with the arm-runner action and run this inside of the chroot. but this works for now.
       - name: Generate image
         run: |
           chmod +x scripts/generatePiImage.sh
diff --git a/scripts/generatePiImage.sh b/scripts/generatePiImage.sh
index 813b4bbd40..b068a2ea48 100755
--- a/scripts/generatePiImage.sh
+++ b/scripts/generatePiImage.sh
@@ -10,9 +10,9 @@ NEW_JAR=$(realpath $(find . -name photonvision\*-linuxarm64.jar))
 echo "Using jar: " $NEW_JAR
 echo "Downloading image from" $1
 sudo apt-get install -y xz-utils
-curl -sk $1 | grep "browser_download_url.*xz" | cut -d : -f 2,3 | tr -d '"' | wget -qi -
+wget -q $1
 ls
-FILE_NAME=$(ls | grep image_*.xz)
+FILE_NAME=$(ls | grep *.xz)
 
 if [ -z "$FILE_NAME" ]
 then