summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:02:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 22:05:14 (GMT)
commit471310e5e75d35e572edd1a5638aa3999439e2f3 (patch)
tree790c0e0c266299cfc497d4b10ff5ac970dc95ccb
parentda467519c2624496ad8f939bf494e8f9aff4d9e3 (diff)
downloadpoky-471310e5e75d35e572edd1a5638aa3999439e2f3.tar.gz
bitbake: cooker/toasterui: Drop SEND_DEPENDS_TREE UI feature
Now the event is sent unconditionally we can drop this feature as its no longer needed. (Bitbake rev: 473deeb0fc6065693e1fcfcbb8b79753103db537) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py8
-rw-r--r--bitbake/lib/bb/ui/toasterui.py2
2 files changed, 2 insertions, 8 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index fe6fc99..5b76b4d 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -93,7 +93,7 @@ class SkippedPackage:
93 93
94 94
95class CookerFeatures(object): 95class CookerFeatures(object):
96 _feature_list = [HOB_EXTRA_CACHES, SEND_DEPENDS_TREE, BASEDATASTORE_TRACKING, SEND_SANITYEVENTS] = range(4) 96 _feature_list = [HOB_EXTRA_CACHES, BASEDATASTORE_TRACKING, SEND_SANITYEVENTS] = range(3)
97 97
98 def __init__(self): 98 def __init__(self):
99 self._features=set() 99 self._features=set()
@@ -360,15 +360,9 @@ class BBCooker:
360 # set our handler's event processor 360 # set our handler's event processor
361 event = EventWriter(self) # self is the cooker here 361 event = EventWriter(self) # self is the cooker here
362 362
363
364 # set up cooker features for this mock UI handler
365
366 # we need to write the dependency tree in the log
367 self.featureset.setFeature(CookerFeatures.SEND_DEPENDS_TREE)
368 # register the log file writer as UI Handler 363 # register the log file writer as UI Handler
369 bb.event.register_UIHhandler(EventLogWriteHandler()) 364 bb.event.register_UIHhandler(EventLogWriteHandler())
370 365
371
372 # 366 #
373 # Copy of the data store which has been expanded. 367 # Copy of the data store which has been expanded.
374 # Used for firing events and accessing variables where expansion needs to be accounted for 368 # Used for firing events and accessing variables where expansion needs to be accounted for
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index addd5cc..c2d41f7 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -39,7 +39,7 @@ import os
39# module properties for UI modules are read by bitbake and the contract should not be broken 39# module properties for UI modules are read by bitbake and the contract should not be broken
40 40
41 41
42featureSet = [bb.cooker.CookerFeatures.HOB_EXTRA_CACHES, bb.cooker.CookerFeatures.SEND_DEPENDS_TREE, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING, bb.cooker.CookerFeatures.SEND_SANITYEVENTS] 42featureSet = [bb.cooker.CookerFeatures.HOB_EXTRA_CACHES, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING, bb.cooker.CookerFeatures.SEND_SANITYEVENTS]
43 43
44logger = logging.getLogger("ToasterLogger") 44logger = logging.getLogger("ToasterLogger")
45interactive = sys.stdout.isatty() 45interactive = sys.stdout.isatty()