[gnome-continuous-yocto/gnomeostree-3.28-rocko: 319/8267] sstate: Ensure we sort the value used for SSTATETASKS for determinism



commit 7db0cc27d51a53cfe4dd768ff8e335e2912e6acb
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   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.
    
    (From OE-Core rev: 488f88fc12eea9788e5db1de354f0118e2c58878)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/sstate.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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 ")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]