summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-20 23:31:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:13:07 +0000
commit0ca6b8438624d892ee7ef3b42df0024604b64567 (patch)
tree9a8a97d439b2b4138973cc568c840d784d7fe21c
parentdfb775c67a96a79f3b85104870c0ade46ef2a9ea (diff)
downloadbitbake-contrib-0ca6b8438624d892ee7ef3b42df0024604b64567.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/siggen.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index c1685a9e4..40085b9c5 100644
--- a/lib/bb/siggen.py
+++ b/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):