summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-02-27 16:47:53 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-01 22:13:56 +0000
commit4118603777ca24be0982bb0893d4902d239ca2a4 (patch)
treed41554863160bc74941bfd2e873f8c591f0a5575
parentc3582d36697cd6bdf2749ea7c8335a45160a279a (diff)
downloadpoky-4118603777ca24be0982bb0893d4902d239ca2a4.tar.gz
sstatesig: Move hardcoded native tools
Now that SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS supports the wildcard syntax, these exclusions no longer need to be hardcoded (From OE-Core rev: 891ca3c891f2ed5476442442bd9784ba10b9a94d) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/layer.conf5
-rw-r--r--meta/lib/oe/sstatesig.py5
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 67820588d3..df67716a2f 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -44,6 +44,11 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
44" 44"
45 45
46SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ 46SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
47 *->quilt-native \
48 *->subversion-native \
49 *->git-native \
50 *->ccache-native \
51 *->icecc-create-env-native \
47 gcc-cross-${TARGET_ARCH}->virtual/${TARGET_PREFIX}libc-for-gcc \ 52 gcc-cross-${TARGET_ARCH}->virtual/${TARGET_PREFIX}libc-for-gcc \
48 gcc-cross-${TARGET_ARCH}->linux-libc-headers \ 53 gcc-cross-${TARGET_ARCH}->linux-libc-headers \
49 ppp-dialin->ppp \ 54 ppp-dialin->ppp \
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index beed45b74f..b82e0f422e 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -29,11 +29,6 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
29 return False 29 return False
30 return True 30 return True
31 31
32 # Quilt (patch application) changing isn't likely to affect anything
33 excludelist = ['quilt-native', 'subversion-native', 'git-native', 'ccache-native', 'icecc-create-env-native']
34 if depname in excludelist and recipename != depname:
35 return False
36
37 # Exclude well defined recipe->dependency 32 # Exclude well defined recipe->dependency
38 if "%s->%s" % (recipename, depname) in siggen.saferecipedeps: 33 if "%s->%s" % (recipename, depname) in siggen.saferecipedeps:
39 return False 34 return False