[gnome-continuous-yocto/gnomeostree-3.28-rocko: 19/8267] image.bbclass: don't emit redundant IMAGE_CMD_xxx functions

[Emmanuele Bassi <ebassi src gnome org>]

commit e7d3dcbcbba5ae3f600d0e6878b432497b851d39
Author: Andre McCurdy <armccurdy gmail com>
Date:   Thu Apr 14 20:47:46 2016 -0700

    image.bbclass: don't emit redundant IMAGE_CMD_xxx functions
    
    IMAGE_CMD_xxx commands are always inlined within do_image_xxx.
    
    When IMAGE_CMD_xxx is defined as a function (e.g. IMAGE_CMD_btrfs,
    IMAGE_CMD_cpio, etc), a redundant copy of the function will be emitted
    by default. Remove IMAGE_CMD_xxx 'func' flags to prevent that.
    
    (From OE-Core rev: 118c1ca4d8d62162e87caf287f96d90707ee5903)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8bfd241..9ba6011 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -388,6 +388,10 @@ python () {
             bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or 
missing support class" % t)
         cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
 
+        # Since a copy of IMAGE_CMD_xxx will be inlined within do_image_xxx,
+        # prevent a redundant copy of IMAGE_CMD_xxx being emitted as a function.
+        d.delVarFlag('IMAGE_CMD_' + realt, 'func')
+
         rm_tmp_images = set()
         def gen_conversion_cmds(bt):
             for ctype in ctypes: