image.bbclass: Sorted ctypes to avoid basehash error
PATCH 1/1 image.bbclass: Sorted ctypes to avoid basehash error
From: Gerson Fernando Budke <[email protected]>
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)
--- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/image.bbclass +1 -1
@@ -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_"):
Signature · 1 line
2.14.1
Quoted 11 lines · Martin Hundebøll
From: Gerson Fernando Budke <[email protected]>
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)
This got merge into Pyro
thanks,
Armin
Quoted 21 lines
Signed-off-by Gerson Fernando Budke <[email protected]>Signed-off-by Ross Burton <[email protected]>Signed-off-by Richard Purdie <[email protected]>--- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/classes/image.bbclass +1
-1@@ -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_"):