From 9e03db2dfab0b534b86fd48c9190b2d7d0d21238 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 May 2014 17:38:36 +0100 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/lib/oe/sstatesig.py') 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. -- cgit 1.2.3-korg