aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-28 17:38:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 10:32:29 +0100
commit9e03db2dfab0b534b86fd48c9190b2d7d0d21238 (patch)
treebc3bcfb5b28b44562d9c2b406488419fdaece646 /meta
parenteab33442480cc27a5cd00b3f46984fea74b7c0f9 (diff)
downloadopenembedded-core-9e03db2dfab0b534b86fd48c9190b2d7d0d21238.tar.gz
openembedded-core-9e03db2dfab0b534b86fd48c9190b2d7d0d21238.tar.bz2
openembedded-core-9e03db2dfab0b534b86fd48c9190b2d7d0d21238.zip
sstatesig: Move saferecipedeps handling to be earlier
We want to use the saferecipedeps handling code to allow gcc-cross-* to work on multiple different tunes. Its currently in target only code so it needs to be earlier to allow it to work on native-> target dependencies. This change has no effect on existing uses but makes gcc-cross become shared as desired. 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')
-rw-r--r--meta/lib/oe/sstatesig.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 40f99744fb..acff2a0569 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -26,6 +26,10 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
if depname in excludelist and recipename != depname:
return False
+ # Exclude well defined recipe->dependency
+ if "%s->%s" % (recipename, depname) in siggen.saferecipedeps:
+ return False
+
# Don't change native/cross/nativesdk recipe dependencies any further
if isNative(recipename) or isCross(recipename) or isNativeSDK(recipename):
return True
@@ -40,10 +44,6 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
if depname in siggen.abisaferecipes and not isImage(fn):
return False
- # Exclude well defined recipe->dependency
- if "%s->%s" % (recipename, depname) in siggen.saferecipedeps:
- return False
-
# Kernel modules are well namespaced. We don't want to depend on the kernel's checksum
# if we're just doing an RRECOMMENDS_xxx = "kernel-module-*", not least because the checksum
# is machine specific.