diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2021-08-08 19:32:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-12 06:26:16 +0100 |
commit | 8ae0ee62cacb613f93f5b81ddf30083a97e39a43 (patch) | |
tree | 314fa3ba13bff642cb2e1b74af1eae67c7192428 /meta/classes | |
parent | 33ba016f4c5c6cb337a2e988d1880792f500647d (diff) | |
download | poky-8ae0ee62cacb613f93f5b81ddf30083a97e39a43.tar.gz |
multilib.bbclass: fix new override syntax for virtclass-multilib
the 'virtclass-multilib-xxx' is an override, so use ':' instead of
'_' for TARGET_VENDOR and DEFAULTTUNE.
(From OE-Core rev: a522972821339f42dcdddb334e843e21584bfbea)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/multilib.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index c3be89767a..3cbda5d806 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -35,7 +35,7 @@ python multilib_virtclass_handler () { | |||
35 | e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT')) | 35 | e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT')) |
36 | override = ":virtclass-multilib-" + variant | 36 | override = ":virtclass-multilib-" + variant |
37 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) | 37 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) |
38 | target_vendor = e.data.getVar("TARGET_VENDOR_" + "virtclass-multilib-" + variant, False) | 38 | target_vendor = e.data.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False) |
39 | if target_vendor: | 39 | if target_vendor: |
40 | e.data.setVar("TARGET_VENDOR", target_vendor) | 40 | e.data.setVar("TARGET_VENDOR", target_vendor) |
41 | return | 41 | return |
@@ -82,7 +82,7 @@ python multilib_virtclass_handler () { | |||
82 | e.data.setVar("WHITELIST_GPL-3.0", pkgs) | 82 | e.data.setVar("WHITELIST_GPL-3.0", pkgs) |
83 | 83 | ||
84 | # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data | 84 | # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data |
85 | newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) | 85 | newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) |
86 | if newtune: | 86 | if newtune: |
87 | e.data.setVar("DEFAULTTUNE", newtune) | 87 | e.data.setVar("DEFAULTTUNE", newtune) |
88 | } | 88 | } |