diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-09 13:29:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 12:27:22 +0100 |
| commit | bc19e915fbbb932f7ad7bb8a0b7fb3227f94562f (patch) | |
| tree | a2618b4c0fb8e46bce86dc2eb84cc7642a625327 /meta/lib/oe/classextend.py | |
| parent | fe0219ccc8c2a9e61be9ac5231fcae7b9d29ce5e (diff) | |
| download | openembedded-core-contrib-bc19e915fbbb932f7ad7bb8a0b7fb3227f94562f.tar.gz | |
classes/lib/oe: Fix cross/crosssdk references
With the renaming of the cross packages, its no longer possible to use
endswith("-cross") and similar to detect cross packages. Replace these
references with other techniques.
This resolves certain build from sstate failures which were due to the
system believing cross packages were target packages and therefore
dependency handling was altered.
(From OE-Core rev: 91edf4cac223298e50a4b8e59dd19f1b272e3418)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/classextend.py')
| -rw-r--r-- | meta/lib/oe/classextend.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index e2ae7e9f94..14d6f20a88 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py @@ -52,7 +52,7 @@ class ClassExtender(object): return newdata def map_depends(self, dep): - if dep.endswith(("-native", "-native-runtime", "-crosssdk")) or ('nativesdk-' in dep) or ('cross-canadian' in dep): + if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep) or ('-crosssdk-' in dep): return dep else: return self.extend_name(dep) @@ -96,9 +96,9 @@ class ClassExtender(object): class NativesdkClassExtender(ClassExtender): def map_depends(self, dep): - if dep.endswith(("-native", "-native-runtime", "-cross", "-crosssdk")) or ('nativesdk-' in dep): - return dep - elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")): + if dep.endswith(("-gcc-initial", "-gcc", "-g++")): return dep + "-crosssdk" + elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): + return dep else: return self.extend_name(dep) |