From 36f3a55b220ad6b94f7bafa0f64f459e7b925644 Mon Sep 17 00:00:00 2001 From: Luke Mahowald Date: Thu, 1 Feb 2024 13:14:18 -0500 Subject: [PATCH] Move FPGA dependencies from VM to SD image --- .github/workflows/fpga-image.yml | 2 +- ci-tools/fpga-image/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fpga-image.yml b/.github/workflows/fpga-image.yml index 83bbea7501..83ae1c8c79 100644 --- a/.github/workflows/fpga-image.yml +++ b/.github/workflows/fpga-image.yml @@ -28,7 +28,7 @@ jobs: - name: Install pre-requisites run: | sudo apt-get update - sudo apt-get -y install debootstrap binfmt-support qemu-user-static u-boot-tools gcc-aarch64-linux-gnu gdb-multiarch openocd + sudo apt-get -y install debootstrap binfmt-support qemu-user-static u-boot-tools gcc-aarch64-linux-gnu rustup target add aarch64-unknown-linux-gnu - name: Build SD image diff --git a/ci-tools/fpga-image/build.sh b/ci-tools/fpga-image/build.sh index fe9b27889a..a6c2989222 100644 --- a/ci-tools/fpga-image/build.sh +++ b/ci-tools/fpga-image/build.sh @@ -23,7 +23,7 @@ fi if [[ -z "${SKIP_DEBOOTSTRAP}" ]]; then (rm -rf out/rootfs || true) mkdir -p out/rootfs - debootstrap --include git,curl,ca-certificates,locales,libicu72,sudo,vmtouch,fping,rdnssd,dbus,systemd-timesyncd --arch arm64 --foreign bookworm out/rootfs + debootstrap --include git,curl,ca-certificates,locales,libicu72,sudo,vmtouch,fping,rdnssd,dbus,systemd-timesyncd,libboost-regex1.74.0,openocd,gdb-multiarch --arch arm64 --foreign bookworm chroot out/rootfs /debootstrap/debootstrap --second-stage chroot out/rootfs useradd runner --shell /bin/bash --create-home