From 38a6b64f1c3090e7f1ef17f56f4b7f24aa8a92f4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 10 Jun 2019 23:23:26 +0100 Subject: 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 --- bitbake/lib/bb/cooker.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bitbake') 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: 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 -- cgit v1.2.3-54-g00ecf