From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>
Subject: [PATCH 4/9] docker: Adjust packages for arm64
Date: Mon, 4 Nov 2024 06:39:48 -0700 [thread overview]
Message-ID: <20241104133954.840994-5-sjg@chromium.org> (raw)
In-Reply-To: <20241104133954.840994-1-sjg@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@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 \
+ EXTRA_PACKAGES="grub-efi-arm64-bin linux-image-generic"; \
+ else \
+ 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
--
2.34.1
next prev parent reply other threads:[~2024-11-04 13:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-04 13:39 [PATCH 0/9] CI: Set up for an arm64 runner Simon Glass
2024-11-04 13:39 ` [PATCH 1/9] sandbox: efi_loader: Correct use of addresses as pointers Simon Glass
2024-11-04 20:37 ` Heinrich Schuchardt
2024-11-05 15:12 ` Simon Glass
2024-11-04 13:39 ` [PATCH 2/9] test: Adjust print_ut test to use unsigned char Simon Glass
2024-11-04 20:46 ` Heinrich Schuchardt
2024-11-05 15:14 ` Simon Glass
2024-11-04 13:39 ` [PATCH 3/9] docker: Support building for multiple architectures Simon Glass
2024-11-04 13:55 ` Tom Rini
2024-11-04 20:49 ` Heinrich Schuchardt
2024-11-04 13:39 ` Simon Glass [this message]
2024-11-04 13:56 ` [PATCH 4/9] docker: Adjust packages for arm64 Tom Rini
2024-11-04 20:58 ` Heinrich Schuchardt
2024-11-04 21:34 ` Tom Rini
2024-11-05 19:21 ` Simon Glass
2024-11-04 13:39 ` [PATCH 5/9] docker: Drop grub " Simon Glass
2024-11-04 13:56 ` Tom Rini
2024-11-05 15:15 ` Simon Glass
2024-11-05 15:44 ` Tom Rini
2024-11-05 16:07 ` Simon Glass
2024-11-04 21:04 ` Heinrich Schuchardt
2024-11-04 21:18 ` Tom Rini
2024-11-04 13:39 ` [PATCH 6/9] docker: Drop tracing " Simon Glass
2024-11-04 13:56 ` Tom Rini
2024-11-04 21:22 ` Heinrich Schuchardt
2024-11-05 15:15 ` Simon Glass
2024-11-04 13:39 ` [PATCH 7/9] docker: Drop coreboot " Simon Glass
2024-11-04 13:56 ` Tom Rini
2024-11-04 13:39 ` [PATCH 8/9] docker: Fix LegacyKeyValueFormat warning with PYTHONPATH Simon Glass
2024-11-04 13:56 ` Tom Rini
2024-11-04 21:24 ` Heinrich Schuchardt
2024-11-04 13:39 ` [PATCH 9/9] CI: Add platform variable Simon Glass
2024-11-04 13:57 ` Tom Rini
2024-11-04 13:55 ` [PATCH 0/9] CI: Set up for an arm64 runner Tom Rini
2024-11-07 9:42 ` Ilias Apalodimas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241104133954.840994-5-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.