[PATCH 2/7] ubi: Remove isar-image-ubi

[Anton Mikanovich <amikan@ilbers.de>]

Make Isar UBI image more generic to be able to build default
isar-image-base with UBI-related image types.
Use image types as override postfix to declare UBI-related parametes.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 .../recipes-core/images/isar-image-base.bb    | 11 +++++++++++
 .../recipes-core/images/isar-image-ubi.bb     | 19 -------------------
 meta/classes/image.bbclass                    |  8 ++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 meta-isar/recipes-core/images/isar-image-ubi.bb

diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index b381d85..b1f22fa 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -11,3 +11,14 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
 PV = "1.0"
 
 inherit image
+
+SRC_URI_append_ubi-img = " file://ubinize.cfg.tmpl"
+SRC_URI_append_fit-img = " file://fitimage.its.tmpl"
+SRC_URI_append_ubi-ubifs-img = " file://ubinize.cfg.tmpl file://fitimage.its.tmpl"
+
+TEMPLATE_VARS_append_fit-img = " KERNEL_IMG INITRD_IMG DTB_IMG"
+TEMPLATE_VARS_append_ubi-img = " KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG"
+TEMPLATE_VARS_append_ubi-ubifs-img = " KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG"
+TEMPLATE_FILES_append_fit-img = " fitimage.its.tmpl"
+TEMPLATE_FILES_append_ubi-img = " ubinize.cfg.tmpl"
+TEMPLATE_FILES_append_ubi-ubifs-img = " ubinize.cfg.tmpl fitimage.its.tmpl"
diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb
deleted file mode 100644
index 9323822..0000000
--- a/meta-isar/recipes-core/images/isar-image-ubi.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# UBI image recipe
-#
-# This software is a part of ISAR.
-# Copyright (C) Siemens AG, 2019
-#
-# SPDX-License-Identifier: MIT
-
-DESCRIPTION = "UBI Isar image"
-
-LICENSE = "gpl-2.0"
-LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
-
-inherit image
-
-SRC_URI += "file://ubinize.cfg.tmpl \
-            file://fitimage.its.tmpl"
-
-TEMPLATE_VARS = "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG"
-TEMPLATE_FILES = "ubinize.cfg.tmpl fitimage.its.tmpl"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4b56e91..9ad04e8 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -238,3 +238,11 @@ addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess
 
 # Last so that the image type can overwrite tasks if needed
 inherit ${IMAGE_FSTYPES}
+
+def get_fstypes_overrides(d):
+    res = ''
+    for type in (d.getVar('IMAGE_FSTYPES', True) or '').split():
+        res += ':%s' % type
+    return res
+
+OVERRIDES_append = ":${@get_fstypes_overrides(d)}"
-- 
2.25.1