[oe-commits] [openembedded-core] 20/39: image.bbclass: inherit image_types_uboot when needed

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 742a22ab7fd333e99d8701220d5a1db28347b1af
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: 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.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)

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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.