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/toaster.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/toaster.bbclass')
-rw-r--r-- | meta/classes/toaster.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 4bddf34e9c..4ea20567a3 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass | |||
@@ -80,7 +80,7 @@ python toaster_layerinfo_dumpdata() { | |||
80 | return layer_info | 80 | return layer_info |
81 | 81 | ||
82 | 82 | ||
83 | bblayers = e.data.getVar("BBLAYERS", True) | 83 | bblayers = e.data.getVar("BBLAYERS") |
84 | 84 | ||
85 | llayerinfo = {} | 85 | llayerinfo = {} |
86 | 86 | ||
@@ -119,10 +119,10 @@ python toaster_package_dumpdata() { | |||
119 | """ | 119 | """ |
120 | 120 | ||
121 | # No need to try and dumpdata if the recipe isn't generating packages | 121 | # No need to try and dumpdata if the recipe isn't generating packages |
122 | if not d.getVar('PACKAGES', True): | 122 | if not d.getVar('PACKAGES'): |
123 | return | 123 | return |
124 | 124 | ||
125 | pkgdatadir = d.getVar('PKGDESTWORK', True) | 125 | pkgdatadir = d.getVar('PKGDESTWORK') |
126 | lpkgdata = {} | 126 | lpkgdata = {} |
127 | datadir = os.path.join(pkgdatadir, 'runtime') | 127 | datadir = os.path.join(pkgdatadir, 'runtime') |
128 | 128 | ||
@@ -142,7 +142,7 @@ python toaster_artifact_dumpdata() { | |||
142 | """ | 142 | """ |
143 | 143 | ||
144 | event_data = { | 144 | event_data = { |
145 | "TOOLCHAIN_OUTPUTNAME": d.getVar("TOOLCHAIN_OUTPUTNAME", True) | 145 | "TOOLCHAIN_OUTPUTNAME": d.getVar("TOOLCHAIN_OUTPUTNAME") |
146 | } | 146 | } |
147 | 147 | ||
148 | bb.event.fire(bb.event.MetadataEvent("SDKArtifactInfo", event_data), d) | 148 | bb.event.fire(bb.event.MetadataEvent("SDKArtifactInfo", event_data), d) |
@@ -157,9 +157,9 @@ python toaster_collect_task_stats() { | |||
157 | import bb.utils | 157 | import bb.utils |
158 | import os | 158 | import os |
159 | 159 | ||
160 | toaster_statlist_file = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), "toasterstatlist") | 160 | toaster_statlist_file = os.path.join(e.data.getVar('BUILDSTATS_BASE'), "toasterstatlist") |
161 | 161 | ||
162 | if not e.data.getVar('BUILDSTATS_BASE', True): | 162 | if not e.data.getVar('BUILDSTATS_BASE'): |
163 | return # if we don't have buildstats, we cannot collect stats | 163 | return # if we don't have buildstats, we cannot collect stats |
164 | 164 | ||
165 | def stat_to_float(value): | 165 | def stat_to_float(value): |
@@ -246,7 +246,7 @@ python toaster_buildhistory_dump() { | |||
246 | import re | 246 | import re |
247 | BUILDHISTORY_DIR = e.data.expand("${TOPDIR}/buildhistory") | 247 | BUILDHISTORY_DIR = e.data.expand("${TOPDIR}/buildhistory") |
248 | BUILDHISTORY_DIR_IMAGE_BASE = e.data.expand("%s/images/${MACHINE_ARCH}/${TCLIBC}/"% BUILDHISTORY_DIR) | 248 | BUILDHISTORY_DIR_IMAGE_BASE = e.data.expand("%s/images/${MACHINE_ARCH}/${TCLIBC}/"% BUILDHISTORY_DIR) |
249 | pkgdata_dir = e.data.getVar("PKGDATA_DIR", True) | 249 | pkgdata_dir = e.data.getVar("PKGDATA_DIR") |
250 | 250 | ||
251 | 251 | ||
252 | # scan the build targets for this build | 252 | # scan the build targets for this build |