From 4b1974d57c997840f7134244145b51c6790c795a Mon Sep 17 00:00:00 2001 From: Gerson Fernando Budke Date: Fri, 22 Sep 2017 07:30:06 -0300 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') 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 () { 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_"): -- cgit v1.2.3-54-g00ecf