summaryrefslogtreecommitdiffstats
path: root/bitbake
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:28:26 +0100
commit38a6b64f1c3090e7f1ef17f56f4b7f24aa8a92f4 (patch)
tree29a15032e99e4d51c02225684424a4165fef968c /bitbake
parent254bef1d42174b8fd7d5c9ca6baa97a5ec7533be (diff)
downloadpoky-38a6b64f1c3090e7f1ef17f56f4b7f24aa8a92f4.tar.gz
bitbake: 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. (Bitbake rev: 2aaea2f72e0c37451e7c7851b3a32abd733b38e1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 9ccaa79f57..5bb7de9437 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -639,9 +639,13 @@ class BBCooker:
639 runlist.append([mc, k, ktask, fn]) 639 runlist.append([mc, k, ktask, fn])
640 bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data) 640 bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data)
641 641
642 havemc = False
643 for mc in self.multiconfigs:
644 if taskdata[mc].get_mcdepends():
645 havemc = True
642 646
643 # No need to do check providers if there are no mcdeps or not an mc build 647 # No need to do check providers if there are no mcdeps or not an mc build
644 if len(self.multiconfigs) > 1: 648 if havemc or len(self.multiconfigs) > 1:
645 seen = set() 649 seen = set()
646 new = True 650 new = True
647 # Make sure we can provide the multiconfig dependency 651 # Make sure we can provide the multiconfig dependency