The package names are slightly different for arm64 and we don't seem to have a linux-image-kvm package. Provide some extra ones for x86
Signed-off-by: Simon Glass <[email protected]> --- Changes in v3: - Use grub-efi and linux-image-generic for both archs Changes in v2: - Swap order so that amd64 is the exception tools/docker/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 7f4b17ab0a4..fd4835e9562 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -44,7 +44,10 @@ 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/amd64" ]; then \ + EXTRA_PACKAGES="grub-efi-ia32-bin libc6-i386"; \ + fi; \ + apt-get update && apt-get install -y \ automake \ autopoint \ bc \ @@ -70,13 +73,11 @@ RUN apt-get update && apt-get install -y \ gnu-efi \ gnutls-dev \ graphviz \ - grub-efi-amd64-bin \ - grub-efi-ia32-bin \ + grub-efi \ help2man \ iasl \ imagemagick \ iputils-ping \ - libc6-i386 \ libconfuse-dev \ libgit2-dev \ libjson-glib-dev \ @@ -94,7 +95,7 @@ RUN apt-get update && apt-get install -y \ libtool \ libudev-dev \ libusb-1.0-0-dev \ - linux-image-kvm \ + linux-image-generic \ lzma-alone \ lzop \ mount \ @@ -131,6 +132,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 -- 2.34.1
