Add wildcards to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
cover Add wildcards to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
Wildcard support in SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS allows the native tools that were in a hardcoded list to be specified in layer.conf with the other exclusions.
Joshua Watt (3):
sstatesig: Add recipe wildcard
ref-manual: Update documentation for SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
sstatesig: Move hardcoded native tools
documentation/ref-manual/ref-variables.xml | 18 ++++++++++++++++++ meta/conf/layer.conf | 5 +++++ meta/lib/oe/sstatesig.py | 9 ++++----- 3 files changed, 27 insertions(+), 5 deletions(-)
Signature · 1 line
2.14.3
RFC 1/3 sstatesig: Add recipe wildcard
The special string "*" on the left hand side of the dependency specification matches all recipes except the one on the right hand side.
--- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+)
meta/lib/oe/sstatesig.py +4 -0
@@ -37,6 +37,10 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache): if "%s->%s" % (recipename, depname) in siggen.saferecipedeps: return False + # Check for special wildcard + if "*->%s" % depname in siggen.saferecipedeps and recipename != depname: + return False + # Don't change native/cross/nativesdk recipe dependencies any further if isNative(recipename) or isCross(recipename) or isNativeSDK(recipename): return True
Signature · 1 line
2.14.3
RFC 2/3 ref-manual: Update SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
In reply to Joshua WattDescribes the new wildcard syntax in the documentation
--- documentation/ref-manual/ref-variables.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
documentation/ref-manual/ref-variables.xml +18 -0
@@ -12635,6 +12635,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" <filename>mplayer2</filename>. </para> + <para> + The special token <filename>"*"</filename> may be used on + the left hand side of the dependency, which has the special + meaning "all other recipes, except the one on the right hand + side. + For example: + <literallayout class='monospaced'> + SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "*->quilt-native" + </literallayout> + </para> + + <para> + In this example, all recipes except + <filename>quilt-native</filename> will ignore task + signatures from the <filename>quilt-native</filename> recipe + when determining their task signatures. + </para> + <para> Use of this variable is one mechanism to remove dependencies that affect task signatures and thus force rebuilds when a
Signature · 1 line
2.14.3
RFC 3/3 sstatesig: Move hardcoded native tools
In reply to Joshua WattNow that SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS supports the wildcard syntax, these exclusions no longer need to be hardcoded
--- meta/conf/layer.conf | 5 +++++ meta/lib/oe/sstatesig.py | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-)
meta/conf/layer.conf +5 -0
@@ -44,6 +44,11 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + *->quilt-native \ + *->subversion-native \ + *->git-native \ + *->ccache-native \ + *->icecc-create-env-native \ gcc-cross-${TARGET_ARCH}->virtual/${TARGET_PREFIX}libc-for-gcc \ gcc-cross-${TARGET_ARCH}->linux-libc-headers \ ppp-dialin->ppp \
meta/lib/oe/sstatesig.py +0 -5
@@ -28,11 +28,6 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache): return False return True - # Quilt (patch application) changing isn't likely to affect anything - excludelist = ['quilt-native', 'subversion-native', 'git-native', 'ccache-native', 'icecc-create-env-native'] - if depname in excludelist and recipename != depname: - return False - # Exclude well defined recipe->dependency if "%s->%s" % (recipename, depname) in siggen.saferecipedeps: return False
Signature · 1 line
2.14.3
Quoted 4 lines · Joshua Watt
Wildcard support in
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPSallows the native tools that were in a hardcoded list to be specified in layer.conf with
the other exclusions.
I was always reluctant to add wildcard support to this but it does make sense. It worked out ok in the testing I gave it. As we're at feature freeze, this would have to go in ASAP.
Cheers,
Richard
Quoted 11 lines · Richard Purdie
Quoted 5 lines · Joshua Watt
Wildcard support in
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPSallows the native
tools that were in a hardcoded list to be specified in layer.conf with
the other exclusions.I was always reluctant to add wildcard support to this but it does make
sense. It worked out ok in the testing I gave it. As we're at feature freeze, this would have to go in ASAP.
I was more worried about http://lists.openembedded.org/pipermail/openem
bedded-core/2018-February/147901.html, which looked like it already landed in master-next (886ffabca). I have no problem waiting for the next development cycle on this, unless someone *really* wants it.
Quoted 4 lines
Cheers,
Richard