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/glibc/glibc-ld.inc | |
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/glibc/glibc-ld.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-ld.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc index e2e24741f3..547c235eee 100644 --- a/meta/recipes-core/glibc/glibc-ld.inc +++ b/meta/recipes-core/glibc/glibc-ld.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | def ld_append_if_tune_exists(d, infos, dict): | 1 | def ld_append_if_tune_exists(d, infos, dict): |
2 | tune = d.getVar("DEFAULTTUNE", True) or "" | 2 | tune = d.getVar("DEFAULTTUNE") or "" |
3 | libdir = d.getVar("base_libdir", True) or "" | 3 | libdir = d.getVar("base_libdir") or "" |
4 | if tune in dict: | 4 | if tune in dict: |
5 | infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') | 5 | infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') |
6 | infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) | 6 | infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) |
@@ -32,7 +32,7 @@ def glibc_dl_info(d): | |||
32 | localdata.setVar("DEFAULTTUNE", original_tune) | 32 | localdata.setVar("DEFAULTTUNE", original_tune) |
33 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | 33 | ld_append_if_tune_exists(localdata, infos, ld_info_all) |
34 | 34 | ||
35 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" | 35 | variants = d.getVar("MULTILIB_VARIANTS") or "" |
36 | for item in variants.split(): | 36 | for item in variants.split(): |
37 | localdata = bb.data.createCopy(d) | 37 | localdata = bb.data.createCopy(d) |
38 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 38 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |