summaryrefslogtreecommitdiffstats
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:58:44 +0100
commitd73b756d822f29c7616a9e86e5fe422f63d3512e (patch)
tree9205391cb4f3008edac62423e3cc9616a1a66813
parent57136a613b9ac554d6090d19d7e76fe7d9838cb4 (diff)
downloadpoky-d73b756d822f29c7616a9e86e5fe422f63d3512e.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] (From OE-Core rev: 94f61c2682e5cfd819ac84535650c3e0a654415a) Signed-off-by: Alexander D. Kanevskiy <kad@kad.name> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 () {
402 # Create input image first. 402 # Create input image first.
403 gen_conversion_cmds(type) 403 gen_conversion_cmds(type)
404 localdata.setVar('type', type) 404 localdata.setVar('type', type)
405 cmds.append("\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True)) 405 cmd = "\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True)
406 if cmd not in cmds:
407 cmds.append(cmd)
406 vardeps.add('COMPRESS_CMD_' + ctype) 408 vardeps.add('COMPRESS_CMD_' + ctype)
407 subimages.append(type + "." + ctype) 409 subimage = type + "." + ctype
410 if subimage not in subimages:
411 subimages.append(subimage)
408 if type not in alltypes: 412 if type not in alltypes:
409 rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}")) 413 rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"))
410 414