From a5d01e9ec7176ad16e106b100861b488bc22081f Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Tue, 3 Jun 2014 16:26:10 +0100 Subject: bitbake: bitbake: move configuration reading code The configuration reading code should live in the main bitbake entry point, and the server modules should be supplied with correct configuration instead of attempting to parse from configuration files. This patch moves the endpoint address reading from XMLRPC to the bitbake main script. (Bitbake rev: ac5753274ff932e1d6f073ab4dab7bd6fe5355a1) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/xmlrpc.py | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'bitbake/lib/bb/server') diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index 5dcaa6c7b0..6fc5543a80 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/lib/bb/server/xmlrpc.py @@ -340,9 +340,6 @@ class BitBakeXMLRPCClient(BitBakeBaseServer): def saveConnectionDetails(self, remote): self.remote = remote - def saveConnectionConfigParams(self, configParams): - self.configParams = configParams - def establishConnection(self, featureset): # The format of "remote" must be "server:port" try: @@ -351,27 +348,6 @@ class BitBakeXMLRPCClient(BitBakeBaseServer): except Exception as e: bb.fatal("Failed to read remote definition (%s)" % str(e)) - # use automatic port if port set to -1, meaning read it from - # the bitbake.lock file - if port == -1: - lock_location = "%s/bitbake.lock" % self.configParams.environment.get('BUILDDIR') - lock = bb.utils.lockfile(lock_location, False, False) - if lock: - # This means there is no server running which we can - # connect to on the local system. - bb.utils.unlockfile(lock) - return None - - try: - lf = open(lock_location, 'r') - remotedef = lf.readline() - [host, port] = remotedef.split(":") - port = int(port) - lf.close() - self.remote = remotedef - except Exception as e: - bb.fatal("Failed to read bitbake.lock (%s)" % str(e)) - # We need our IP for the server connection. We get the IP # by trying to connect with the server try: -- cgit v1.2.3-54-g00ecf