aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-10 23:23:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-11 13:27:33 +0100
commit2aaea2f72e0c37451e7c7851b3a32abd733b38e1 (patch)
tree2d45315f67b7fb68ae224a8336a5d09cc6cdc018
parent7cda98d64693d978ad1387fed05a83aaa681e097 (diff)
downloadbitbake-2aaea2f72e0c37451e7c7851b3a32abd733b38e1.tar.gz
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@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 9ccaa79f5..5bb7de943 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