From ce9e6bad8f9f63687160c300970b49fe2bc50e52 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Fri, 6 Jan 2012 17:02:29 +0800 Subject: bitbake: add a new option "--server-only" Create a new option "--server-only" for bitbake command, which allows bitbake runs as a server, and let frontend connect the server itself. "--server-only" should work with "-t xmlrpc", or bitbake will exit. bitbake --server-only -t xmlrpc will print out the server address and port information. (Bitbake rev: 2677254cf9792cee083605267570d93b425cc2db) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'bitbake') diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 9eb558b9ec..c2e682221d 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -165,6 +165,9 @@ Default BBFILES are the .bb files in the current directory.""") parser.add_option("", "--revisions-changed", help = "Set the exit code depending on whether upstream floating revisions have changed or not", action = "store_true", dest = "revisions_changed", default = False) + parser.add_option("", "--server-only", help = "Run bitbake without UI, the frontend can connect with bitbake server itself", + action = "store_true", dest = "server_only", default = False) + options, args = parser.parse_args(sys.argv) configuration = BBConfiguration(options) @@ -186,6 +189,9 @@ Default BBFILES are the .bb files in the current directory.""") sys.exit("FATAL: Invalid server type '%s' specified.\n" "Valid interfaces: xmlrpc, process [default], none." % servertype) + if configuration.server_only and configuration.servertype != "xmlrpc": + sys.exit("FATAL: If '--server-only' is defined, we must set the servertype as 'xmlrpc'.\n") + # Save a logfile for cooker into the current working directory. When the # server is daemonized this logfile will be truncated. cooker_logfile = os.path.join(os.getcwd(), "cooker.log") @@ -222,14 +228,17 @@ Default BBFILES are the .bb files in the current directory.""") logger.removeHandler(handler) - # Setup a connection to the server (cooker) - server_connection = server.establishConnection() + if not configuration.server_only: + # Setup a connection to the server (cooker) + server_connection = server.establishConnection() - try: - return server.launchUI(ui_main, server_connection.connection, server_connection.events) - finally: - bb.event.ui_queue = [] - server_connection.terminate() + try: + return server.launchUI(ui_main, server_connection.connection, server_connection.events) + finally: + bb.event.ui_queue = [] + server_connection.terminate() + else: + print("server address: %s, server port: %s" % (server.serverinfo.host, server.serverinfo.port)) return 1 -- cgit v1.2.3-54-g00ecf