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/classes/native.bbclass | |
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/classes/native.bbclass')
-rw-r--r-- | meta/classes/native.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 143f8a9147..5592e1d1c1 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -116,18 +116,18 @@ MACHINEOVERRIDES = "" | |||
116 | PATH_prepend = "${COREBASE}/scripts/native-intercept:" | 116 | PATH_prepend = "${COREBASE}/scripts/native-intercept:" |
117 | 117 | ||
118 | python native_virtclass_handler () { | 118 | python native_virtclass_handler () { |
119 | classextend = e.data.getVar('BBCLASSEXTEND', True) or "" | 119 | classextend = e.data.getVar('BBCLASSEXTEND') or "" |
120 | if "native" not in classextend: | 120 | if "native" not in classextend: |
121 | return | 121 | return |
122 | 122 | ||
123 | pn = e.data.getVar("PN", True) | 123 | pn = e.data.getVar("PN") |
124 | if not pn.endswith("-native"): | 124 | if not pn.endswith("-native"): |
125 | return | 125 | return |
126 | 126 | ||
127 | def map_dependencies(varname, d, suffix = ""): | 127 | def map_dependencies(varname, d, suffix = ""): |
128 | if suffix: | 128 | if suffix: |
129 | varname = varname + "_" + suffix | 129 | varname = varname + "_" + suffix |
130 | deps = d.getVar(varname, True) | 130 | deps = d.getVar(varname) |
131 | if not deps: | 131 | if not deps: |
132 | return | 132 | return |
133 | deps = bb.utils.explode_deps(deps) | 133 | deps = bb.utils.explode_deps(deps) |
@@ -146,14 +146,14 @@ python native_virtclass_handler () { | |||
146 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native") | 146 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native") |
147 | 147 | ||
148 | map_dependencies("DEPENDS", e.data) | 148 | map_dependencies("DEPENDS", e.data) |
149 | for pkg in [e.data.getVar("PN", True), "", "${PN}"]: | 149 | for pkg in [e.data.getVar("PN"), "", "${PN}"]: |
150 | map_dependencies("RDEPENDS", e.data, pkg) | 150 | map_dependencies("RDEPENDS", e.data, pkg) |
151 | map_dependencies("RRECOMMENDS", e.data, pkg) | 151 | map_dependencies("RRECOMMENDS", e.data, pkg) |
152 | map_dependencies("RSUGGESTS", e.data, pkg) | 152 | map_dependencies("RSUGGESTS", e.data, pkg) |
153 | map_dependencies("RPROVIDES", e.data, pkg) | 153 | map_dependencies("RPROVIDES", e.data, pkg) |
154 | map_dependencies("RREPLACES", e.data, pkg) | 154 | map_dependencies("RREPLACES", e.data, pkg) |
155 | 155 | ||
156 | provides = e.data.getVar("PROVIDES", True) | 156 | provides = e.data.getVar("PROVIDES") |
157 | nprovides = [] | 157 | nprovides = [] |
158 | for prov in provides.split(): | 158 | for prov in provides.split(): |
159 | if prov.find(pn) != -1: | 159 | if prov.find(pn) != -1: |