mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
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: 98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user