[oe-commits] [bitbake] 05/05: 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.

commit 578f0c02f6a13f4315e7c2ce8b5e876dd2025055
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
    
    If you have no BBMULTICONFIG set but set mcdepends, they're currently
    ignored. We can handle them correctly with this small tweak.
    
    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..0008c2f 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -638,9 +638,13 @@ class BBCooker:
             runlist.append([mc, k, ktask, fn])
             bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data)
 
+        havemc = False
+        for mc in self.multiconfigs:
+            if taskdata[mc].get_mcdepends():
+                havemc = True
 
         # 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.