From patchwork Thu Feb 19 19:21:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1901 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528928; bh=QG5rNJzuw4dxrbgWGkEe3N4wfW8VXH1irg+7BuW4pyg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=o/TzM0KM6Y1CP+D/NOQXZB2VqcPKc/wHrdiqk4YVkPH0gGJ4+cAvDqPlbY+k/jDma VXulOXSwyLYGd8cZ12WoBz07TCar56InecPTq/OFehkvBfFsZEFB5MKb/hMGGVj21m RQASRSvnyzDF4t4kGcAbqgPEtxyWCgfQgpqyGqVE08QVyW1y9+6rmtklvIkvDIIxUP Ym0WI8zW9JWKpghRWAXOj7dbuFwmL5qYkm/vhenl7e376FCH2Ya4BlCf2GLNQFPOmV hcdFOJjlh/SGBrz9M3Fu3DQfS8MFrP91la9tg1G6pUQc47jdd746vr6HZGVyJR5RS/ /bsEEb1NDvBBw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 576F969C01 for ; Thu, 19 Feb 2026 12:22:08 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ti7UcjtPjuyz for ; Thu, 19 Feb 2026 12:22:08 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528928; bh=QG5rNJzuw4dxrbgWGkEe3N4wfW8VXH1irg+7BuW4pyg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=o/TzM0KM6Y1CP+D/NOQXZB2VqcPKc/wHrdiqk4YVkPH0gGJ4+cAvDqPlbY+k/jDma VXulOXSwyLYGd8cZ12WoBz07TCar56InecPTq/OFehkvBfFsZEFB5MKb/hMGGVj21m RQASRSvnyzDF4t4kGcAbqgPEtxyWCgfQgpqyGqVE08QVyW1y9+6rmtklvIkvDIIxUP Ym0WI8zW9JWKpghRWAXOj7dbuFwmL5qYkm/vhenl7e376FCH2Ya4BlCf2GLNQFPOmV hcdFOJjlh/SGBrz9M3Fu3DQfS8MFrP91la9tg1G6pUQc47jdd746vr6HZGVyJR5RS/ /bsEEb1NDvBBw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3780669C73 for ; Thu, 19 Feb 2026 12:22:08 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528926; bh=YRuE6qYdLwYSmM2ujBHKodxpDIprmJNWZCYHYvkkkME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O9zbsxTPgu7GpUiRfE2q8WcRN4cX7gQgbuLZoKdaCksazIjpjgy08S2KG7YDxAUbG jXgKKd+p/CR9FMh+cF/L0gd1IIE/t9Mk5UdivROOBcYA7YkT0DTqSlFM7IsYiK+SXy T0KWTBb8sZzx2BSMeEzDPd8Cp8397iGlfedFHUSIrNorzzqFTNxDYRiqfT7ewYXgbx a25//iqaahKBAg1vLldZAE6hVWowwXGJVosvPtUDY5ZUT/oZoXryAiDQwZIydRnsAh Q+C8bET+QpnW3e5qmLPiR1cB22fI9FtpY3RYOwHclbN2W6iDyfIo3r55j/bR/TGBp7 Nw5p6P7v3au+Q== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 36F3569C73; Thu, 19 Feb 2026 12:22:06 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id ESTVelgndR1l; Thu, 19 Feb 2026 12:22:06 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528921; bh=MorRJJ5IRCNCr2DaOeXpv5sCAFJBQ4BizsxsyTQzt1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jJbbe8vwRkf3LoFPql6Pg7S/SZUHe6ViKUYhjLbQWu81YWY/RtFmlmtbQdte92r/n g0TpVrQS/6i9nCeGy73iJgXwMtgFTFLfcZSKNmnxZdM6tJZVoPYyodeQcwHR/2dnxk slQzhGM5zOVCyDO0FNw3nkrLC32QYAN/jAXLOObhyNhzkBFzupBbl2lfRF8yIUIItx puZ30qJ7WneSNU/bj9Knl0WKHKe5XC9A1sf4JNKBSHeDFOha8Ln6VZiXJu0SSoIbej s5edG0IWCUa43j1K1QOnLXH2NyN0xWB5pRlYKJLYanw9zpjj0Vk5K9xDs68okUEYoC 1culzKPjKtPTg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 9FA9C69C01; Thu, 19 Feb 2026 12:22:01 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 19 Feb 2026 12:21:25 -0700 Message-ID: <20260219192130.737116-5-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260219192130.737116-1-sjg@u-boot.org> References: <20260219192130.737116-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: SU5BCEZITJCX46WEEN4YDKNB2DHHU7RP X-Message-ID-Hash: SU5BCEZITJCX46WEEN4YDKNB2DHHU7RP X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 6" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 4/5] docker: Update Dockerfile for build compatibility List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Pin trace-cmd dependencies to avoid libtraceevent 1.9+ which requires BTF kernel headers newer than Jammy's 5.15: - libtraceevent: b3f5849 (pre-BTF) - libtracefs: 1.8.1 - trace-cmd: 364faec Install libtraceevent/libtracefs with prefix=/usr and ldconfig for cross-platform library path compatibility (arm64 vs amd64). Update coreboot from 24.08 to 24.12 since Intel took down the ACPICA download used by 24.08. Make a few other changes to bring us in line with upstream commit d75998b476de ("Docker, CI: Add vexpress_fvp / vexpress_fvp_bloblist support") Update .gitlab-ci.yml to use the new image tag. Co-developed-by: Claude Opus 4.6 Signed-off-by: Simon Glass --- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b6ca99a8ba..648c3f52c44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ default: - ${DEFAULT_TAG} # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile - image: ${MIRROR_DOCKER}/sjg20/u-boot-gitlab-ci-runner:jammy-20250404-24Oct2025p1 + image: ${MIRROR_DOCKER}/sjg20/u-boot-gitlab-ci-runner:jammy-20250404-19feb26 services: - name: container-$(CI_JOB_ID) command: ["--rm"] diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 71932e5433c..90ad3708101 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -64,6 +64,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ binutils-dev \ bison \ build-essential \ + byacc \ cgpt \ clang-18 \ coreutils \ @@ -74,8 +75,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ e2fsprogs \ efitools \ erofs-utils \ + exfatprogs \ expect \ fakeroot \ + fdisk \ flex \ gawk \ gdisk \ @@ -281,24 +284,30 @@ RUN git clone https://github.com/stefanberger/swtpm /tmp/swtpm && \ rm -rf /tmp/swtpm # Build trace-cmd +# Pin to commits from Oct 2025 to avoid libtraceevent 1.9+ BTF dependency +# which requires kernel headers newer than Jammy's 5.15 RUN mkdir /tmp/trace && \ git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent && \ cd /tmp/trace/libtraceevent && \ + git checkout b3f5849 && \ make -j$(nproc) && \ - sudo make install && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs && \ + sudo make install prefix=/usr && \ + sudo ldconfig && \ + git clone --branch libtracefs-1.8.1 --depth 1 https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs && \ cd /tmp/trace/libtracefs && \ make -j$(nproc) && \ - sudo make install && \ + sudo make install prefix=/usr && \ + sudo ldconfig && \ git clone https://github.com/rostedt/trace-cmd.git /tmp/trace/trace-cmd && \ cd /tmp/trace/trace-cmd && \ + git checkout 364faec && \ make -j$(nproc) && \ sudo make install && \ rm -rf /tmp/trace # Build coreboot -RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp -xJ && \ - cd /tmp/coreboot-24.08 && \ +RUN wget -O - https://coreboot.org/releases/coreboot-24.12.tar.xz | tar -C /tmp -xJ && \ + cd /tmp/coreboot-24.12 && \ make crossgcc-i386 CPUS=$(nproc) && \ make -C payloads/coreinfo olddefconfig && \ make -C payloads/coreinfo && \ @@ -308,7 +317,8 @@ RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp make olddefconfig && \ make -j $(nproc) && \ sudo mkdir /opt/coreboot && \ - sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ + sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ && \ + rm -rf /tmp/coreboot-24.08 # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot @@ -330,6 +340,7 @@ ENV PATH="/home/uboot/.cargo/bin:${PATH}" # COPY / ADD directives don't work as we need them to. RUN wget -O /tmp/pytest-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/test/py/requirements.txt RUN wget -O /tmp/sphinx-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/doc/sphinx/requirements.txt +RUN wget -O /tmp/binman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/binman/requirements.txt RUN wget -O /tmp/buildman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/buildman/requirements.txt RUN wget -O /tmp/patman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/patman/requirements.txt RUN wget -O /tmp/u_boot_pylib-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/u_boot_pylib/requirements.txt @@ -337,6 +348,7 @@ RUN python3 -m venv /tmp/venv && \ . /tmp/venv/bin/activate && \ pip install -r /tmp/pytest-requirements.txt \ -r /tmp/sphinx-requirements.txt \ + -r /tmp/binman-requirements.txt \ -r /tmp/buildman-requirements.txt \ -r /tmp/patman-requirements.txt \ -r /tmp/u_boot_pylib-requirements.txt && \