mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -18,7 +18,7 @@ def image_buildinfo_outputvars(vars, listvars, d):
|
||||
listvars = listvars.split()
|
||||
ret = ""
|
||||
for var in vars:
|
||||
value = d.getVar(var, True) or ""
|
||||
value = d.getVar(var) or ""
|
||||
if (d.getVarFlag(var, 'type', True) == "list"):
|
||||
value = oe.utils.squashspaces(value)
|
||||
ret += "%s = %s\n" % (var, value)
|
||||
@@ -42,7 +42,7 @@ def get_layer_git_status(path):
|
||||
|
||||
# Returns layer revisions along with their respective status
|
||||
def get_layer_revs(d):
|
||||
layers = (d.getVar("BBLAYERS", True) or "").split()
|
||||
layers = (d.getVar("BBLAYERS") or "").split()
|
||||
medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
|
||||
base_get_metadata_git_branch(i, None).strip(), \
|
||||
base_get_metadata_git_revision(i, None), \
|
||||
@@ -52,11 +52,11 @@ def get_layer_revs(d):
|
||||
|
||||
def buildinfo_target(d):
|
||||
# Get context
|
||||
if d.getVar('BB_WORKERCONTEXT', True) != '1':
|
||||
if d.getVar('BB_WORKERCONTEXT') != '1':
|
||||
return ""
|
||||
# Single and list variables to be read
|
||||
vars = (d.getVar("IMAGE_BUILDINFO_VARS", True) or "")
|
||||
listvars = (d.getVar("IMAGE_BUILDINFO_LVARS", True) or "")
|
||||
vars = (d.getVar("IMAGE_BUILDINFO_VARS") or "")
|
||||
listvars = (d.getVar("IMAGE_BUILDINFO_LVARS") or "")
|
||||
return image_buildinfo_outputvars(vars, listvars, d)
|
||||
|
||||
# Write build information to target filesystem
|
||||
|
||||
Reference in New Issue
Block a user