summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-11-11 01:54:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-12 15:38:31 (GMT)
commit2cdcd4bfdf86b5466b9163e1e85c908ca4be64dd (patch)
tree619033abf871ea23283aed9394a0a9c08f5fe8c2 /meta
parentc5f8996b0dac4dc47832e54217e7171236e047dd (diff)
downloadpoky-2cdcd4bfdf86b5466b9163e1e85c908ca4be64dd.tar.gz
classextend: Do not extend for that already have multilib prefix
If a BSP supports two or more multilibs, for example: MULTILIBS = "multilib:lib32 multilib:lib64" and a variable is already extended to include multilib variants, for example in populate_sdk_base: commit 396371588c7fd2d691ca9c39cd02287e43cb665b Author: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Thu Jul 24 22:09:09 2014 +0100 populate_sdk_base: Extend TOOLCHAIN_TARGET_TASK to include multilib variants Most people expect the toolchain from a multilib build to contain multilib components. This change makes that happen and is easy for users to override should they want something different. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> The mapping clsextend.map_depends_variable("TOOLCHAIN_TARGET_TASK") ends up with a wrong double extended package name like: lib32-lib64-packagegroup-core-standalone-sdk-target This patch avoid such issues. (From OE-Core rev: c4e9b2aa894d59fe951038b3b73795b6891df70a) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/classextend.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index 68efca3..8da87b7 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -57,6 +57,13 @@ class ClassExtender(object):
57 if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep) or ('-crosssdk-' in dep): 57 if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep) or ('-crosssdk-' in dep):
58 return dep 58 return dep
59 else: 59 else:
60 # Do not extend for that already have multilib prefix
61 var = self.d.getVar("MULTILIB_VARIANTS", True)
62 if var:
63 var = var.split()
64 for v in var:
65 if dep.startswith(v):
66 return dep
60 return self.extend_name(dep) 67 return self.extend_name(dep)
61 68
62 def map_depends_variable(self, varname, suffix = ""): 69 def map_depends_variable(self, varname, suffix = ""):