try a different way

PhotonVision · Dec 24, 2024 · 7d47b2b · 7d47b2b
1 parent cba75bf
commit 7d47b2b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,6 +67,7 @@ jobs:
         commands: |
           chmod +x ${{matrix.script}}
           ${{ matrix.script }}
+          ./install_common.sh
           echo "${{ github.ref_name }};${{ matrix.name }}" > /opt/photonvision/image-version
 
     - name: Compress built image

diff --git a/install_common.sh b/install_common.sh
@@ -1,11 +1,8 @@
-#!/bin/bash
-
-# Run standard photon installer
-chmod +x ./install.sh
-./install.sh --install-nm=yes --arch=aarch64
+#!/bin/bash -v
 
 # Do additional tasks that are common across all images, 
 # but not suitable for inclusion in install.sh
+echo "Running install_common.sh"
 
 # Limit the maximum length of systemd-journald logs
 cat > /etc/systemd/journald.conf.d/60-limit-log-size.conf <<EOF

diff --git a/install_limelight.sh b/install_limelight.sh
@@ -1,6 +1,6 @@
 # Run normal photon installer
-chmod +x ./install_common.sh
-./install_common.sh
+chmod +x ./install.sh
+./install.sh --install-nm=yes --arch=aarch64
 
 # edit boot partition
 install -m 644 limelight/config.txt /boot/

diff --git a/install_opi5.sh b/install_opi5.sh
@@ -34,8 +34,8 @@ freed=$(( before - after ))
 echo "Freed up $freed KiB"
 
 # run Photonvision install script
-chmod +x ./install_common.sh
-./install_common.sh
+chmod +x ./install.sh
+./install.sh --install-nm=yes --arch=aarch64
 
 echo "Installing additional things"
 apt-get install --yes --quiet libc6 libstdc++6

diff --git a/install_pi.sh b/install_pi.sh
@@ -1,6 +1,6 @@
 # Run normal photon installer
-chmod +x ./install_common.sh
-./install_common.sh
+chmod +x ./install.sh
+./install.sh --install-nm=yes --arch=aarch64
 
 # and edit boot partition
 install -m 644 config.txt /boot/