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

[Tom Rini]

On Tue, Nov 05, 2024 at 09:26:10AM -0700, Simon Glass wrote:
> Hi Tom,
> 
> On Tue, 5 Nov 2024 at 09:11, Tom Rini <trini at konsulko.com> wrote:
> >
> > On Tue, Nov 05, 2024 at 09:07:33AM -0700, Simon Glass wrote:
> > > 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>
> > > ---
> > >
> > > 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 540718df062..84661b036c6 100644
> > > --- a/tools/docker/Dockerfile
> > > +++ b/tools/docker/Dockerfile
> > > @@ -44,7 +44,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
> >
> > Oh no, here's a big problem ^^^^^
> > You didn't switch to downloading arm64 toolchains, no wonder everything
> > else blows up.
> 
> Er, yes I know that...I would have to put 'if' statements on each one,
> but I was hoping we could come up with a better way of handling this.

Yes, hopefully we can do something with $TARGETPLATFORM to set another
variable that's exposed for wider use.

> Same with all the variables being set for grub.
> 
> >
> > >  # 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-amd64-bin grub-efi-ia32-bin libc6-i386 linux-image-kvm"; \
> > > +     else \
> > > +             EXTRA_PACKAGES="grub-efi linux-image-generic"; \
> > > +     fi; \
> >
> > Again, grub-efi should be used for everyone and linux/amd64 adds
> > grub-efi-ia32-bin. And linux-image-generic should work for everyone,
> > too.
> 
> So what about this commit?[1]
> 
> Regards,
> Simon
> 
> [1] f9abaa53ec8 tools: docker: Install a readable kernel for libguestfs-tools

Yes, linux-image-generic should also provide a useful image, and you
would need to check what CI says when using this image.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20241105/8baa6a58/attachment.sig>