[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6630/8267] bitbake: bitbake: Add MultiConfigParsed event

[Emmanuele Bassi <ebassi src gnome org>]

commit bca4396106a51c7eba1da5fcbaba5e4e4964ca91
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Thu Jul 6 12:53:33 2017 +0100

    bitbake: bitbake: Add MultiConfigParsed event
    
    There are some cases where the metadata needs to be aware a multiconfig build
    is happening and have access to the multiconfig data stores to merge data into
    the common build. This adds such an event allowing access to these datastores.
    
    (Bitbake rev: 160e47f5df90850e64dcb857c81a5039abc9235f)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cookerdata.py |    2 ++
 bitbake/lib/bb/event.py      |    6 ++++++
 bitbake/lib/bb/ui/knotty.py  |    1 +
 3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 4d32aa0..644bb38 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -294,6 +294,8 @@ class CookerDataBuilder(object):
                 mcdata = self.parseConfigurationFiles(self.prefiles, self.postfiles, config)
                 bb.event.fire(bb.event.ConfigParsed(), mcdata)
                 self.mcdata[config] = mcdata
+            if multiconfig:
+                bb.event.fire(bb.event.MultiConfigParsed(self.mcdata), self.data)
 
         except (SyntaxError, bb.BBHandledException):
             raise bb.BBHandledException
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 6ccd4bd..1462382 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -358,6 +358,12 @@ class OperationProgress(Event):
 class ConfigParsed(Event):
     """Configuration Parsing Complete"""
 
+class MultiConfigParsed(Event):
+    """Multi-Config Parsing Complete"""
+    def __init__(self, mcdata):
+        self.mcdata = mcdata
+        Event.__init__(self)
+
 class RecipeEvent(Event):
     def __init__(self, fn):
         self.fn = fn
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index a19c3b3..936d5a4 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -664,6 +664,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
                                   bb.event.MetadataEvent,
                                   bb.event.StampUpdate,
                                   bb.event.ConfigParsed,
+                                  bb.event.MultiConfigParsed,
                                   bb.event.RecipeParsed,
                                   bb.event.RecipePreFinalise,
                                   bb.runqueue.runQueueEvent,