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 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-core/meta/meta-environment.bb | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.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\)
(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>
Diffstat (limited to 'meta/recipes-core/meta/meta-environment.bb')
-rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 71e0c23186..a250cc89fe 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb | |||
@@ -26,16 +26,16 @@ python do_generate_content() { | |||
26 | localdata = bb.data.createCopy(d) | 26 | localdata = bb.data.createCopy(d) |
27 | 27 | ||
28 | # make sure we only use the WORKDIR value from 'd', or it can change | 28 | # make sure we only use the WORKDIR value from 'd', or it can change |
29 | localdata.setVar('WORKDIR', d.getVar('WORKDIR', True)) | 29 | localdata.setVar('WORKDIR', d.getVar('WORKDIR')) |
30 | 30 | ||
31 | # make sure we only use the SDKTARGETSYSROOT value from 'd' | 31 | # make sure we only use the SDKTARGETSYSROOT value from 'd' |
32 | localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True)) | 32 | localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT')) |
33 | localdata.setVar('libdir', d.getVar('target_libdir', False)) | 33 | localdata.setVar('libdir', d.getVar('target_libdir', False)) |
34 | 34 | ||
35 | # Process DEFAULTTUNE | 35 | # Process DEFAULTTUNE |
36 | bb.build.exec_func("create_sdk_files", localdata) | 36 | bb.build.exec_func("create_sdk_files", localdata) |
37 | 37 | ||
38 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" | 38 | variants = d.getVar("MULTILIB_VARIANTS") or "" |
39 | for item in variants.split(): | 39 | for item in variants.split(): |
40 | # Load overrides from 'd' to avoid having to reset the value... | 40 | # Load overrides from 'd' to avoid having to reset the value... |
41 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 41 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |