[PATCH 3/7] ubi: Move tasks reorder into parent task

[Anton Mikanovich <amikan@ilbers.de>]

Image type ubi-ubifs-img was created to implement UBI image generation
with FIT and UBIFS subimages included. Now we can implement the same
with multiple image types. This will also allow to use UBIFS+UBI setup
without creating another image type. The only issue should be resolved
then is calling task in correct order.
Move dependencies logic into parent UBI image type bbclass to set task
dependencies correctly.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/classes/ubi-ubifs-img.bbclass | 4 ++--
 meta/classes/ubi-img.bbclass            | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass
index 095719a..cee29ef 100644
--- a/meta-isar/classes/ubi-ubifs-img.bbclass
+++ b/meta-isar/classes/ubi-ubifs-img.bbclass
@@ -5,6 +5,6 @@
 #
 # SPDX-License-Identifier: MIT
 
+# Deprecated: use IMAGE_FSTYPES = "ubi-img ubifs-img fit-img" instead
+
 inherit ubi-img ubifs-img fit-img
-addtask do_ubi_image after do_ubifs_image
-addtask do_ubi_image after do_fit_image
diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass
index efaf058..b6c2ff2 100644
--- a/meta/classes/ubi-img.bbclass
+++ b/meta/classes/ubi-img.bbclass
@@ -6,6 +6,12 @@
 python() {
     if not d.getVar("UBINIZE_ARGS"):
         raise bb.parse.SkipRecipe("UBINIZE_ARGS must be set")
+
+    fstypes = d.getVar('IMAGE_FSTYPES', True) or ''
+    if 'fit-img' in fstypes.split() or 'ubi-ubifs-img' in fstypes.split():
+        bb.build.addtask('do_ubi_image', '', 'do_fit_image', d)
+    if 'ubifs-img' in fstypes.split() or 'ubi-ubifs-img' in fstypes.split():
+        bb.build.addtask('do_ubi_image', '', 'do_ubifs_image', d)
 }
 
 UBINIZE_CFG ??= "ubinize.cfg"
-- 
2.25.1