summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/classextend.py
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-24 16:25:37 -0500
committerSaul Wold <sgw@linux.intel.com>2012-10-26 09:12:15 -0700
commit132a182e2f6c330aa645de42c1aeb386e43bddd3 (patch)
treece89b7e694bbb723f1f15944a257226c1b86e2cf /meta/lib/oe/classextend.py
parent88b4ec0b8c7c75b8570fc201c705937b459bb43e (diff)
downloadopenembedded-core-contrib-132a182e2f6c330aa645de42c1aeb386e43bddd3.tar.gz
multilib: Add support for cross-canadian multilib packages
Add support for the generation of cross-canadian packages. Each cross-canadian package has: PN = "pkg-cross-canadian-${TRANSLATED_TARGET_ARCH}" in order for that to be evaluated properly with multilibs enabled, it was necessary to detect both the presence of the cross-canadian packages and then update the vars using the OVERRIDE for the multilib. Additional checks were made to ensure that any dependency that sais "cross-canadian" did not get prefixed with the MLPREFIX. Also, make sure that even when building multilib cross-canadian packages, we only use the single SDK PACKAGE_ARCH, we don't want or need variants. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/lib/oe/classextend.py')
-rw-r--r--meta/lib/oe/classextend.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index 857a6c97ef..c982fb7c3f 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -50,7 +50,7 @@ class ClassExtender(object):
return newdata
def map_depends(self, dep):
- if dep.endswith(("-native", "-native-runtime")):
+ if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep):
return dep
else:
return self.extend_name(dep)
@@ -93,7 +93,7 @@ class ClassExtender(object):
class NativesdkClassExtender(ClassExtender):
def map_depends(self, dep):
- if dep.endswith(("-native", "-native-runtime", "-cross")):
+ if dep.endswith(("-native", "-native-runtime", "-cross")) or ('nativesdk-' in dep):
return dep
elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")):
return dep + "-crosssdk"