diff options
author | Gerson Fernando Budke <nandojve@gmail.com> | 2017-09-19 14:15:36 -0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-12-14 17:17:12 +0000 |
commit | 3c4c45d1e9a2324191a8640b22df1b71f15f3037 (patch) | |
tree | 3d0d7aa84612b5fa2d4251f41b88076e7d5d0f38 | |
parent | 3431b9d80d0e98e18ca747625fb8f713afcc23fe (diff) | |
download | talos-openbmc-3c4c45d1e9a2324191a8640b22df1b71f15f3037.tar.gz talos-openbmc-3c4c45d1e9a2324191a8640b22df1b71f15f3037.zip |
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>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
(cherry picked from commit 69e97240b372c6aaf0a9eab82bc1361a23db996d)
Change-Id: I3f6483ba054f5c066e39081bab82e0ba6e98a800
-rw-r--r-- | import-layers/yocto-poky/meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/import-layers/yocto-poky/meta/classes/image.bbclass b/import-layers/yocto-poky/meta/classes/image.bbclass index 6111f6d26..9f5869e36 100644 --- a/import-layers/yocto-poky/meta/classes/image.bbclass +++ b/import-layers/yocto-poky/meta/classes/image.bbclass @@ -456,7 +456,7 @@ python () { rm_tmp_images = set() def gen_conversion_cmds(bt): - for ctype in ctypes: + for ctype in sorted(ctypes): if bt[bt.find('.') + 1:] == ctype: type = bt[0:-len(ctype) - 1] if type.startswith("debugfs_"): |