[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3594/8267] image.bbclass: inherit image_types_uboot when needed

[Emmanuele Bassi <ebassi src gnome org>]

commit 1bf8d703f4c9f13a89a496e12a3b1675342127b9
Author: Robert Yang <liezhi yang windriver com>
Date:   Mon Dec 5 06:54:40 2016 -0800

    image.bbclass: inherit image_types_uboot when needed
    
    Fixed:
    MACHINE = "qemuarm"
    IMAGE_FSTYPES += "ext3.bz2.u-boot"
    [snip]
    No IMAGE_CMD defined for IMAGE_FSTYPES entry 'ext3.bz2.u-boot' - possibly invalid type name or missing 
support class
    [snip]
    
    This is because image_types_uboot is not inherited, inherit it when
    needed will fix the problem.
    
    (From OE-Core rev: 742a22ab7fd333e99d8701220d5a1db28347b1af)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6111f6d..b10272a 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -144,6 +144,15 @@ inherit ${IMAGE_TYPE_live}
 IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2", "hdddirect"], 
"image-vm", "", d)}'
 inherit ${IMAGE_TYPE_vm}
 
+def build_uboot(d):
+    if 'u-boot' in (d.getVar('IMAGE_FSTYPES', True) or ''):
+        return "image_types_uboot"
+    else:
+        return ""
+
+IMAGE_TYPE_uboot = "${@build_uboot(d)}"
+inherit ${IMAGE_TYPE_uboot}
+
 python () {
     deps = " " + imagetypes_getdepends(d)
     d.appendVarFlag('do_rootfs', 'depends', deps)