[oe-commits] [bitbake] 03/07: siggen: Fix clean_basepath to work with multiconfig

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 4da296c0c93391ec37f8b6e2245071657759771e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Dec 20 23:31:11 2016 +0000

    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 at linuxfoundation.org>
---
 lib/bb/siggen.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 659d27d..4226c80 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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.