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 11:57:29 +0100 |
commit | 43435bc2e49ba74c09c929558c8a9053e19d11a7 (patch) | |
tree | c6189b4ed61f459c4f1f357a64066164d2c1d5df /meta | |
parent | 88eec32150c025bae6f3c381152b0772990d0751 (diff) | |
download | poky-43435bc2e49ba74c09c929558c8a9053e19d11a7.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: 26feb0580642ef8934206ea73cdce9e1f73d14ef)
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>
Diffstat (limited to 'meta')
-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 4b208c94f1..ef2b38aeaf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -484,7 +484,7 @@ python () { | |||
484 | # Clean up after applying all conversion commands. Some of them might | 484 | # Clean up after applying all conversion commands. Some of them might |
485 | # use the same input, therefore we cannot delete sooner without applying | 485 | # use the same input, therefore we cannot delete sooner without applying |
486 | # some complex dependency analysis. | 486 | # some complex dependency analysis. |
487 | for image in rm_tmp_images: | 487 | for image in sorted(rm_tmp_images): |
488 | cmds.append("\trm " + image) | 488 | cmds.append("\trm " + image) |
489 | 489 | ||
490 | after = 'do_image' | 490 | after = 'do_image' |