diff options
Diffstat (limited to 'poky/meta/classes/multilib.bbclass')
| -rw-r--r-- | poky/meta/classes/multilib.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/poky/meta/classes/multilib.bbclass b/poky/meta/classes/multilib.bbclass index 2ef75c0d1..3cbda5d80 100644 --- a/poky/meta/classes/multilib.bbclass +++ b/poky/meta/classes/multilib.bbclass @@ -35,7 +35,7 @@ python multilib_virtclass_handler () { e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT')) override = ":virtclass-multilib-" + variant e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) - target_vendor = e.data.getVar("TARGET_VENDOR_" + "virtclass-multilib-" + variant, False) + target_vendor = e.data.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False) if target_vendor: e.data.setVar("TARGET_VENDOR", target_vendor) return @@ -82,7 +82,7 @@ python multilib_virtclass_handler () { e.data.setVar("WHITELIST_GPL-3.0", pkgs) # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data - newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) + newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) if newtune: e.data.setVar("DEFAULTTUNE", newtune) } @@ -176,7 +176,7 @@ def reset_alternative_priority(d): bb.debug(1, '%s: Setting ALTERNATIVE_PRIORITY_%s to %s' % (pkg, pkg, reset_priority)) d.setVar('ALTERNATIVE_PRIORITY_%s' % pkg, reset_priority) - for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): + for alt_name in (d.getVar('ALTERNATIVE:%s' % pkg) or "").split(): # ALTERNATIVE_PRIORITY_pkg[tool] = priority alt_priority_pkg_name = d.getVarFlag('ALTERNATIVE_PRIORITY_%s' % pkg, alt_name) # ALTERNATIVE_PRIORITY[tool] = priority @@ -191,7 +191,7 @@ def reset_alternative_priority(d): bb.debug(1, '%s: Setting ALTERNATIVE_PRIORITY[%s] to %s' % (pkg, alt_name, reset_priority)) d.setVarFlag('ALTERNATIVE_PRIORITY', alt_name, reset_priority) -PACKAGEFUNCS_append = " do_package_qa_multilib" +PACKAGEFUNCS:append = " do_package_qa_multilib" python do_package_qa_multilib() { |