From: Andre McCurdy Date: Fri, 15 Apr 2016 03:47:46 +0000 (-0700) Subject: image.bbclass: don't emit redundant IMAGE_CMD_xxx functions X-Git-Tag: uninative-1.0~245 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=118c1ca4d8d62162e87caf287f96d90707ee5903;p=openembedded-core.git 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. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 8bfd24193e..9ba60117f6 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: