[OE-core] [morty][PATCH] image.bbclass: Sorted ctypes to avoid basehash error

[akuster808]

On 09/22/2017 03:30 AM, Gerson Fernando Budke wrote:
> 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 is in morty,
thanks,
Armin
>
> Signed-off-by: Gerson Fernando Budke <nandojve at gmail.com
> <mailto:nandojve at gmail.com>>
> Signed-off-by: Ross Burton <ross.burton at intel.com
> <mailto:ross.burton at intel.com>>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org
> <mailto:richard.purdie at linuxfoundation.org>>
> ---
>  meta/classes/image.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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_"):
>
>
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170925/221f3d7c/attachment-0002.html>