Skip to contentSkip to conversation

tests/docker/dockerfiles: Add libfdt to the i386 and to the riscv64 container

PATCH In review Thomas Huth 2 participants 2 messages Jan 24, 2023 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/docker/dockerfiles: Add libfdt to the i386 and to the riscv64 container

No need to recompile the dtc submodule here again and again, we can use the pre-built binary from the distribution instead.
(And this will also help in case we finally get rid of the dtc submodule in QEMU one day)

---
 tests/docker/dockerfiles/debian-riscv64-cross.docker | 1 +
 tests/docker/dockerfiles/fedora-i386-cross.docker    | 1 +
 2 files changed, 2 insertions(+)
tests/docker/dockerfiles/debian-riscv64-cross.docker +1 -0
index 9715791e0b..3daf93968a 100644
@@ -42,6 +42,7 @@ RUN apt update && \
     apt install -y --no-install-recommends \
          gcc-riscv64-linux-gnu \
          libc6-dev-riscv64-cross \
+         libfdt-dev:riscv64 \
          libffi-dev:riscv64 \
          libglib2.0-dev:riscv64 \
          libpixman-1-dev:riscv64
tests/docker/dockerfiles/fedora-i386-cross.docker +1 -0
index 7eec648d2d..f58b64dc3e 100644
@@ -9,6 +9,7 @@ ENV PACKAGES \
     findutils \
     gcc \
     git \
+    libfdt-devel.i686 \
     libffi-devel.i686 \
     libselinux-devel.i686 \
     libtasn1-devel.i686 \
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Thomas Huth

No need to recompile the dtc submodule here again and again, we can use the pre-built binary from the distribution instead.
(And this will also help in case we finally get rid of the dtc submodule in QEMU one day)

---
  tests/docker/dockerfiles/debian-riscv64-cross.docker | 1 +
  tests/docker/dockerfiles/fedora-i386-cross.docker    | 1 +
  2 files changed, 2 insertions(+)