[PATCH] arm64: properly install vmlinuz.efi

[Josef Bacik]

On Fri, Dec 15, 2023 at 08:03:39PM +0000, Catalin Marinas wrote:
> On Thu, Dec 14, 2023 at 11:18:50AM -0500, Josef Bacik wrote:
> > If you select CONFIG_EFI_ZBOOT, we will generate vmlinuz.efi, and then
> > when we go to install the kernel we'll install the vmlinux instead
> > because install.sh only recognizes Image.gz as wanting the compressed
> > install image.  With CONFIG_EFI_ZBOOT we don't get the proper kernel
> > installed, which means it doesn't boot, which makes for a very confused
> > and subsequently angry kernel developer.
> > 
> > Fix this by properly installing our compressed kernel if we've enabled
> > CONFIG_EFI_ZBOOT.
> > 
> > Signed-off-by: Josef Bacik <josef at toxicpanda.com>
> > ---
> >  arch/arm64/boot/install.sh | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh
> > index 7399d706967a..9b7a09808a3d 100755
> > --- a/arch/arm64/boot/install.sh
> > +++ b/arch/arm64/boot/install.sh
> > @@ -17,7 +17,8 @@
> >  #   $3 - kernel map file
> >  #   $4 - default install path (blank if root directory)
> >  
> > -if [ "$(basename $2)" = "Image.gz" ]; then
> > +if [ "$(basename $2)" = "Image.gz" ] || [ "$(basename $2)" = "vmlinuz.efi" ]
> > +then
> >  # Compressed install
> >    echo "Installing compressed kernel"
> >    base=vmlinuz
> 
> + Ard who added the EFI_ZBOOT support.
> 
> If we go with this fix we should probably also add:
> 
> Fixes: c37b830fef13 ("arm64: efi: enable generic EFI compressed boot")
> Cc: <stable at vger.kernel.org> # 6.1.x
> 
> But is arm64 the only one with this issue?
> 

I can only speak for x86 and arm, x86 has been working fine using this config, I
only recently started using the same thing for arm on my mac studio and ran into
a variety of fun things.  Thanks,

Josef