diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-23 13:23:44 +0000 |
---|---|---|
committer | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-05 15:36:27 +0000 |
commit | cc01d32cc0843bcae6656a8ec3c694f64f2637d9 (patch) | |
tree | 00c54fe9d16dffd69a58c18c1b3f6e0ef121d616 /meta/classes/sstate.bbclass | |
parent | 65250a5537da220dff662269cb81d086b66c2ace (diff) | |
download | openembedded-core-contrib-cc01d32cc0843bcae6656a8ec3c694f64f2637d9.tar.gz |
meta: remove True option to getVarFlag callsjoshuagl/getvar
getVarFlag() now defaults to expanding by default, thus remove the
True option from getVarFlag() calls with a regex search and
replace.
Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 546e276d9f..a7cd9ec112 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -125,12 +125,12 @@ def sstate_state_fromvars(d, task = None): if task.startswith("do_"): task = task[3:] - inputs = (d.getVarFlag("do_" + task, 'sstate-inputdirs', True) or "").split() - outputs = (d.getVarFlag("do_" + task, 'sstate-outputdirs', True) or "").split() - plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs', True) or "").split() - lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile', True) or "").split() - lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared', True) or "").split() - interceptfuncs = (d.getVarFlag("do_" + task, 'sstate-interceptfuncs', True) or "").split() + inputs = (d.getVarFlag("do_" + task, 'sstate-inputdirs') or "").split() + outputs = (d.getVarFlag("do_" + task, 'sstate-outputdirs') or "").split() + plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs') or "").split() + lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile') or "").split() + lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared') or "").split() + interceptfuncs = (d.getVarFlag("do_" + task, 'sstate-interceptfuncs') or "").split() if not task or len(inputs) != len(outputs): bb.fatal("sstate variables not setup correctly?!") @@ -425,7 +425,7 @@ def sstate_clean(ss, d): d2 = d.createCopy() stamp_clean = d.getVar("STAMPCLEAN") - extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True) + extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info') if extrainf: d2.setVar("SSTATE_MANMACH", extrainf) wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf) |