[OE-core] [PATCH] timage_types_wic: reschedule do_prepare_wic_build

Ed Bartosh ed.bartosh at linux.intel.com
Thu May 25 12:44:55 UTC 2017


do_prepare_wic_build depended on do_deploy task of EFI_PROVIDER recipe.
This approach didn't work on meta-intel as there is no EFI_PROVIDER
recipe in that layer.

Scheduled do_prepare_wic_build after do_bootimg to fix the issue.

Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
 meta/classes/image_types_wic.bbclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 3b73261..baf375b 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -70,10 +70,11 @@ python () {
                 # a variable and let the metadata deal with the deps.
                 d.setVar('_WKS_TEMPLATE', body)
 
-        bb.build.addtask('do_prepare_wic_build', 'do_image_wic', None, d)
         if d.getVar('EFI_CLASS'):
-            d.appendVarFlag('do_prepare_wic_build', 'depends',
-                            '%s%s:do_deploy virtual/kernel:do_deploy' % (d.getVar('MLPREFIX'), d.getVar('EFI_CLASS')))
+            bb.build.addtask('do_prepare_wic_build', 'do_image_wic', 'do_bootimg', d)
+            d.appendVarFlag('do_prepare_wic_build', 'depends', 'virtual/kernel:do_deploy')
+        else:
+            bb.build.addtask('do_prepare_wic_build', 'do_image_wic', None, d)
 }
 
 #
-- 
2.1.4




More information about the Openembedded-core mailing list