diff options
| author | Gerson Fernando Budke <nandojve@gmail.com> | 2017-09-22 07:29:08 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-22 17:53:25 +0100 |
| commit | 717303e6fbcbbe181ad9645d762eb5a85d934523 (patch) | |
| tree | df03a2c85ed2e01fadcfc342a374bda5215587ef /meta/classes | |
| parent | 30613467d864130202d90e8460f7bbfa4db98397 (diff) | |
| download | poky-717303e6fbcbbe181ad9645d762eb5a85d934523.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)
(From OE-Core rev: 404a04a862a71a5a0fb1c20b6bc9fc9c8b2bb98c)
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>
Diffstat (limited to 'meta/classes')
| -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 ef2b38aeaf..9c9f14a99a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
| @@ -453,7 +453,7 @@ python () { | |||
| 453 | 453 | ||
| 454 | rm_tmp_images = set() | 454 | rm_tmp_images = set() |
| 455 | def gen_conversion_cmds(bt): | 455 | def gen_conversion_cmds(bt): |
| 456 | for ctype in ctypes: | 456 | for ctype in sorted(ctypes): |
| 457 | if bt.endswith("." + ctype): | 457 | if bt.endswith("." + ctype): |
| 458 | type = bt[0:-len(ctype) - 1] | 458 | type = bt[0:-len(ctype) - 1] |
| 459 | if type.startswith("debugfs_"): | 459 | if type.startswith("debugfs_"): |