aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander D. Kanevskiy <kad@kad.name>2016-04-21 12:47:27 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:53:57 +0100
commit94f61c2682e5cfd819ac84535650c3e0a654415a (patch)
tree6e386fdf34674727b546e49073ee829b93a95582
parenta96c3ea4fb4676a13b24b8e8d1164b31080c4f56 (diff)
downloadopenembedded-core-contrib-94f61c2682e5cfd819ac84535650c3e0a654415a.tar.gz
image.bbclass: don't execute compression commands multiple times
In case of chained conversion methods are used via COMPRESS_CMD_* there is chance that some of steps would be executed multiple times. [YOCTO #9482] Signed-off-by: Alexander D. Kanevskiy <kad@kad.name> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/image.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 9ba60117f6..4542e95d1e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -402,9 +402,13 @@ python () {
# Create input image first.
gen_conversion_cmds(type)
localdata.setVar('type', type)
- cmds.append("\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True))
+ cmd = "\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True)
+ if cmd not in cmds:
+ cmds.append(cmd)
vardeps.add('COMPRESS_CMD_' + ctype)
- subimages.append(type + "." + ctype)
+ subimage = type + "." + ctype
+ if subimage not in subimages:
+ subimages.append(subimage)
if type not in alltypes:
rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"))