diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2a5d593..ddad7ae5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,53 +18,53 @@ jobs: fail-fast: false matrix: include: - - name: limelight - script: ./install_limelight.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: limelight3 - script: ./install_limelight3.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: limelight3g - script: ./install_limelight3g.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: limelight4 - script: ./install_limelight4.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: raspi - script: ./install_pi.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: limelight + # script: ./install_limelight.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: limelight3 + # script: ./install_limelight3.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: limelight3g + # script: ./install_limelight3g.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: limelight4 + # script: ./install_limelight4.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: raspi + # script: ./install_pi.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - name: raspi_dev script: ./install_dev_pi.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: snakeyes - script: ./install_snakeyes.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: luma_p1 - script: ./install_luma_p1.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2025-12-04/2025-12-04-raspios-trixie-arm64-lite.img.xz + # - name: snakeyes + # script: ./install_snakeyes.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: luma_p1 + # script: ./install_luma_p1.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - name: opi5 script: ./install_opi5.sh base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz - - name: opi5b - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz - - name: opi5plus - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-plus.img.xz - - name: opi5pro - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-pro.img.xz - - name: opi5max - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-max.img.xz - - name: rock5c - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz - - name: rubikpi3 - script: ./install_rubikpi3.sh - base_image: https://people.canonical.com/~platform/images/qualcomm-iot/rubikpi3/ubuntu-server-24.04/x01/ubuntu-24.04-preinstalled-server-arm64+rubikpi3-20250926-145.yaml - root_location: "offset=569376768" - shrink_image: "no" + # - name: opi5b + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz + # - name: opi5plus + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-plus.img.xz + # - name: opi5pro + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-pro.img.xz + # - name: opi5max + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-max.img.xz + # - name: rock5c + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz + # - name: rubikpi3 + # script: ./install_rubikpi3.sh + # base_image: https://people.canonical.com/~platform/images/qualcomm-iot/rubikpi3/ubuntu-server-24.04/x01/ubuntu-24.04-preinstalled-server-arm64+rubikpi3-20250926-145.yaml + # root_location: "offset=569376768" + # shrink_image: "no" name: "Build for ${{ matrix.name }}" @@ -100,6 +100,7 @@ jobs: root_location: ${{ matrix.root_location || 'partition=2' }} shrink_image: ${{ matrix.shrink_image || 'yes' }} commands: | + set -e echo "Running ${{ matrix.script }}" chmod +x "${{ matrix.script }}" "./${{ matrix.script }}" diff --git a/install.sh b/install.sh index f3b8cade..6b003d6b 100755 --- a/install.sh +++ b/install.sh @@ -252,20 +252,25 @@ debug "Updated package list." install_if_missing curl install_if_missing avahi-daemon -install_if_missing cpufrequtils +# install_if_missing cpufrequtils install_if_missing libatomic1 install_if_missing v4l-utils install_if_missing sqlite3 -install_if_missing openjdk-17-jre-headless -debug "Setting cpufrequtils to performance mode" -if [[ -z $TEST ]]; then - if [ -f /etc/default/cpufrequtils ]; then - sed -i -e 's/^#\?GOVERNOR=.*$/GOVERNOR=performance/' /etc/default/cpufrequtils - else - echo 'GOVERNOR=performance' > /etc/default/cpufrequtils - fi -fi +apt-cache search ^openjdk-* +ls -la /etc/apt/sources.list.d/ +tail -n999 /etc/apt/sources.list.d/* + +install_if_missing openjdk-25-jre-headless + +# debug "Setting cpufrequtils to performance mode" +# if [[ -z $TEST ]]; then +# if [ -f /etc/default/cpufrequtils ]; then +# sed -i -e 's/^#\?GOVERNOR=.*$/GOVERNOR=performance/' /etc/default/cpufrequtils +# else +# echo 'GOVERNOR=performance' > /etc/default/cpufrequtils +# fi +# fi if [[ "$INSTALL_NETWORK_MANAGER" == "yes" ]]; then debug "NetworkManager installation requested. Installing components..." diff --git a/install_dev_pi.sh b/install_dev_pi.sh index c38e8be5..3d5f79bb 100644 --- a/install_dev_pi.sh +++ b/install_dev_pi.sh @@ -34,7 +34,7 @@ sudo apt-get update apt-get install -y device-tree-compiler apt-get install -y network-manager net-tools # libcamera-driver stuff -apt-get install -y libegl1 libopengl0 libgl1-mesa-dri libgbm1 libegl1-mesa-dev libcamera-dev cmake build-essential libdrm-dev libgbm-dev default-jdk openjdk-17-jdk +apt-get install -y libegl1 libopengl0 libgl1-mesa-dri libgbm1 libegl1-mesa-dev libcamera-dev cmake build-essential libdrm-dev libgbm-dev default-jdk openjdk-25-jdk # Remove extra packages too # echo "Purging extra things" diff --git a/install_rubikpi3.sh b/install_rubikpi3.sh index d4dcf8dc..6115d2f0 100644 --- a/install_rubikpi3.sh +++ b/install_rubikpi3.sh @@ -24,11 +24,22 @@ chmod 0440 /etc/sudoers.d/010_pi-nopasswd echo "pi:raspberry" | chpasswd # silence log spam from dpkg -cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF +cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF_DPKG Dpkg::Progress-Fancy "0"; APT::Color "0"; Dpkg::Use-Pty "0"; -EOF +EOF_DPKG + +# Make sure all the sources are available for apt +cat > /etc/apt/sources.list.d/ubuntu.sources << EOF_UBUNTU_SOURCES +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports +Suites: noble noble-updates noble-backports +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +EOF_UBUNTU_SOURCES + +apt-get -q update # This needs to run before install.sh to fix some weird dependency issues apt-get -y --allow-downgrades install libsqlite3-0=3.45.1-1ubuntu2