[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4099/8267] bitbake: cooker: Only add universe targets where the task exists



commit 918736d6c94753ef0ae53457662cb09dbd6b092c
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Jan 16 14:40:24 2017 +0000

    bitbake: cooker: Only add universe targets where the task exists
    
    Currently "bitbake universe -c fetch" will error if every task in the system
    doesn't have a fetch task. This seems unreasonable so filter the list based
    upon whether the task exists. This implementation does assume if a task exits
    for a given provider name, it can run, even if the preferred provider that
    ends up getting built might be the namespace without the task. This is unlikely
    to be a real world issue at this point.
    
    (Bitbake rev: 438986f4e39974930ee3205ca4c4d620090e57bb)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cooker.py |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 5608845..a7b9745 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1704,6 +1704,15 @@ class BBCooker:
             pkgs_to_build.remove('universe')
             for mc in self.multiconfigs:
                 for t in self.recipecaches[mc].universe_target:
+                    if task:
+                        foundtask = False
+                        for provider_fn in self.recipecaches[mc].providers[t]:
+                            if task in self.recipecaches[mc].task_deps[provider_fn]['tasks']:
+                                foundtask = True
+                                break
+                        if not foundtask:
+                            bb.debug(1, "Skipping %s for universe tasks as task %s doesn't exist" % (t, 
task))
+                            continue
                     if mc:
                         t = "multiconfig:" + mc + ":" + t
                     pkgs_to_build.append(t)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]