[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4053/8267] kernel-fitimage.bbclass: Don't assume KERNEL_IMAGETYPE == fitImage

[Emmanuele Bassi <ebassi src gnome org>]

commit 4c88512843de6d1e9de6f56efe63d8b27b0957f2
Author: Nathan Rossi <nathan nathanrossi com>
Date:   Fri Oct 21 22:07:28 2016 +1000

    kernel-fitimage.bbclass: Don't assume KERNEL_IMAGETYPE == fitImage
    
    The name of the output image for a fitImage that contains a ramdisk
    should match the same as for the fitImage that does not contain a
    ramdisk. As such it should not be assumed that KERNEL_IMAGETYPE is
    "fitImage". This change explicitly sets the name of the output
    ramdisk/initramfs to start with fitImage as does the non-ramdisk output.
    
    (From OE-Core rev: 81caed2b7071ffc9ed8077d7d76952f2a2a4713d)
    
    Signed-off-by: Nathan Rossi <nathan nathanrossi com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-fitimage.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 706beed..ae6bfc5 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -419,11 +419,11 @@ kernel_do_deploy_append() {
 
                if [ -n "${INITRAMFS_IMAGE}" ]; then
                        echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
-                       
its_initramfs_base_name="${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-                       its_initramfs_symlink_name=${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${MACHINE}
+                       
its_initramfs_base_name="fitImage-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+                       its_initramfs_symlink_name=fitImage-its-${INITRAMFS_IMAGE}-${MACHINE}
                        install -m 0644 fit-image-${INITRAMFS_IMAGE}.its 
${DEPLOYDIR}/${its_initramfs_base_name}.its
-                       
fit_initramfs_base_name="${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-                       fit_initramfs_symlink_name=${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}
+                       
fit_initramfs_base_name="fitImage-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+                       fit_initramfs_symlink_name=fitImage-${INITRAMFS_IMAGE}-${MACHINE}
                        install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} 
${DEPLOYDIR}/${fit_initramfs_base_name}.bin
                fi