summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-09 13:29:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-11 12:27:22 +0100
commitbc19e915fbbb932f7ad7bb8a0b7fb3227f94562f (patch)
treea2618b4c0fb8e46bce86dc2eb84cc7642a625327 /meta/lib
parentfe0219ccc8c2a9e61be9ac5231fcae7b9d29ce5e (diff)
downloadpoky-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')
-rw-r--r--meta/lib/oe/classextend.py8
-rw-r--r--meta/lib/oe/sstatesig.py4
2 files changed, 6 insertions, 6 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):
52 return newdata 52 return newdata
53 53
54 def map_depends(self, dep): 54 def map_depends(self, dep):
55 if dep.endswith(("-native", "-native-runtime", "-crosssdk")) or ('nativesdk-' in dep) or ('cross-canadian' in dep): 55 if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep) or ('-crosssdk-' in dep):
56 return dep 56 return dep
57 else: 57 else:
58 return self.extend_name(dep) 58 return self.extend_name(dep)
@@ -96,9 +96,9 @@ class ClassExtender(object):
96 96
97class NativesdkClassExtender(ClassExtender): 97class NativesdkClassExtender(ClassExtender):
98 def map_depends(self, dep): 98 def map_depends(self, dep):
99 if dep.endswith(("-native", "-native-runtime", "-cross", "-crosssdk")) or ('nativesdk-' in dep): 99 if dep.endswith(("-gcc-initial", "-gcc", "-g++")):
100 return dep
101 elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")):
102 return dep + "-crosssdk" 100 return dep + "-crosssdk"
101 elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep):
102 return dep
103 else: 103 else:
104 return self.extend_name(dep) 104 return self.extend_name(dep)
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index aa25c3a10e..40f99744fb 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -5,7 +5,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
5 def isNative(x): 5 def isNative(x):
6 return x.endswith("-native") 6 return x.endswith("-native")
7 def isCross(x): 7 def isCross(x):
8 return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate") 8 return "-cross-" in x
9 def isNativeSDK(x): 9 def isNativeSDK(x):
10 return x.startswith("nativesdk-") 10 return x.startswith("nativesdk-")
11 def isKernel(fn): 11 def isKernel(fn):
@@ -139,7 +139,7 @@ def find_siginfo(pn, taskname, taskhashlist, d):
139 localdata.setVar('PV', '*') 139 localdata.setVar('PV', '*')
140 localdata.setVar('PR', '*') 140 localdata.setVar('PR', '*')
141 localdata.setVar('BB_TASKHASH', hashval) 141 localdata.setVar('BB_TASKHASH', hashval)
142 if pn.endswith('-native') or pn.endswith('-crosssdk') or pn.endswith('-cross'): 142 if pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn:
143 localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") 143 localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
144 sstatename = taskname[3:] 144 sstatename = taskname[3:]
145 filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG', True), sstatename) 145 filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG', True), sstatename)