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 15:11:41 +0100 |
| commit | a786b59a42e6b49229e2e0633728fd7b268438a9 (patch) | |
| tree | 5ada731a189d896428db8b5c1fd5e8f49da294c4 /meta/classes | |
| parent | e1546856890a438b5ea3763af3cdc13db8e8f236 (diff) | |
| download | openembedded-core-contrib-a786b59a42e6b49229e2e0633728fd7b268438a9.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>
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>
Diffstat (limited to 'meta/classes')
| -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 () { # 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' |