bitbake: Sync up with upstream cosmetic changes for bin/bitbake
Sync cosmetic differences between bitbake in poky and bitbake upstream in preparation for resolving the real code differences in the server handling. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5af197b55a
commit
e386fe4542
|
@ -42,10 +42,11 @@ from bb import server
|
||||||
from bb.server import none
|
from bb.server import none
|
||||||
#from bb.server import xmlrpc
|
#from bb.server import xmlrpc
|
||||||
|
|
||||||
__version__ = "1.11.0"
|
__version__ = "1.13.0"
|
||||||
logger = logging.getLogger("BitBake")
|
logger = logging.getLogger("BitBake")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class BBConfiguration(object):
|
class BBConfiguration(object):
|
||||||
"""
|
"""
|
||||||
Manages build options and configurations for one run
|
Manages build options and configurations for one run
|
||||||
|
@ -172,9 +173,6 @@ Default BBFILES are the .bb files in the current directory.""")
|
||||||
|
|
||||||
ui_main = get_ui(configuration)
|
ui_main = get_ui(configuration)
|
||||||
|
|
||||||
loghandler = event.LogHandler()
|
|
||||||
logger.addHandler(loghandler)
|
|
||||||
|
|
||||||
#server = bb.server.xmlrpc
|
#server = bb.server.xmlrpc
|
||||||
server = bb.server.none
|
server = bb.server.none
|
||||||
|
|
||||||
|
@ -185,6 +183,10 @@ Default BBFILES are the .bb files in the current directory.""")
|
||||||
bb.utils.init_logger(bb.msg, configuration.verbose, configuration.debug,
|
bb.utils.init_logger(bb.msg, configuration.verbose, configuration.debug,
|
||||||
configuration.debug_domains)
|
configuration.debug_domains)
|
||||||
|
|
||||||
|
# Ensure logging messages get sent to the UI as events
|
||||||
|
handler = bb.event.LogHandler()
|
||||||
|
logger.addHandler(handler)
|
||||||
|
|
||||||
# Clear away any spurious environment variables. But don't wipe the
|
# Clear away any spurious environment variables. But don't wipe the
|
||||||
# environment totally. This is necessary to ensure the correct operation
|
# environment totally. This is necessary to ensure the correct operation
|
||||||
# of the UIs (e.g. for DISPLAY, etc.)
|
# of the UIs (e.g. for DISPLAY, etc.)
|
||||||
|
@ -198,17 +200,11 @@ Default BBFILES are the .bb files in the current directory.""")
|
||||||
server.BitBakeServerFork(cooker, cooker.server, serverinfo, cooker_logfile)
|
server.BitBakeServerFork(cooker, cooker.server, serverinfo, cooker_logfile)
|
||||||
del cooker
|
del cooker
|
||||||
|
|
||||||
logger.removeHandler(loghandler)
|
logger.removeHandler(handler)
|
||||||
|
|
||||||
# Setup a connection to the server (cooker)
|
# Setup a connection to the server (cooker)
|
||||||
server_connection = server.BitBakeServerConnection(serverinfo)
|
server_connection = server.BitBakeServerConnection(serverinfo)
|
||||||
|
|
||||||
# Launch the UI
|
|
||||||
if configuration.ui:
|
|
||||||
ui = configuration.ui
|
|
||||||
else:
|
|
||||||
ui = "knotty"
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return server.BitbakeUILauch().launch(serverinfo, ui_main, server_connection.connection, server_connection.events)
|
return server.BitbakeUILauch().launch(serverinfo, ui_main, server_connection.connection, server_connection.events)
|
||||||
finally:
|
finally:
|
||||||
|
@ -222,3 +218,4 @@ if __name__ == "__main__":
|
||||||
import traceback
|
import traceback
|
||||||
traceback.print_exc(5)
|
traceback.print_exc(5)
|
||||||
sys.exit(ret)
|
sys.exit(ret)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue