[OE-core] [PATCH 6/7] wic:bootimg-efi:try other place for efi

[Jiang Lu]

When there is no useful efi in $kerneldir, try copy
all efi from EFI/BOOT into boot image.

Signed-off-by: Jiang Lu <lu.jiang at windriver.com>
---
 .../wic/files/wic/plugins/source/bootimg-efi.py              | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/meta/recipes-support/wic/files/wic/plugins/source/bootimg-efi.py b/meta/recipes-support/wic/files/wic/plugins/source/bootimg-efi.py
index 0eb86a0..d435268 100644
--- a/meta/recipes-support/wic/files/wic/plugins/source/bootimg-efi.py
+++ b/meta/recipes-support/wic/files/wic/plugins/source/bootimg-efi.py
@@ -231,6 +231,18 @@ class BootimgEFIPlugin(SourcePlugin):
             else:
                 raise WicError("unrecognized bootimg-efi loader: %s" %
                                source_params['loader'])
+            os.listdir("%s/EFI/BOOT/" % hdddir)
+            found_efi = False
+            for x in os.listdir("%s/EFI/BOOT/" % hdddir) :
+                if x.endswith(".efi"):
+                    found_efi = True
+                    break;
+            if not found_efi:
+                cp_cmd = "cp %s/EFI/BOOT/*.efi %s/EFI/BOOT/" % (kernel_dir, hdddir)
+                try:
+                    exec_cmd(cp_cmd, True)
+                except:
+                    pass
         except KeyError:
             raise WicError("bootimg-efi requires a loader, none specified")
 
-- 
2.7.4