diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-02-01 16:50:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-02 09:50:02 +0000 |
commit | 94149c4f374f31d5c780fd33e947170530cd81ec (patch) | |
tree | 2f4c9e8666efc8e0bbac014a13b5a15d738a5f9d /scripts | |
parent | 8c36e1557f51934bfc0172909d80f4d7825dd6d0 (diff) | |
download | poky-94149c4f374f31d5c780fd33e947170530cd81ec.tar.gz |
meta: remove True option to getVar and getVarFlag calls (again)
* True is default since 2016 and most layers were already updated
not to pass this parameter where not necessary, e.g. oe-core was
updated couple times, first in:
https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f
Updated with the same regexp as later oe-core update:
https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba
with small modification to replace not only d.getVar, but also data.getVar as in e.g.:
e.data.getVar('ERR_REPORT_USERNAME', True)
and for getVarFlag:
sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
(From OE-Core rev: 26c74fd10614582e177437608908eb43688ab510)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/contrib/image-manifest | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/menuconfig.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/contrib/image-manifest b/scripts/contrib/image-manifest index 3c07a73a4e..4d65a99258 100755 --- a/scripts/contrib/image-manifest +++ b/scripts/contrib/image-manifest | |||
@@ -392,7 +392,7 @@ def export_manifest_info(args): | |||
392 | for key in rd.getVarFlags('PACKAGECONFIG').keys(): | 392 | for key in rd.getVarFlags('PACKAGECONFIG').keys(): |
393 | if key == 'doc': | 393 | if key == 'doc': |
394 | continue | 394 | continue |
395 | rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key, True) | 395 | rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key) |
396 | 396 | ||
397 | if config['patches'] == 'yes': | 397 | if config['patches'] == 'yes': |
398 | patches = oe.recipeutils.get_recipe_patches(rd) | 398 | patches = oe.recipeutils.get_recipe_patches(rd) |
diff --git a/scripts/lib/devtool/menuconfig.py b/scripts/lib/devtool/menuconfig.py index d87a01e7a9..18daef30c3 100644 --- a/scripts/lib/devtool/menuconfig.py +++ b/scripts/lib/devtool/menuconfig.py | |||
@@ -45,7 +45,7 @@ def menuconfig(args, config, basepath, workspace): | |||
45 | return 1 | 45 | return 1 |
46 | 46 | ||
47 | check_workspace_recipe(workspace, args.component) | 47 | check_workspace_recipe(workspace, args.component) |
48 | pn = rd.getVar('PN', True) | 48 | pn = rd.getVar('PN') |
49 | 49 | ||
50 | if not rd.getVarFlag('do_menuconfig','task'): | 50 | if not rd.getVarFlag('do_menuconfig','task'): |
51 | raise DevtoolError("This recipe does not support menuconfig option") | 51 | raise DevtoolError("This recipe does not support menuconfig option") |