From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 16 May 2016 21:53:25 +0000 (+0100)
Subject: sstate: Ensure we sort the value used for SSTATETASKS for determinism
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~25831
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488f88fc12eea9788e5db1de354f0118e2c58878;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

sstate: Ensure we sort the value used for SSTATETASKS for determinism

This avoids 'basehash changed' errors with python 3 but could break
build determinism in general.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 8c623271adc..22ce1ee9efd 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -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 ")