[oe-commits] [bitbake] 01/02: cooker: Ensure mcdeps are processed even if only one multiconfig

git at git.openembedded.org git at git.openembedded.org
Tue Jun 11 12:29:20 UTC 2019


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

rpurdie pushed a commit to branch 1.42
in repository bitbake.

commit 2aaea2f72e0c37451e7c7851b3a32abd733b38e1
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 9ccaa79..5bb7de9 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -639,9 +639,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.


More information about the Openembedded-commits mailing list