summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 14:09:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:33:42 +0100
commit8a88c5696840d8ee725743cabbf838f94be21498 (patch)
tree0635edaebbbc10d9c86aa18c77b7b0ca807409f0 /meta/classes/image.bbclass
parent015266a66567b71d54caf2d7fda3045d3081fb71 (diff)
downloadpoky-8a88c5696840d8ee725743cabbf838f94be21498.tar.gz
image: Fix IMAGE_FEATURES determinism issue
remain_features uses a dict which means the order is not deterministic. This can lead to the task hash changing depending on the state of the memory at parse time. This is particularly noticeable under python v3. Since the dict is helpful in constructing the data, pass the data through sort() so the order is always deterministic. (From OE-Core rev: b08344e28dd33e3af5596007b11185d04fce255e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-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 4542e95d1e..6b9f9798db 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -166,7 +166,7 @@ python () {
166 if temp: 166 if temp:
167 bb.fatal("%s contains conflicting IMAGE_FEATURES %s %s" % (d.getVar('PN', True), feature, ' '.join(list(temp)))) 167 bb.fatal("%s contains conflicting IMAGE_FEATURES %s %s" % (d.getVar('PN', True), feature, ' '.join(list(temp))))
168 168
169 d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) 169 d.setVar('IMAGE_FEATURES', ' '.join(sorted(list(remain_features))))
170 170
171 check_image_features(d) 171 check_image_features(d)
172 initramfs_image = d.getVar('INITRAMFS_IMAGE', True) or "" 172 initramfs_image = d.getVar('INITRAMFS_IMAGE', True) or ""