diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-20 23:31:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-11 17:21:46 +0000 |
commit | ba5ee79aba01a83055365176d3641bff94b46e7c (patch) | |
tree | e807909054b01ed1b2c33951966bacac92190832 /bitbake/lib | |
parent | f94e71c40afc34ab5d77e46d64897011f114c7c1 (diff) | |
download | poky-ba5ee79aba01a83055365176d3641bff94b46e7c.tar.gz |
bitbake: siggen: Fix clean_basepath to work with multiconfig
Tasknames can now start with "multiconfig:" which broke the virtual: comparison code and
lead to unpredictable checksums with nativesdk recipes. This adds in handling for
the new additional prefix which unbreaks nativesdk builds when using multiconfig.
(Bitbake rev: 0ca6b8438624d892ee7ef3b42df0024604b64567)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index c1685a9e46..40085b9c54 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -351,9 +351,14 @@ def dump_this_task(outfile, d): | |||
351 | bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp) | 351 | bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp) |
352 | 352 | ||
353 | def clean_basepath(a): | 353 | def clean_basepath(a): |
354 | mc = None | ||
355 | if a.startswith("multiconfig:"): | ||
356 | _, mc, a = a.split(":", 2) | ||
354 | b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2] | 357 | b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2] |
355 | if a.startswith("virtual:"): | 358 | if a.startswith("virtual:"): |
356 | b = b + ":" + a.rsplit(":", 1)[0] | 359 | b = b + ":" + a.rsplit(":", 1)[0] |
360 | if mc: | ||
361 | b = b + ":multiconfig:" + mc | ||
357 | return b | 362 | return b |
358 | 363 | ||
359 | def clean_basepaths(a): | 364 | def clean_basepaths(a): |