[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3889/8267] bitbake: siggen: Fix clean_basepath to work with multiconfig

[Emmanuele Bassi <ebassi src gnome org>]

commit d6799e655e21c3c3ef60f5dec5eb53a693430a2f
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Dec 20 23:31:11 2016 +0000

    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 <richard purdie linuxfoundation org>

 bitbake/lib/bb/siggen.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 659d27d..4226c80 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):