tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grub-mkimage: Creating aarch64 images from x86 host is broken

Browse Source 
A recent fix that made appears to have broken the ability to create an
aarch64 boot image on a x86-based host.

This was due to an overzealous testing of the architecture when building
grub-mkimage and removing the code that build an ARM image when not built
on ARM.

On the occasion remove redundant break.

Fixes: 8541f319 (grub-mkimage: Only check aarch64 relocations when built for aarch64)

Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
Tested-by: Selva Ganesan <selvaganesan89@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Darren Kenny 2022-04-27 10:46:48 +00:00 committed by Daniel Kiper
parent 3aec085410
commit bda136e1bb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/grub-mkimagexx.c
View File

@ -1631,7 +1631,7 @@ translate_relocation_pe (struct translate_context *ctx,
}
break;
case EM_AARCH64:
#if defined(MKIMAGE_ELF64) && defined(__arm__)
#if defined(MKIMAGE_ELF64)
switch (ELF_R_TYPE (info))
{
case R_AARCH64_ABS64:
@ -1667,8 +1667,7 @@ translate_relocation_pe (struct translate_context *ctx,
(unsigned int) ELF_R_TYPE (info));
break;
}
#endif /* defined(MKIMAGE_ELF64) && define(__arm__) */
break;
#endif /* defined(MKIMAGE_ELF64) */
break;
#if defined(MKIMAGE_ELF32)
case EM_ARM: