]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate: Ensure we sort the value used for SSTATETASKS for determinism
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 May 2016 21:53:25 +0000 (22:53 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 May 2016 22:23:58 +0000 (23:23 +0100)
This avoids 'basehash changed' errors with python 3 but could break
build determinism in general.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass

index 8c623271adc5401c91eedff966f0817dd75e66eb..22ce1ee9efd1535c2769beda4097dd85127919b9 100644 (file)
@@ -95,7 +95,7 @@ python () {
         scan_cmd = "grep -Irl ${STAGING_DIR} ${SSTATE_BUILDDIR}"
         d.setVar('SSTATE_SCAN_CMD', scan_cmd)
 
-    unique_tasks = set((d.getVar('SSTATETASKS', True) or "").split())
+    unique_tasks = sorted(set((d.getVar('SSTATETASKS', True) or "").split()))
     d.setVar('SSTATETASKS', " ".join(unique_tasks))
     for task in unique_tasks:
         d.prependVarFlag(task, 'prefuncs', "sstate_task_prefunc ")