[OE-core][PATCH] multilib.bbclass: fix new override syntax for virtclass-multilib
From: Chen Qi <hidden>
Date: 2021-08-09 02:32:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
the 'virtclass-multilib-xxx' is an override, so use ':' instead of '_' for TARGET_VENDOR and DEFAULTTUNE. Signed-off-by: Chen Qi <redacted> --- meta/classes/multilib.bbclass | 4 ++-- 1 file 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 () { 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) }
--
2.30.2