summaryrefslogtreecommitdiff
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-12-14 21:13:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-16 08:30:03 +0000
commit2dea9e490a98377010b3d4118d054814c317a735 (patch)
tree8f147f6c6ebc6c74838a69457d71fe7de5dbb3fd /meta/classes/sstate.bbclass
parent0a36bd96e6b29fd99a296efc358ca3e9fb5af735 (diff)
downloadopenembedded-core-2dea9e490a98377010b3d4118d054814c317a735.tar.gz
openembedded-core-2dea9e490a98377010b3d4118d054814c317a735.tar.bz2
openembedded-core-2dea9e490a98377010b3d4118d054814c317a735.zip
meta: remove True option to getVarFlag calls
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> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r--meta/classes/sstate.bbclass14
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)