[PATCH 5/9] docker: Drop grub for arm64

[Heinrich Schuchardt]

Am 4. November 2024 14:39:49 MEZ schrieb Simon Glass <sjg at chromium.org>:
>This doesn't build on arm64 at present, so drop it for now. We only
>expect to run sandbox tests, so perhaps it isn't needed.
>
>Signed-off-by: Simon Glass <sjg at chromium.org>
>---
>
> tools/docker/Dockerfile | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
>index c4c3dc5a901..60106a82801 100644
>--- a/tools/docker/Dockerfile
>+++ b/tools/docker/Dockerfile
>@@ -134,7 +134,9 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
> RUN chmod +r /boot/vmlinu*
> 
> # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit
>-RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
>+# This fails on arm64
>+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
>+	git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
> 	cd /tmp/grub && \
> 	git checkout grub-2.06 && \

Upstream GRUB builds for arm64 and riscv64.

Please, retry with grub-2.12.

Best regards

Heinrich

> 	git config --global user.name "GitLab CI Runner" && \
>@@ -184,7 +186,8 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
> 	lsefisystab loadenv lvm minicmd normal part_msdos part_gpt reboot \
> 	search search_fs_file search_fs_uuid search_label serial sleep test \
> 	true && \
>-	rm -rf /tmp/grub
>+	rm -rf /tmp/grub; \
>+	fi
> 
> RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
> 	cd /tmp/qemu && \