diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-28 17:38:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-29 17:53:40 +0100 |
| commit | 963c8ea99d71fef027a60c2142f4785c64bbfb66 (patch) | |
| tree | 4b9f7730e00c55bae9a5ddea7d597dcf78d33fa8 | |
| parent | 0aad3ebc9313e9683d3a2605284c8d14a225afaa (diff) | |
| download | poky-963c8ea99d71fef027a60c2142f4785c64bbfb66.tar.gz | |
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.
(From OE-Core rev: 9e03db2dfab0b534b86fd48c9190b2d7d0d21238)
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>
| -rw-r--r-- | meta/lib/oe/sstatesig.py | 8 |
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): | |||
| 26 | if depname in excludelist and recipename != depname: | 26 | if depname in excludelist and recipename != depname: |
| 27 | return False | 27 | return False |
| 28 | 28 | ||
| 29 | # Exclude well defined recipe->dependency | ||
| 30 | if "%s->%s" % (recipename, depname) in siggen.saferecipedeps: | ||
| 31 | return False | ||
| 32 | |||
| 29 | # Don't change native/cross/nativesdk recipe dependencies any further | 33 | # Don't change native/cross/nativesdk recipe dependencies any further |
| 30 | if isNative(recipename) or isCross(recipename) or isNativeSDK(recipename): | 34 | if isNative(recipename) or isCross(recipename) or isNativeSDK(recipename): |
| 31 | return True | 35 | return True |
| @@ -40,10 +44,6 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache): | |||
| 40 | if depname in siggen.abisaferecipes and not isImage(fn): | 44 | if depname in siggen.abisaferecipes and not isImage(fn): |
| 41 | return False | 45 | return False |
| 42 | 46 | ||
| 43 | # Exclude well defined recipe->dependency | ||
| 44 | if "%s->%s" % (recipename, depname) in siggen.saferecipedeps: | ||
| 45 | return False | ||
| 46 | |||
| 47 | # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum | 47 | # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum |
| 48 | # if we're just doing an RRECOMMENDS_xxx = "kernel-module-*", not least because the checksum | 48 | # if we're just doing an RRECOMMENDS_xxx = "kernel-module-*", not least because the checksum |
| 49 | # is machine specific. | 49 | # is machine specific. |
