From 439431aa628ae6839c2fcf2286a356c9ad467aa2 Mon Sep 17 00:00:00 2001 From: Zalathar Date: Fri, 17 Oct 2025 14:01:06 +1100 Subject: [PATCH] ci: Switch back to default coreutils (uutils) after libffi-sys bump --- src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile | 2 -- src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile | 2 -- src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile b/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile index e840113047e6d..04b46226acfa4 100644 --- a/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile +++ b/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile @@ -2,8 +2,6 @@ FROM ubuntu:25.10 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ - # FIXME(#147556): Use GNU coreutils to work around a libffi-sys build failure. - coreutils-from-gnu coreutils-from-uutils- --allow-remove-essential \ g++ \ make \ ninja-build \ diff --git a/src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile b/src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile index f5c0f6127a8d1..095624d6fb714 100644 --- a/src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile +++ b/src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile @@ -3,8 +3,6 @@ FROM ubuntu:25.10 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ - # FIXME(#147556): Use GNU coreutils to work around a libffi-sys build failure. - coreutils-from-gnu coreutils-from-uutils- --allow-remove-essential \ bzip2 \ g++ \ make \ diff --git a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile index a54ce19f97168..4b61fd94a6cfa 100644 --- a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile +++ b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile @@ -2,8 +2,6 @@ FROM ubuntu:25.10 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ - # FIXME(#147556): Use GNU coreutils to work around a libffi-sys build failure. - coreutils-from-gnu coreutils-from-uutils- --allow-remove-essential \ g++ \ make \ ninja-build \