[oe-commits] [openembedded-core] 33/39: image: Fix "metadata is not deterministic" when chaining 2+ CONVERSION_CMDs

[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.

commit 26feb0580642ef8934206ea73cdce9e1f73d14ef
Author: Tom Rini <trini at konsulko.com>
AuthorDate: Tue Jul 25 15:58:09 2017 -0400

    image: Fix "metadata is not deterministic" when chaining 2+ CONVERSION_CMDs
    
    When we have more than one CONVERSION_CMD being used, for example
    ext4.gz.sha256sum we will see errors about "metadata is not
    deterministic".  This is because we do not have a stable order of
    intermediate files that will be removed in the generated shell command.
    We fix this by calling sorted() on the set of rm_tmp_images so that we
    will have a stable hash again.
    
    Cc: Patrick Ohly <patrick.ohly at intel.com>
    Signed-off-by: Tom Rini <trini at konsulko.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit 98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 4b208c9..ef2b38a 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -484,7 +484,7 @@ python () {
         # Clean up after applying all conversion commands. Some of them might
         # use the same input, therefore we cannot delete sooner without applying
         # some complex dependency analysis.
-        for image in rm_tmp_images:
+        for image in sorted(rm_tmp_images):
             cmds.append("\trm " + image)
 
         after = 'do_image'

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