diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2017-09-24 06:04:24 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-25 14:18:38 +0100 |
| commit | b848c3cb495905605283c57c79f2ed8ca17758db (patch) | |
| tree | cf25c36b8df02667a2a0332fafa3e035f24257ae | |
| parent | dbc0eaf478feb3f752ae22fd184984494fc85d0a (diff) | |
| download | openembedded-core-b848c3cb495905605283c57c79f2ed8ca17758db.tar.gz openembedded-core-b848c3cb495905605283c57c79f2ed8ca17758db.tar.bz2 openembedded-core-b848c3cb495905605283c57c79f2ed8ca17758db.zip | |
scripts: drop True option to getVar calls
Search made with the following regex: getVar ?\((.*), True\).
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/checklayer/__init__.py | 8 | ||||
| -rw-r--r-- | scripts/lib/devtool/deploy.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index 6c2b86a79a..63952616ba 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py @@ -46,16 +46,16 @@ def _get_layer_collections(layer_path, lconf=None, data=None): raise LayerError(exc) ldata.expandVarref('LAYERDIR') - collections = (ldata.getVar('BBFILE_COLLECTIONS', True) or '').split() + collections = (ldata.getVar('BBFILE_COLLECTIONS') or '').split() if not collections: name = os.path.basename(layer_path) collections = [name] collections = {c: {} for c in collections} for name in collections: - priority = ldata.getVar('BBFILE_PRIORITY_%s' % name, True) - pattern = ldata.getVar('BBFILE_PATTERN_%s' % name, True) - depends = ldata.getVar('LAYERDEPENDS_%s' % name, True) + priority = ldata.getVar('BBFILE_PRIORITY_%s' % name) + pattern = ldata.getVar('BBFILE_PATTERN_%s' % name) + depends = ldata.getVar('LAYERDEPENDS_%s' % name) collections[name]['priority'] = priority collections[name]['pattern'] = pattern collections[name]['depends'] = depends diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index 7c571746c8..9cc492788b 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py @@ -178,13 +178,13 @@ def deploy(args, config, basepath, workspace): if args.strip and not args.dry_run: # Fakeroot copy to new destination srcdir = recipe_outdir - recipe_outdir = os.path.join(rd.getVar('WORKDIR', True), 'deploy-target-stripped') + recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'deploy-target-stripped') if os.path.isdir(recipe_outdir): bb.utils.remove(recipe_outdir, True) exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) - os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH', True) or '']) - oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP', True), rd.getVar('libdir', True), - rd.getVar('base_libdir', True)) + os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) + oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), + rd.getVar('base_libdir')) filelist = [] ftotalsize = 0 |