From 59421f688ce5a6ca95e7a02bb4e517b4690cad8c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 24 Aug 2020 13:25:22 +0100 Subject: bitbake: cooker/cookerdata: Ensure UI event log is updated from commandline Currently the eventlog is not handled correctly for memory resident bitbake. Fix this by allowing adpations to configuration changes. (Bitbake rev: f7d2c9116116659ea42260a3bb96dca100aadae7) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 18 +++++++++++------- bitbake/lib/bb/cookerdata.py | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index c34de303fb..3f351cbea6 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -150,6 +150,7 @@ class BBCooker: def __init__(self, configuration, featureSet=None, idleCallBackRegister=None): self.recipecaches = None + self.eventlog = None self.skiplist = {} self.featureset = CookerFeatures() if featureSet: @@ -199,13 +200,6 @@ class BBCooker: bb.debug(1, "BBCooker parsed base configuration %s" % time.time()) sys.stdout.flush() - # we log all events to a file if so directed - if self.configuration.writeeventlog: - # register the log file writer as UI Handler - writer = EventWriter(self, self.configuration.writeeventlog) - EventLogWriteHandler = namedtuple('EventLogWriteHandler', ['event']) - bb.event.register_UIHhandler(EventLogWriteHandler(writer)) - self.inotify_modified_files = [] def _process_inotify_updates(server, cooker, abort): @@ -449,6 +443,16 @@ class BBCooker: if hasattr(self.configuration, o): setattr(self.configuration, o, options[o]) + if self.configuration.writeeventlog: + if self.eventlog and self.eventlog[0] != self.configuration.writeeventlog: + bb.event.unregister_UIHhandler(self.eventlog[1]) + if not self.eventlog or self.eventlog[0] != self.configuration.writeeventlog: + # we log all events to a file if so directed + # register the log file writer as UI Handler + writer = EventWriter(self, self.configuration.writeeventlog) + EventLogWriteHandler = namedtuple('EventLogWriteHandler', ['event']) + self.eventlog = (self.configuration.writeeventlog, bb.event.register_UIHhandler(EventLogWriteHandler(writer))) + bb.msg.loggerDefaultLogLevel = self.configuration.default_loglevel bb.msg.loggerDefaultDomains = self.configuration.debug_domains diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index 9eddf7cf6a..3baa9ade1b 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py @@ -62,7 +62,7 @@ class ConfigParameters(object): "extra_assume_provided", "profile", "prefile", "postfile", "server_timeout", "nosetscene", "setsceneonly", "skipsetscene", - "runall", "runonly"]: + "runall", "runonly", "writeeventlog"]: options[o] = getattr(self.options, o) options['build_verbose_shell'] = self.options.verbose -- cgit v1.2.3-54-g00ecf