summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/base.bbclass36
1 files changed, 18 insertions, 18 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 8c8697761c..f6b63fa8dc 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -225,12 +225,12 @@ python base_eventhandler() {
225 import bb.runqueue 225 import bb.runqueue
226 226
227 if isinstance(e, bb.event.ConfigParsed): 227 if isinstance(e, bb.event.ConfigParsed):
228 if not e.data.getVar("NATIVELSBSTRING", False): 228 if not d.getVar("NATIVELSBSTRING", False):
229 e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data)) 229 d.setVar("NATIVELSBSTRING", lsb_distro_identifier(d))
230 e.data.setVar('BB_VERSION', bb.__version__) 230 d.setVar('BB_VERSION', bb.__version__)
231 pkgarch_mapping(e.data) 231 pkgarch_mapping(d)
232 oe.utils.features_backfill("DISTRO_FEATURES", e.data) 232 oe.utils.features_backfill("DISTRO_FEATURES", d)
233 oe.utils.features_backfill("MACHINE_FEATURES", e.data) 233 oe.utils.features_backfill("MACHINE_FEATURES", d)
234 # Works with the line in layer.conf which changes PATH to point here 234 # Works with the line in layer.conf which changes PATH to point here
235 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS', d) 235 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS', d)
236 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS_NONFATAL', d, fatal=False) 236 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS_NONFATAL', d, fatal=False)
@@ -246,7 +246,7 @@ python base_eventhandler() {
246 e.mcdata[''].setVar("SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS", deps) 246 e.mcdata[''].setVar("SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS", deps)
247 247
248 if isinstance(e, bb.event.BuildStarted): 248 if isinstance(e, bb.event.BuildStarted):
249 localdata = bb.data.createCopy(e.data) 249 localdata = bb.data.createCopy(d)
250 statuslines = [] 250 statuslines = []
251 for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata): 251 for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata):
252 g = globals() 252 g = globals()
@@ -257,7 +257,7 @@ python base_eventhandler() {
257 if flines: 257 if flines:
258 statuslines.extend(flines) 258 statuslines.extend(flines)
259 259
260 statusheader = e.data.getVar('BUILDCFG_HEADER') 260 statusheader = d.getVar('BUILDCFG_HEADER')
261 if statusheader: 261 if statusheader:
262 bb.plain('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines))) 262 bb.plain('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines)))
263 263
@@ -265,23 +265,23 @@ python base_eventhandler() {
265 # target ones and we'd see dulpicate key names overwriting each other 265 # target ones and we'd see dulpicate key names overwriting each other
266 # for various PREFERRED_PROVIDERS 266 # for various PREFERRED_PROVIDERS
267 if isinstance(e, bb.event.RecipePreFinalise): 267 if isinstance(e, bb.event.RecipePreFinalise):
268 if e.data.getVar("TARGET_PREFIX") == e.data.getVar("SDK_PREFIX"): 268 if d.getVar("TARGET_PREFIX") == d.getVar("SDK_PREFIX"):
269 e.data.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils") 269 d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils")
270 e.data.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial") 270 d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial")
271 e.data.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc") 271 d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc")
272 e.data.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++") 272 d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++")
273 e.data.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs") 273 d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs")
274 274
275 if isinstance(e, bb.runqueue.sceneQueueComplete): 275 if isinstance(e, bb.runqueue.sceneQueueComplete):
276 completions = e.data.expand("${STAGING_DIR}/sstatecompletions") 276 completions = d.expand("${STAGING_DIR}/sstatecompletions")
277 if os.path.exists(completions): 277 if os.path.exists(completions):
278 cmds = set() 278 cmds = set()
279 with open(completions, "r") as f: 279 with open(completions, "r") as f:
280 cmds = set(f) 280 cmds = set(f)
281 e.data.setVar("completion_function", "\n".join(cmds)) 281 d.setVar("completion_function", "\n".join(cmds))
282 e.data.setVarFlag("completion_function", "func", "1") 282 d.setVarFlag("completion_function", "func", "1")
283 bb.debug(1, "Executing SceneQueue Completion commands: %s" % "\n".join(cmds)) 283 bb.debug(1, "Executing SceneQueue Completion commands: %s" % "\n".join(cmds))
284 bb.build.exec_func("completion_function", e.data) 284 bb.build.exec_func("completion_function", d)
285 os.remove(completions) 285 os.remove(completions)
286 286
287 if isinstance(e, bb.event.RecipeParsed): 287 if isinstance(e, bb.event.RecipeParsed):