diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 22:53:25 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-17 14:43:28 +0100 |
| commit | 7db0cc27d51a53cfe4dd768ff8e335e2912e6acb (patch) | |
| tree | c9607c724bcd2dab0ff5a504467bb10ed3d97845 /meta/classes | |
| parent | 9094ea9fdd1f23cbc9f7a9d0d95fb330c5ea8906 (diff) | |
| download | poky-7db0cc27d51a53cfe4dd768ff8e335e2912e6acb.tar.gz | |
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>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | 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 8c623271ad..22ce1ee9ef 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -95,7 +95,7 @@ python () { | |||
| 95 | scan_cmd = "grep -Irl ${STAGING_DIR} ${SSTATE_BUILDDIR}" | 95 | scan_cmd = "grep -Irl ${STAGING_DIR} ${SSTATE_BUILDDIR}" |
| 96 | d.setVar('SSTATE_SCAN_CMD', scan_cmd) | 96 | d.setVar('SSTATE_SCAN_CMD', scan_cmd) |
| 97 | 97 | ||
| 98 | unique_tasks = set((d.getVar('SSTATETASKS', True) or "").split()) | 98 | unique_tasks = sorted(set((d.getVar('SSTATETASKS', True) or "").split())) |
| 99 | d.setVar('SSTATETASKS', " ".join(unique_tasks)) | 99 | d.setVar('SSTATETASKS', " ".join(unique_tasks)) |
| 100 | for task in unique_tasks: | 100 | for task in unique_tasks: |
| 101 | d.prependVarFlag(task, 'prefuncs', "sstate_task_prefunc ") | 101 | d.prependVarFlag(task, 'prefuncs', "sstate_task_prefunc ") |