diff options
author | Tom Rini <trini@konsulko.com> | 2017-07-25 15:58:09 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-29 16:50:54 +0100 |
commit | cd79140864e0eadc173665368910cd237c26f369 (patch) | |
tree | e401d1d7e503325b216c3cb7d319f9643a6b7311 | |
parent | 341726ffdba0f7dfa2056b9c501e20ef600a51cb (diff) | |
download | poky-cd79140864e0eadc173665368910cd237c26f369.tar.gz |
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@intel.com>
(From OE-Core rev: a786b59a42e6b49229e2e0633728fd7b268438a9)
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index cf38d2a117..de0ac8a3a4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -487,7 +487,7 @@ python () { | |||
487 | # Clean up after applying all conversion commands. Some of them might | 487 | # Clean up after applying all conversion commands. Some of them might |
488 | # use the same input, therefore we cannot delete sooner without applying | 488 | # use the same input, therefore we cannot delete sooner without applying |
489 | # some complex dependency analysis. | 489 | # some complex dependency analysis. |
490 | for image in rm_tmp_images: | 490 | for image in sorted(rm_tmp_images): |
491 | cmds.append("\trm " + image) | 491 | cmds.append("\trm " + image) |
492 | 492 | ||
493 | after = 'do_image' | 493 | after = 'do_image' |