From cc167f71d308b2517e624104d0102b84506b7a09 Mon Sep 17 00:00:00 2001 From: jasonwitty Date: Sat, 22 Nov 2025 12:28:34 -0800 Subject: [PATCH] set correct x-compile lib gcc-aarch64-linux-gnu for arm64 builds. --- .github/workflows/build-deb.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml index 2fead4c..5af0779 100644 --- a/.github/workflows/build-deb.yml +++ b/.github/workflows/build-deb.yml @@ -46,25 +46,32 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install -y libdrm-dev libdrm-amdgpu1 + sudo apt-get install -y dpkg-dev - name: Install cross-compilation tools (ARM64) if: matrix.target == 'aarch64-unknown-linux-gnu' run: | + sudo dpkg --add-architecture arm64 sudo apt-get update - sudo apt-get install -y libdrm-dev libdrm-amdgpu1 gcc-aarch64-linux-gnu + sudo apt-get install -y gcc-aarch64-linux-gnu libdrm-dev:arm64 libdrm-amdgpu1:arm64 - name: Install cross-compilation tools (ARMhf) if: matrix.target == 'armv7-unknown-linux-gnueabihf' run: | sudo apt-get update - sudo apt-get install -y libdrm-dev libdrm-amdgpu1 gcc-arm-linux-gnueabihf + sudo apt-get install -y gcc-arm-linux-gnueabihf - name: Install cross-compilation tools (RISC-V) if: matrix.target == 'riscv64gc-unknown-linux-gnu' run: | sudo apt-get update - sudo apt-get install -y libdrm-dev libdrm-amdgpu1 gcc-riscv64-linux-gnu + sudo apt-get install -y gcc-riscv64-linux-gnu + + - name: Install GPU libraries (x86_64) + if: matrix.target == 'x86_64-unknown-linux-gnu' + run: | + sudo apt-get update + sudo apt-get install -y libdrm-dev libdrm-amdgpu1 - name: Configure cross-compilation (ARM64) if: matrix.target == 'aarch64-unknown-linux-gnu' @@ -116,12 +123,12 @@ jobs: cargo deb --package socktop --target ${{ matrix.target }} --no-strip - name: Build socktop_agent .deb package (with GPU support) - if: matrix.target != 'riscv64gc-unknown-linux-gnu' && matrix.target != 'armv7-unknown-linux-gnueabihf' + if: matrix.target == 'x86_64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu' run: | cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip - - name: Build socktop_agent .deb package (without GPU support for RISC-V and ARMv7) - if: matrix.target == 'riscv64gc-unknown-linux-gnu' || matrix.target == 'armv7-unknown-linux-gnueabihf' + - name: Build socktop_agent .deb package (without GPU support) + if: matrix.target == 'armv7-unknown-linux-gnueabihf' || matrix.target == 'riscv64gc-unknown-linux-gnu' run: | cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip --no-default-features