diff options
| author |   Igor Romanov <i.romanov@inango-systems.com> | 2017-09-28 21:08:31 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-04 17:14:25 +0000 |
| commit | 92bd01eba742e2bcb146ca24a1443af833f5a2ba (patch) | |
| tree | 49c4d482b521386f4d6ee81da51125173befdd61 /meta/classes | |
| parent | 29c12b147ef85db4ebb0f86a911db5f90ae11c0a (diff) | |
| download | openembedded-core-contrib-92bd01eba742e2bcb146ca24a1443af833f5a2ba.tar.gz | |
image.bbclass: Fix 'vardepsexclude' mechanism for image_cmd_${FSTYPE}
Current mechanism doesn't allow to use any non-determenistic variable, except 'DATE' and 'DATETIME', inside IMAGE_CMD_${FSTYPE} prototype.
Passing 'vardepsexclude' values from IMAGE_CMD_${FSTYPE}, so users will be able to avoid taskhash mismatch problems.
Signed-off-by: Igor Romanov <i.romanov@inango-systems.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0d14250c0d..20240ba9f0 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -440,6 +440,9 @@ python () { localdata.delVar('DATETIME') localdata.delVar('DATE') localdata.delVar('TMPDIR') + vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + realt, 'vardepsexclude', True) or '').split() + for dep in vardepsexclude: + localdata.delVar(dep) image_cmd = localdata.getVar("IMAGE_CMD") vardeps.add('IMAGE_CMD_' + realt) @@ -503,7 +506,7 @@ python () { d.prependVarFlag(task, 'postfuncs', ' create_symlinks') d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages)) d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) - d.appendVarFlag(task, 'vardepsexclude', 'DATETIME DATE') + d.appendVarFlag(task, 'vardepsexclude', 'DATETIME DATE ' + ' '.join(vardepsexclude)) bb.debug(2, "Adding task %s before %s, after %s" % (task, 'do_image_complete', after)) bb.build.addtask(task, 'do_image_complete', after, d) |