diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-04-14 20:47:46 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-29 07:53:57 +0100 |
| commit | 118c1ca4d8d62162e87caf287f96d90707ee5903 (patch) | |
| tree | c57094f1e5bc2c9cf0130e7e4972ac7669048e6a /meta | |
| parent | a73a316429b256061a7aa48bcf29c5f96df68a8c (diff) | |
| download | openembedded-core-118c1ca4d8d62162e87caf287f96d90707ee5903.tar.gz openembedded-core-118c1ca4d8d62162e87caf287f96d90707ee5903.tar.bz2 openembedded-core-118c1ca4d8d62162e87caf287f96d90707ee5903.zip | |
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 <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 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: |