summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-04-14 20:47:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-29 19:35:54 +0100
commit64512cbab8130e7fe45721e0bde86ee1b3f0eaae (patch)
tree68038b15e10ed0efacf926d2cbde7a486386dbac /meta/classes/image.bbclass
parent8e44c6bff92f139bc90b6f6915812948c7123126 (diff)
downloadpoky-64512cbab8130e7fe45721e0bde86ee1b3f0eaae.tar.gz
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) (From OE-Core rev: c316e3624b7bc0787904110994d0a519b9ce4d87) 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> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index acaa9ec947..9f72189083 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -388,6 +388,10 @@ python () {
388 bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t) 388 bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t)
389 cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}")) 389 cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
390 390
391 # Since a copy of IMAGE_CMD_xxx will be inlined within do_image_xxx,
392 # prevent a redundant copy of IMAGE_CMD_xxx being emitted as a function.
393 d.delVarFlag('IMAGE_CMD_' + realt, 'func')
394
391 rm_tmp_images = set() 395 rm_tmp_images = set()
392 def gen_conversion_cmds(bt): 396 def gen_conversion_cmds(bt):
393 for ctype in ctypes: 397 for ctype in ctypes: