diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 08:30:03 +0000 |
| commit | 7c552996597faaee2fbee185b250c0ee30ea3b5f (patch) | |
| tree | bb74186da3e2d4b03c33875a71fbe340ba09a0d7 /meta/classes/patch.bbclass | |
| parent | 84ec50e587e7464b260b1b189659b93b6dab0ef6 (diff) | |
| download | openembedded-core-contrib-7c552996597faaee2fbee185b250c0ee30ea3b5f.tar.gz | |
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\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/patch.bbclass')
| -rw-r--r-- | meta/classes/patch.bbclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 0e5b602462..23ba5df48b 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -11,7 +11,7 @@ PATCH_GIT_USER_EMAIL ?= "oe.patch@oe" inherit terminal python () { - if d.getVar('PATCHTOOL', True) == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS', True) == '1': + if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1': tasks = list(filter(lambda k: d.getVarFlag(k, "task", True), d.keys())) extratasks = [] def follow_chain(task, endtask, chain=None): @@ -44,8 +44,8 @@ python () { python patch_task_patch_prefunc() { # Prefunc for do_patch - func = d.getVar('BB_RUNTASK', True) - srcsubdir = d.getVar('S', True) + func = d.getVar('BB_RUNTASK') + srcsubdir = d.getVar('S') patchdir = os.path.join(srcsubdir, 'patches') if os.path.exists(patchdir): @@ -59,12 +59,12 @@ python patch_task_postfunc() { # Prefunc for task functions between do_unpack and do_patch import oe.patch import shutil - func = d.getVar('BB_RUNTASK', True) - srcsubdir = d.getVar('S', True) + func = d.getVar('BB_RUNTASK') + srcsubdir = d.getVar('S') if os.path.exists(srcsubdir): if func == 'do_patch': - haspatches = (d.getVar('PATCH_HAS_PATCHES_DIR', True) == '1') + haspatches = (d.getVar('PATCH_HAS_PATCHES_DIR') == '1') patchdir = os.path.join(srcsubdir, 'patches') if os.path.exists(patchdir): shutil.rmtree(patchdir) @@ -99,20 +99,20 @@ python patch_do_patch() { "git": oe.patch.GitApplyTree, } - cls = patchsetmap[d.getVar('PATCHTOOL', True) or 'quilt'] + cls = patchsetmap[d.getVar('PATCHTOOL') or 'quilt'] resolvermap = { "noop": oe.patch.NOOPResolver, "user": oe.patch.UserResolver, } - rcls = resolvermap[d.getVar('PATCHRESOLVE', True) or 'user'] + rcls = resolvermap[d.getVar('PATCHRESOLVE') or 'user'] classes = {} - s = d.getVar('S', True) + s = d.getVar('S') - os.putenv('PATH', d.getVar('PATH', True)) + os.putenv('PATH', d.getVar('PATH')) # We must use one TMPDIR per process so that the "patch" processes # don't generate the same temp file name. |