[oe-commits] [openembedded-core] 04/18: wic: isoimage-isohybrid: fix UEFI spec breakage

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit ce1815374254d1f23556b7fe2e46aa0e676d8d1a
Author: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
AuthorDate: Thu Jun 28 16:58:32 2018 +0300

    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 at ni.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 10 ++++++----
 1 file 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 d6bd3bf..b119c9c 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))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.