diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-09-26 18:01:04 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-27 09:44:55 +0100 |
commit | 7e2ff7c0125b40631eee7aeacf59c938bca6d586 (patch) | |
tree | 8584ff6f0b5c461c500d64cb61942ffe48cc0d2b /meta/lib | |
parent | ea220105609de30498f4ba72f5aeec180de4be2f (diff) | |
download | poky-7e2ff7c0125b40631eee7aeacf59c938bca6d586.tar.gz |
multilib - crosssdk: Stop building multilib for crosssdk packages
Crosssdk packages are not actually multilib packages, so treat them
the same as other nativesdk packages in the multilib, base, and
classextend components.
(From OE-Core rev: 15834451525453e0f7ceac25d4f98117f1825f37)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/classextend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index c982fb7c3f..c46332c785 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -50,7 +50,7 @@ class ClassExtender(object): | |||
50 | return newdata | 50 | return newdata |
51 | 51 | ||
52 | def map_depends(self, dep): | 52 | def map_depends(self, dep): |
53 | if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep): | 53 | if dep.endswith(("-native", "-native-runtime", "-crosssdk")) or ('nativesdk-' in dep) or ('cross-canadian' in dep): |
54 | return dep | 54 | return dep |
55 | else: | 55 | else: |
56 | return self.extend_name(dep) | 56 | return self.extend_name(dep) |
@@ -93,7 +93,7 @@ class ClassExtender(object): | |||
93 | 93 | ||
94 | class NativesdkClassExtender(ClassExtender): | 94 | class NativesdkClassExtender(ClassExtender): |
95 | def map_depends(self, dep): | 95 | def map_depends(self, dep): |
96 | if dep.endswith(("-native", "-native-runtime", "-cross")) or ('nativesdk-' in dep): | 96 | if dep.endswith(("-native", "-native-runtime", "-cross", "-crosssdk")) or ('nativesdk-' in dep): |
97 | return dep | 97 | return dep |
98 | elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")): | 98 | elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")): |
99 | return dep + "-crosssdk" | 99 | return dep + "-crosssdk" |