summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse/ast.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/parse/ast.py')
-rw-r--r--bitbake/lib/bb/parse/ast.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index fa83b18981..a3990e5b3e 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -407,7 +407,7 @@ def _expand_versions(versions):
407 versions = itertools.chain(newversions, versions) 407 versions = itertools.chain(newversions, versions)
408 408
409def multi_finalize(fn, d): 409def multi_finalize(fn, d):
410 appends = (d.getVar("__BBAPPEND", True) or "").split() 410 appends = (d.getVar("__BBAPPEND") or "").split()
411 for append in appends: 411 for append in appends:
412 logger.debug(1, "Appending .bbappend file %s to %s", append, fn) 412 logger.debug(1, "Appending .bbappend file %s to %s", append, fn)
413 bb.parse.BBHandler.handle(append, d, True) 413 bb.parse.BBHandler.handle(append, d, True)
@@ -422,16 +422,16 @@ def multi_finalize(fn, d):
422 d.setVar("__SKIPPED", e.args[0]) 422 d.setVar("__SKIPPED", e.args[0])
423 datastores = {"": safe_d} 423 datastores = {"": safe_d}
424 424
425 versions = (d.getVar("BBVERSIONS", True) or "").split() 425 versions = (d.getVar("BBVERSIONS") or "").split()
426 if versions: 426 if versions:
427 pv = orig_pv = d.getVar("PV", True) 427 pv = orig_pv = d.getVar("PV")
428 baseversions = {} 428 baseversions = {}
429 429
430 def verfunc(ver, d, pv_d = None): 430 def verfunc(ver, d, pv_d = None):
431 if pv_d is None: 431 if pv_d is None:
432 pv_d = d 432 pv_d = d
433 433
434 overrides = d.getVar("OVERRIDES", True).split(":") 434 overrides = d.getVar("OVERRIDES").split(":")
435 pv_d.setVar("PV", ver) 435 pv_d.setVar("PV", ver)
436 overrides.append(ver) 436 overrides.append(ver)
437 bpv = baseversions.get(ver) or orig_pv 437 bpv = baseversions.get(ver) or orig_pv
@@ -466,7 +466,7 @@ def multi_finalize(fn, d):
466 466
467 _create_variants(datastores, versions, verfunc, onlyfinalise) 467 _create_variants(datastores, versions, verfunc, onlyfinalise)
468 468
469 extended = d.getVar("BBCLASSEXTEND", True) or "" 469 extended = d.getVar("BBCLASSEXTEND") or ""
470 if extended: 470 if extended:
471 # the following is to support bbextends with arguments, for e.g. multilib 471 # the following is to support bbextends with arguments, for e.g. multilib
472 # an example is as follows: 472 # an example is as follows:
@@ -484,7 +484,7 @@ def multi_finalize(fn, d):
484 else: 484 else:
485 extendedmap[ext] = ext 485 extendedmap[ext] = ext
486 486
487 pn = d.getVar("PN", True) 487 pn = d.getVar("PN")
488 def extendfunc(name, d): 488 def extendfunc(name, d):
489 if name != extendedmap[name]: 489 if name != extendedmap[name]:
490 d.setVar("BBEXTENDCURR", extendedmap[name]) 490 d.setVar("BBEXTENDCURR", extendedmap[name])