[PATCH 4/9] docker: Adjust packages for arm64

[Heinrich Schuchardt]

Am 4. November 2024 14:39:48 MEZ schrieb Simon Glass <sjg at chromium.org>:
>The package names are slightly different for arm64 and we don't seem to
>have a linux-image-kvm package. Provide a different set for arm64
>
>Signed-off-by: Simon Glass <sjg at chromium.org>
>---
>
> tools/docker/Dockerfile | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
>index c9d794082c8..c4c3dc5a901 100644
>--- a/tools/docker/Dockerfile
>+++ b/tools/docker/Dockerfile
>@@ -39,7 +39,12 @@ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_
> RUN wget -O - https://github.com/foss-xtensa/toolchain/releases/download/2020.07/x86_64-2020.07-xtensa-dc233c-elf.tar.gz | tar -C /opt -xz
> 
> # Update and install things from apt now
>-RUN apt-get update && apt-get install -y \
>+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \

Please, use 'arm64' and not 'linux/arm64' as variable value.

>+		EXTRA_PACKAGES="grub-efi-arm64-bin linux-image-generic"; \

Replace, arm64 by the variable, which may take the value 'riscv64'.

>+	else \

This 'else' does not work for riscv64.

The exception is amd64 and not arm64. Only amd64 has two GRUB versions.

Best regards

Heinrich

>+		EXTRA_PACKAGES="grub-efi-amd64-bin grub-efi-ia32-bin libc6-i386 linux-image-kvm"; \
>+	fi; \
>+	apt-get update && apt-get install -y \
> 	automake \
> 	autopoint \
> 	bc \
>@@ -65,13 +70,10 @@ RUN apt-get update && apt-get install -y \
> 	gnu-efi \
> 	gnutls-dev \
> 	graphviz \
>-	grub-efi-amd64-bin \
>-	grub-efi-ia32-bin \
> 	help2man \
> 	iasl \
> 	imagemagick \
> 	iputils-ping \
>-	libc6-i386 \
> 	libconfuse-dev \
> 	libgit2-dev \
> 	libjson-glib-dev \
>@@ -89,7 +91,6 @@ RUN apt-get update && apt-get install -y \
> 	libtool \
> 	libudev-dev \
> 	libusb-1.0-0-dev \
>-	linux-image-kvm \
> 	lzma-alone \
> 	lzop \
> 	mount \
>@@ -126,6 +127,7 @@ RUN apt-get update && apt-get install -y \
> 	xilinx-bootgen \
> 	xxd \
> 	zip \
>+	${EXTRA_PACKAGES} \
> 	&& rm -rf /var/lib/apt/lists/*
> 
> # Make kernels readable for libguestfs tools to work correctly