summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerson Fernando Budke <nandojve@gmail.com>2017-09-19 14:15:36 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 09:24:00 +0100
commit271f1a5f65b8685a1e3645026876251122ef3974 (patch)
tree2b4e3cbb2c1669715fffef7971ef9b17d0234e74
parent62ce334e583ecdf1f93619f4131c0fa5d88d5b02 (diff)
downloadopenembedded-core-contrib-271f1a5f65b8685a1e3645026876251122ef3974.tar.gz
openembedded-core-contrib-271f1a5f65b8685a1e3645026876251122ef3974.tar.bz2
openembedded-core-contrib-271f1a5f65b8685a1e3645026876251122ef3974.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. Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/image.bbclass2
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 () {
rm_tmp_images = set()
def gen_conversion_cmds(bt):
- for ctype in ctypes:
+ for ctype in sorted(ctypes):
if bt.endswith("." + ctype):
type = bt[0:-len(ctype) - 1]
if type.startswith("debugfs_"):