aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2018-06-28 16:58:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-28 23:33:55 +0100
commit1608129692d92c239b5fb9244b649a32b9009254 (patch)
tree02a714631ddbac72ac42df0344f3065e512710d2
parent4cc150f31f84d1cbc82df7d7f8fe045a06a9859e (diff)
downloadopenembedded-core-contrib-1608129692d92c239b5fb9244b649a32b9009254.tar.gz
openembedded-core-contrib-1608129692d92c239b5fb9244b649a32b9009254.tar.bz2
openembedded-core-contrib-1608129692d92c239b5fb9244b649a32b9009254.zip
wic: isoimage-isohybrid: fix UEFI spec breakage
It's really good that OE supports multiple EFI_PROVIDERs and that commit 9a1709278de87 ("wic: isoimage-isohybrid: use grub-efi from deploy dir") makes re-use of the grub-efi built image, but we should still respect the standard otherwise the ISO will not boot, so install grub images as boot[x64|ia32].efi not ${PN}-boot[x64|ia32].efi. Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index d6bd3bff7bf..b119c9c2fd6 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -328,16 +328,18 @@ class IsoImagePlugin(SourcePlugin):
raise WicError("Coludn't find target architecture")
if re.match("x86_64", target_arch):
- grub_image = "grub-efi-bootx64.efi"
+ grub_src_image = "grub-efi-bootx64.efi"
+ grub_dest_image = "bootx64.efi"
elif re.match('i.86', target_arch):
- grub_image = "grub-efi-bootia32.efi"
+ grub_src_image = "grub-efi-bootia32.efi"
+ grub_dest_image = "bootia32.efi"
else:
raise WicError("grub-efi is incompatible with target %s" %
target_arch)
- grub_target = os.path.join(target_dir, grub_image)
+ grub_target = os.path.join(target_dir, grub_dest_image)
if not os.path.isfile(grub_target):
- grub_src = os.path.join(deploy_dir, grub_image)
+ grub_src = os.path.join(deploy_dir, grub_src_image)
if not os.path.exists(grub_src):
raise WicError("Grub loader %s is not found in %s. "
"Please build grub-efi first" % (grub_image, deploy_dir))