aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerson Fernando Budke <nandojve@gmail.com>2017-09-22 07:29:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-22 17:52:58 +0100
commit404a04a862a71a5a0fb1c20b6bc9fc9c8b2bb98c (patch)
tree27bdeaf63f621712706df5c2f1e2e6c4c3deee39
parent5c4c077a9182561a95f071d9c0d4a7a7f06fca98 (diff)
downloadopenembedded-core-contrib-404a04a862a71a5a0fb1c20b6bc9fc9c8b2bb98c.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) 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>
-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 ef2b38aeaf..9c9f14a99a 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -453,7 +453,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_"):