From: Richard Purdie Date: Tue, 20 Dec 2016 23:31:11 +0000 (+0000) Subject: bitbake: siggen: Fix clean_basepath to work with multiconfig X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6799e655e21c3c3ef60f5dec5eb53a693430a2f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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: 4da296c0c93391ec37f8b6e2245071657759771e) Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 659d27dfd2e..4226c80c85d 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -352,9 +352,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):