[PATCH] timage_types_wic: reschedule do_prepare_wic_build

[PATCH] timage_types_wic: reschedule do_prepare_wic_build

[Ed Bartosh]

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@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

✗ patchtest: failure for timage_types_wic: reschedule do_prepare_wic_build

[Patchwork]

== Series Details ==

Series: timage_types_wic: reschedule do_prepare_wic_build
Revision: 1
URL   : https://patchwork.openembedded.org/series/6906/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 496a9dc179)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe