summaryrefslogtreecommitdiffstats
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-29 11:07:44 +0100
commitb591fb889b02ba82e6e35bb64b9fcb313f4bb5cb (patch)
treecb2ea9fbd2996e80714574617f85540bef7c172f
parent417a9b8baa0d6407a99dc815480f5b911e209f74 (diff)
downloadpoky-b591fb889b02ba82e6e35bb64b9fcb313f4bb5cb.tar.gz
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. (From OE-Core rev: 1608129692d92c239b5fb9244b649a32b9009254) 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 d6bd3bff7b..b119c9c2fd 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):
328 raise WicError("Coludn't find target architecture") 328 raise WicError("Coludn't find target architecture")
329 329
330 if re.match("x86_64", target_arch): 330 if re.match("x86_64", target_arch):
331 grub_image = "grub-efi-bootx64.efi" 331 grub_src_image = "grub-efi-bootx64.efi"
332 grub_dest_image = "bootx64.efi"
332 elif re.match('i.86', target_arch): 333 elif re.match('i.86', target_arch):
333 grub_image = "grub-efi-bootia32.efi" 334 grub_src_image = "grub-efi-bootia32.efi"
335 grub_dest_image = "bootia32.efi"
334 else: 336 else:
335 raise WicError("grub-efi is incompatible with target %s" % 337 raise WicError("grub-efi is incompatible with target %s" %
336 target_arch) 338 target_arch)
337 339
338 grub_target = os.path.join(target_dir, grub_image) 340 grub_target = os.path.join(target_dir, grub_dest_image)
339 if not os.path.isfile(grub_target): 341 if not os.path.isfile(grub_target):
340 grub_src = os.path.join(deploy_dir, grub_image) 342 grub_src = os.path.join(deploy_dir, grub_src_image)
341 if not os.path.exists(grub_src): 343 if not os.path.exists(grub_src):
342 raise WicError("Grub loader %s is not found in %s. " 344 raise WicError("Grub loader %s is not found in %s. "
343 "Please build grub-efi first" % (grub_image, deploy_dir)) 345 "Please build grub-efi first" % (grub_image, deploy_dir))