Produce EFI artifacts by calling efi_populate function provided by current EFI provider.
This should eliminate dependency of wic image-efi plugin to hddimg. Instead of getting EFI artifacts from HDDDIR it can get it from $WORKDIR/efi. [YOCTO #10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/meta/classes/image-wic.bbclass b/meta/classes/image-wic.bbclass index 2acfd65..41b406d 100644 --- a/meta/classes/image-wic.bbclass +++ b/meta/classes/image-wic.bbclass @@ -118,3 +118,23 @@ python do_rootfs_wicenv () { addtask do_rootfs_wicenv after do_image before do_image_wic do_rootfs_wicenv[vardeps] += "${WICVARS}" do_rootfs_wicenv[prefuncs] = 'set_image_size' + +# Populate EFI artifacts + +EFI_PROVIDER ?= "grub-efi" + +EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" +inherit ${EFI_CLASS} + +python do_efi_populate() { + if d.getVar("EFI_CLASS"): + # set variables required for populating efi artifacts + for key, value in [('LABELS', "boot"), ('GRUB_CFG', "grub-wic.cfg")]: + if not d.getVar(key): + d.setVar(key, value) + + bb.build.exec_func('build_efi_cfg', d) + bb.build.exec_func('efi_populate', d) +} + +addtask do_efi_populate after do_rootfs before do_image -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core