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

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

Posted by Thomas Huth 1 year, 2 months ago

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)

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/docker/dockerfiles/debian-riscv64-cross.docker | 1 +
 tests/docker/dockerfiles/fedora-i386-cross.docker    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index 9715791e0b..3daf93968a 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -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
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 7eec648d2d..f58b64dc3e 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -9,6 +9,7 @@ ENV PACKAGES \
     findutils \
     gcc \
     git \
+    libfdt-devel.i686 \
     libffi-devel.i686 \
     libselinux-devel.i686 \
     libtasn1-devel.i686 \
-- 
2.31.1

Re: [PATCH] tests/docker/dockerfiles: Add libfdt to the i386 and to the riscv64 container

Posted by Philippe Mathieu-Daudé 1 year, 2 months ago

On 24/1/23 15:38, Thomas Huth wrote:
> 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)
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/docker/dockerfiles/debian-riscv64-cross.docker | 1 +
>   tests/docker/dockerfiles/fedora-i386-cross.docker    | 1 +
>   2 files changed, 2 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>