summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cooker.py6
-rw-r--r--bitbake/lib/bb/providers.py5
2 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index f3252640cb..934072c44f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -658,7 +658,7 @@ class BBCooker:
658 if task is None: 658 if task is None:
659 task = self.configuration.cmd 659 task = self.configuration.cmd
660 660
661 fulltargetlist = self.checkPackages(pkgs_to_build) 661 fulltargetlist = self.checkPackages(pkgs_to_build, task)
662 taskdata = {} 662 taskdata = {}
663 localdata = {} 663 localdata = {}
664 664
@@ -1618,7 +1618,7 @@ class BBCooker:
1618 1618
1619 return True 1619 return True
1620 1620
1621 def checkPackages(self, pkgs_to_build): 1621 def checkPackages(self, pkgs_to_build, task=None):
1622 1622
1623 # Return a copy, don't modify the original 1623 # Return a copy, don't modify the original
1624 pkgs_to_build = pkgs_to_build[:] 1624 pkgs_to_build = pkgs_to_build[:]
@@ -1634,7 +1634,7 @@ class BBCooker:
1634 if 'world' in pkgs_to_build: 1634 if 'world' in pkgs_to_build:
1635 pkgs_to_build.remove('world') 1635 pkgs_to_build.remove('world')
1636 for mc in self.multiconfigs: 1636 for mc in self.multiconfigs:
1637 bb.providers.buildWorldTargetList(self.recipecaches[mc]) 1637 bb.providers.buildWorldTargetList(self.recipecaches[mc], task)
1638 for t in self.recipecaches[mc].world_target: 1638 for t in self.recipecaches[mc].world_target:
1639 if mc: 1639 if mc:
1640 t = "multiconfig:" + mc + ":" + t 1640 t = "multiconfig:" + mc + ":" + t
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index 80701b2811..db02a0b0de 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -402,7 +402,7 @@ def getRuntimeProviders(dataCache, rdepend):
402 return rproviders 402 return rproviders
403 403
404 404
405def buildWorldTargetList(dataCache): 405def buildWorldTargetList(dataCache, task=None):
406 """ 406 """
407 Build package list for "bitbake world" 407 Build package list for "bitbake world"
408 """ 408 """
@@ -413,6 +413,9 @@ def buildWorldTargetList(dataCache):
413 for f in dataCache.possible_world: 413 for f in dataCache.possible_world:
414 terminal = True 414 terminal = True
415 pn = dataCache.pkg_fn[f] 415 pn = dataCache.pkg_fn[f]
416 if task and task not in dataCache.task_deps[f]['tasks']:
417 logger.debug(2, "World build skipping %s as task %s doesn't exist", f, task)
418 terminal = False
416 419
417 for p in dataCache.pn_provides[pn]: 420 for p in dataCache.pn_provides[pn]:
418 if p.startswith('virtual/'): 421 if p.startswith('virtual/'):