diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-22 17:23:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-22 18:34:04 +0100 |
| commit | 2e80b5d10a5037ed6f0bc227a1f9b42529c87086 (patch) | |
| tree | 0c5deff7f4911614a8fb32de3f2fb8ea783886c6 | |
| parent | ac418e1112ff5f9c3157569316902f7a27fba4b4 (diff) | |
| download | bitbake-2e80b5d10a5037ed6f0bc227a1f9b42529c87086.tar.gz | |
siggen: Fix a subtle bug in hash calculation for shared work tasks
With a shared work task like gcc, the task can be run from a variety of
different recipes which may have different virtual extensions in place.
Depending on whether gcc-runtime or nativesdk-gcc-runtime's do_preconfigure
task is called for example will change the sorting of the task hashes due
to the way clean_basename currently works.
The correct thing to do here is sort on the base filename first, then any
extension when ordering the hashes. This means we do account for things
like recipes with both a native and non-native dependency but we also fix
the shared work case where we don't care whether it was a virtual version
or not.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/siggen.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 933311ccc..548f50dfc 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -295,7 +295,7 @@ def dump_this_task(outfile, d): def clean_basepath(a): if a.startswith("virtual:"): - b = a.rsplit(":", 1)[0] + ":" + a.rsplit("/", 1)[1] + b = a.rsplit("/", 1)[1] + ":" + a.rsplit(":", 1)[0] else: b = a.rsplit("/", 1)[1] return b |