From ba5ee79aba01a83055365176d3641bff94b46e7c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Dec 2016 23:31:11 +0000 Subject: 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 --- bitbake/lib/bb/siggen.py | 5 +++++ 1 file changed, 5 insertions(+) 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): bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp) def clean_basepath(a): + mc = None + if a.startswith("multiconfig:"): + _, mc, a = a.split(":", 2) b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2] if a.startswith("virtual:"): b = b + ":" + a.rsplit(":", 1)[0] + if mc: + b = b + ":multiconfig:" + mc return b def clean_basepaths(a): -- cgit 1.2.3-korg