From: Richard Purdie Date: Fri, 13 May 2016 13:02:56 +0000 (+0100) Subject: cooker/toasterui: Drop SEND_DEPENDS_TREE UI feature X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=473deeb0fc6065693e1fcfcbb8b79753103db537;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cooker/toasterui: Drop SEND_DEPENDS_TREE UI feature Now the event is sent unconditionally we can drop this feature as its no longer needed. Signed-off-by: Richard Purdie --- diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index fe6fc99c1fb..5b76b4d20d1 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -93,7 +93,7 @@ class SkippedPackage: class CookerFeatures(object): - _feature_list = [HOB_EXTRA_CACHES, SEND_DEPENDS_TREE, BASEDATASTORE_TRACKING, SEND_SANITYEVENTS] = range(4) + _feature_list = [HOB_EXTRA_CACHES, BASEDATASTORE_TRACKING, SEND_SANITYEVENTS] = range(3) def __init__(self): self._features=set() @@ -360,15 +360,9 @@ class BBCooker: # set our handler's event processor event = EventWriter(self) # self is the cooker here - - # set up cooker features for this mock UI handler - - # we need to write the dependency tree in the log - self.featureset.setFeature(CookerFeatures.SEND_DEPENDS_TREE) # register the log file writer as UI Handler bb.event.register_UIHhandler(EventLogWriteHandler()) - # # Copy of the data store which has been expanded. # Used for firing events and accessing variables where expansion needs to be accounted for diff --git a/lib/bb/ui/toasterui.py b/lib/bb/ui/toasterui.py index addd5cc2faa..c2d41f791f3 100644 --- a/lib/bb/ui/toasterui.py +++ b/lib/bb/ui/toasterui.py @@ -39,7 +39,7 @@ import os # module properties for UI modules are read by bitbake and the contract should not be broken -featureSet = [bb.cooker.CookerFeatures.HOB_EXTRA_CACHES, bb.cooker.CookerFeatures.SEND_DEPENDS_TREE, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING, bb.cooker.CookerFeatures.SEND_SANITYEVENTS] +featureSet = [bb.cooker.CookerFeatures.HOB_EXTRA_CACHES, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING, bb.cooker.CookerFeatures.SEND_SANITYEVENTS] logger = logging.getLogger("ToasterLogger") interactive = sys.stdout.isatty()