[PATCH 1/7] ubi: Move default output paths to image class

[Anton Mikanovich <amikan@ilbers.de>]

To be able to use some default deploy paths of kernel, initrd and dtb
in any image move these declarations into image bbclass.
The same done with ubifs and fit image deploy paths moving default
ones to image type classes.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/recipes-core/images/isar-image-ubi.bb | 8 --------
 meta/classes/fit-img.bbclass                    | 5 ++++-
 meta/classes/image.bbclass                      | 6 ++++++
 meta/classes/ubifs-img.bbclass                  | 5 ++++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb
index ef2cf1c..9323822 100644
--- a/meta-isar/recipes-core/images/isar-image-ubi.bb
+++ b/meta-isar/recipes-core/images/isar-image-ubi.bb
@@ -17,11 +17,3 @@ SRC_URI += "file://ubinize.cfg.tmpl \
 
 TEMPLATE_VARS = "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG"
 TEMPLATE_FILES = "ubinize.cfg.tmpl fitimage.its.tmpl"
-
-KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}"
-INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}"
-# only one dtb file supported, pick the first
-DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}"
-
-UBIFS_IMG = "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}"
-FIT_IMG = "${PP_DEPLOY}/${FIT_IMAGE_FILE}"
diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass
index 1ad0c5b..37736f0 100644
--- a/meta/classes/fit-img.bbclass
+++ b/meta/classes/fit-img.bbclass
@@ -10,6 +10,9 @@ FIT_IMAGE_FILE ?= "${IMAGE_FULLNAME}.fit.img"
 
 IMAGER_INSTALL += "u-boot-tools device-tree-compiler"
 
+# Default fit image deploy path (inside imager)
+FIT_IMG ?= "${PP_DEPLOY}/${FIT_IMAGE_FILE}"
+
 # Generate fit image
 do_fit_image() {
     if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then
@@ -22,7 +25,7 @@ do_fit_image() {
 
     # Create fit image using buildchroot tools
     sudo chroot ${BUILDCHROOT_DIR} /usr/bin/mkimage ${MKIMAGE_ARGS} \
-                -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${PP_DEPLOY}/${FIT_IMAGE_FILE}'
+                -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${FIT_IMG}'
     sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${FIT_IMAGE_FILE}'
 }
 addtask fit_image before do_image after do_image_tools do_transform_template
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6d77243..4b56e91 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -140,6 +140,12 @@ devtmpfs	/dev		devtmpfs	mode=0755,nosuid	0	0
 EOF
 }
 
+# Default kernel, initrd and dtb image deploy paths (inside imager)
+KERNEL_IMG ?= "${PP_DEPLOY}/${KERNEL_IMAGE}"
+INITRD_IMG ?= "${PP_DEPLOY}/${INITRD_IMAGE}"
+# only one dtb file supported, pick the first
+DTB_IMG ?= "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}"
+
 do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}"
 do_copy_boot_files[lockfiles] += "${DEPLOY_DIR_IMAGE}/isar.lock"
 do_copy_boot_files() {
diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass
index 229eb3e..41814b0 100644
--- a/meta/classes/ubifs-img.bbclass
+++ b/meta/classes/ubifs-img.bbclass
@@ -10,6 +10,9 @@ python() {
 
 UBIFS_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubifs.img"
 
+# Default UBIFS image deploy path (inside imager)
+UBIFS_IMG ?= "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}"
+
 IMAGER_INSTALL += "mtd-utils"
 
 # glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960
@@ -24,7 +27,7 @@ do_ubifs_image() {
 
     # Create ubifs image using buildchroot tools
     sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \
-                -r '${PP_ROOTFS}' '${PP_DEPLOY}/${UBIFS_IMAGE_FILE}'
+                -r '${PP_ROOTFS}' '${UBIFS_IMG}'
     sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE}'
 }
 
-- 
2.25.1