diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-20 23:31:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-21 16:49:51 +0000 |
commit | 4da296c0c93391ec37f8b6e2245071657759771e (patch) | |
tree | 0dc39a3de3b55bd7fb68a9a021edbc12ac7b674c | |
parent | d93ddd185dde53f50aea06ada094bb0d9b5ba4f0 (diff) | |
download | openembedded-core-contrib-4da296c0c93391ec37f8b6e2245071657759771e.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.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 659d27dfd2..4226c80c85 100644 --- a/lib/bb/siggen.py +++ b/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): |