diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-25 15:58:09 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-25 23:15:30 +0100 |
| commit | 98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d (patch) | |
| tree | b7b93c9d6c3ad44452ea31b03e33444ccc9a839c | |
| parent | 9210c9ce051dfffaa7afa36bb4a926cea289ffd4 (diff) | |
| download | openembedded-core-98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d.tar.gz openembedded-core-98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d.tar.bz2 openembedded-core-98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d.zip | |
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>
Signed-off-by: Tom Rini <trini@konsulko.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 b095bca7c1..dee17ae9f9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -474,7 +474,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' |