diff options
| author | Gerson Fernando Budke <nandojve@gmail.com> | 2017-09-22 07:30:06 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-22 17:53:30 +0100 |
| commit | 4b1974d57c997840f7134244145b51c6790c795a (patch) | |
| tree | dc09553b98e5ef85b4f7c57e4f41ba244dc2123a /meta/classes | |
| parent | dc51e92b001bf6615f6836a8774bf3afb9ad449a (diff) | |
| download | poky-4b1974d57c997840f7134244145b51c6790c795a.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: 7401ef4d816030bd6844e2e1f1910ac86cdcbe70)
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 de0ac8a3a4..a9ab2fac1a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
| @@ -456,7 +456,7 @@ python () { | |||
| 456 | 456 | ||
| 457 | rm_tmp_images = set() | 457 | rm_tmp_images = set() |
| 458 | def gen_conversion_cmds(bt): | 458 | def gen_conversion_cmds(bt): |
| 459 | for ctype in ctypes: | 459 | for ctype in sorted(ctypes): |
| 460 | if bt.endswith("." + ctype): | 460 | if bt.endswith("." + ctype): |
| 461 | type = bt[0:-len(ctype) - 1] | 461 | type = bt[0:-len(ctype) - 1] |
| 462 | if type.startswith("debugfs_"): | 462 | if type.startswith("debugfs_"): |