summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-25 15:58:09 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-25 23:15:53 +0100
commita035d6563ea98b34a8e9465b4942a1fa43af0350 (patch)
treec450c5800845154a92ed1c66c309a886e754f4fc
parent859d9a477a784b8f678d679de3284d56f718069c (diff)
downloadpoky-a035d6563ea98b34a8e9465b4942a1fa43af0350.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: 98a2afeb3a53bec7a72a4a9846e1dba636cc6f3d) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
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 () {
474 # Clean up after applying all conversion commands. Some of them might 474 # Clean up after applying all conversion commands. Some of them might
475 # use the same input, therefore we cannot delete sooner without applying 475 # use the same input, therefore we cannot delete sooner without applying
476 # some complex dependency analysis. 476 # some complex dependency analysis.
477 for image in rm_tmp_images: 477 for image in sorted(rm_tmp_images):
478 cmds.append("\trm " + image) 478 cmds.append("\trm " + image)
479 479
480 after = 'do_image' 480 after = 'do_image'