diff options
| author | Gerson Fernando Budke <nandojve@gmail.com> | 2017-09-19 14:15:36 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-21 09:24:25 +0100 |
| commit | 69e97240b372c6aaf0a9eab82bc1361a23db996d (patch) | |
| tree | bfefcc3c2d80792eb070e6709c1bb052b0fda7ed | |
| parent | dc6a45889d8bf0538bff27d976e8a29383682c5a (diff) | |
| download | poky-69e97240b372c6aaf0a9eab82bc1361a23db996d.tar.gz | |
image.bbclass: Sorted ctypes to avoid basehash error
When selected multiple subimages a similar error could happend:
Variable do_image_cpio[subimages] value changed \
from 'cpio.gz.u-boot cpio.gz' to 'cpio.gz cpio.gz.u-boot'
To avoid this, 'ctypes' should be sorted at 'gen_conversion_cmds'.
This garantee that 'CONVERSION_CMD_xxx' are always written in tha same
order and consequently 'do_image_cpio' have the same hash.
(From OE-Core rev: 271f1a5f65b8685a1e3645026876251122ef3974)
Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4850eed771..0d14250c0d 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
| @@ -455,7 +455,7 @@ python () { | |||
| 455 | 455 | ||
| 456 | rm_tmp_images = set() | 456 | rm_tmp_images = set() |
| 457 | def gen_conversion_cmds(bt): | 457 | def gen_conversion_cmds(bt): |
| 458 | for ctype in ctypes: | 458 | for ctype in sorted(ctypes): |
| 459 | if bt.endswith("." + ctype): | 459 | if bt.endswith("." + ctype): |
| 460 | type = bt[0:-len(ctype) - 1] | 460 | type = bt[0:-len(ctype) - 1] |
| 461 | if type.startswith("debugfs_"): | 461 | if type.startswith("debugfs_"): |