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:27:19 +0100
commit9e5a3f40caa37141d292c6dd5914d4670ab57aff (patch)
tree9c918caf5d0196d0af60b16b94bdc1fd0d09e94d /bitbake
parentf77badd46a62d8b594ec04b0fa955a19135eacb7 (diff)
downloadopenembedded-core-contrib-9e5a3f40caa37141d292c6dd5914d4670ab57aff.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: 578f0c02f6a13f4315e7c2ce8b5e876dd2025055) 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 e0cbed5378..0008c2fde1 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/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