[oe-commits] [bitbake] branch master-next updated: cooker: Ensure mcdeps are processed even if only one multiconfig

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/master-next by this push:
     new 98bb939  cooker: Ensure mcdeps are processed even if only one multiconfig
98bb939 is described below

commit 98bb93968fc7d51946ed3279c35edf8f37e8ba81
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Jun 10 23:23:26 2019 +0100

    cooker: Ensure mcdeps are processed even if only one multiconfig
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cooker.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index e0cbed5..9c7597f 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -610,10 +610,14 @@ class BBCooker:
         taskdata = {}
         localdata = {}
 
+        havemc = False
+
         for mc in self.multiconfigs:
             taskdata[mc] = bb.taskdata.TaskData(abort, skiplist=self.skiplist, allowincomplete=allowincomplete)
             localdata[mc] = data.createCopy(self.databuilder.mcdata[mc])
             bb.data.expandKeys(localdata[mc])
+            if taskdata[mc].get_mcdepends():
+                havemc = True
 
         current = 0
         runlist = []
@@ -640,7 +644,7 @@ class BBCooker:
 
 
         # No need to do check providers if there are no mcdeps or not an mc build
-        if len(self.multiconfigs) > 1:
+        if havemc or len(self.multiconfigs) > 1:
             seen = set()
             new = True
             # Make sure we can provide the multiconfig dependency

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