sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Tom Rini 2017-07-25 15:58:09 -04:00 committed by Richard Purdie
parent 88eec32150
commit 43435bc2e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/image.bbclass
View File

@ -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'