From bd19527c755963de9c1d231fdacd112e54f33480 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 19 Nov 2025 08:32:58 -0600 Subject: Docker: Update QEMU to 10.0.6 The QEMU project has the 10.0.x series as an LTS release. While we are not doing an LTS ourselves, we can be confident in the changes between 10.0.2 and 10.0.6, so update ourselves. Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 58f2a28daa0..92be7f76341 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -220,7 +220,7 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ - git checkout v10.0.2 && \ + git checkout v10.0.6 && \ # config user.name and user.email to make 'git am' happy git config user.name u-boot && \ git config user.email u-boot@denx.de && \ -- cgit v1.2.3 From bc4a1e56bfcdd70a5307c91c94dafcf6bb27da93 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 13 Nov 2025 16:09:56 -0600 Subject: Dockerfile: Include python3-tk for FATtools In some cases our tests for exFAT don't run because we fail to be able to create the underlying image. This is in turn because while creation of the image succeeds, it seems that some way of how we invoke FATtools wants to import tkinter, that fails and so the test stops there. Having tkinter available (and then presumably a fallback to non-GUI because it's not available) leads to the tests running as expected. Reviewed-by: Marek Vasut Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 92be7f76341..f98b42e7357 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -126,6 +126,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ python3-pip \ python3-pyelftools \ python3-sphinx \ + python3-tk \ python3-tomli \ python3-venv \ rpm2cpio \ -- cgit v1.2.3 From 4dfa4c14b8e5b37885f9eb281b3bc230938c5972 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 26 Nov 2025 10:21:54 -0600 Subject: Dockerfile: Update building trace tools slightly We have not been picking a tag for the trace-cmd build process. Currently the tip of libtraceevent fails to build. Address both problems here by picking recent stable tags for libtraceevent and libtracefs (trace-cmd has no recent tags). Further, as it is often reported that this fails to build due to a race, stop using "make -j$(nproc)" as this is also small enough of a set of builds to not be an issue. Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index f98b42e7357..960e4a7177f 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -311,17 +311,19 @@ RUN git clone https://github.com/stefanberger/swtpm /tmp/swtpm && \ # Build trace-cmd RUN mkdir /tmp/trace && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent && \ + git clone --depth=1 https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent \ + -b libtraceevent-1.8.6 && \ cd /tmp/trace/libtraceevent && \ - make -j$(nproc) && \ + make && \ sudo make install && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs && \ + git clone --depth=1 https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs \ + -b libtracefs-1.8.2 && \ cd /tmp/trace/libtracefs && \ - make -j$(nproc) && \ + make && \ sudo make install && \ git clone https://github.com/rostedt/trace-cmd.git /tmp/trace/trace-cmd && \ cd /tmp/trace/trace-cmd && \ - make -j$(nproc) && \ + make && \ sudo make install && \ rm -rf /tmp/trace -- cgit v1.2.3 From 0ae3dc6809ffb6568b5e46d9022829e36d473d36 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 26 Nov 2025 10:30:24 -0600 Subject: CI: Update to latest container - Move to jammy-20251013 tag - Bring in tkinter so that FATtools should run and more tests should be run. - Update to QEMU 10.0.6 - Pick tags for (most of) trace-cmd Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 960e4a7177f..8ab1cff5584 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:jammy-20251001 +FROM ubuntu:jammy-20251013 LABEL org.opencontainers.image.authors="Tom Rini " LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container" -- cgit v1.2.3