aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
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-06-29 19:33:22 +0100
commitb12bd3c8ae266b393aedea93587acfbbc5e631cb (patch)
tree844742ba6777385c24dd4b4c68d9995c79814f7c /meta/classes/image.bbclass
parent91c9f3d41213858847a947ab957aa4b00e6e4245 (diff)
downloadopenembedded-core-b12bd3c8ae266b393aedea93587acfbbc5e631cb.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> Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta/classes/image.bbclass')
-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 9f72189083..6b9f9798db 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}"))