[oe-commits] [openembedded-core] 01/31: sstate: Ensure we sort the value used for SSTATETASKS for determinism

git at git.openembedded.org git at git.openembedded.org
Mon May 16 22:24:58 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 488f88fc12eea9788e5db1de354f0118e2c58878
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon May 16 22:53:25 2016 +0100

    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 at linuxfoundation.org>
---
 meta/classes/sstate.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 8c62327..22ce1ee 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 ")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list