[oe-commits] [openembedded-core] branch pyro updated: image.bbclass: Sorted ctypes to avoid basehash error

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

The following commit(s) were added to refs/heads/pyro by this push:
     new 404a04a  image.bbclass: Sorted ctypes to avoid basehash error
404a04a is described below

commit 404a04a862a71a5a0fb1c20b6bc9fc9c8b2bb98c
Author: Gerson Fernando Budke <nandojve at gmail.com>
AuthorDate: Fri Sep 22 07:29:08 2017 +0200

    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 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <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 ef2b38a..9c9f14a 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_"):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.