diff options
author | Alexander D. Kanevskiy <kad@kad.name> | 2016-04-21 12:47:27 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:35:55 +0100 |
commit | 200f6c8c357ccad959cda787cc6bb8b85201f354 (patch) | |
tree | 3c6fa2ac443db0bb790825c4770505f9a8d19c17 /meta/classes/image.bbclass | |
parent | 7f9a10b861e8016aee96c90c569e3448b79a4a14 (diff) | |
download | poky-200f6c8c357ccad959cda787cc6bb8b85201f354.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)
(From OE-Core rev: b12bd3c8ae266b393aedea93587acfbbc5e631cb)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 8 |
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 () { | |||
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 | ||