summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/server
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:07:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:03 +0100
commit984da85479fa6127df806b2aa3a9fb27d268f2a3 (patch)
tree0df2e12928642236be1492f96dd8fccfa88622da /bitbake/lib/bb/server
parent5759039a89674c1e11b3d73cd6487f4586d25a73 (diff)
downloadpoky-984da85479fa6127df806b2aa3a9fb27d268f2a3.tar.gz
bitbake: cooker: Change to consistent prefile/postfile handling
Currently the original prefile and postfile passed when starting bitbake server are 'sticky'. With the new memory resident model this doesn't make sense as the server the system is started with isn't special. This patch changes the code so the prefile/postfile are used if specified on the commandline and not used otherwise. This makes the behaviour much more predictable and expected and as an added bonus simplifies the code. (Bitbake rev: 638d366234fad78f283d3a13a12b07cb0ccbe914) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/server')
-rw-r--r--bitbake/lib/bb/server/process.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index fad8aac4da..5c7dfaefa1 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -405,12 +405,6 @@ class BitBakeServer(object):
405 server = ProcessServer(self.bitbake_lock, self.sock, self.sockname) 405 server = ProcessServer(self.bitbake_lock, self.sock, self.sockname)
406 self.configuration.setServerRegIdleCallback(server.register_idle_function) 406 self.configuration.setServerRegIdleCallback(server.register_idle_function)
407 407
408 # Copy prefile and postfile to _server variants
409 for param in ('prefile', 'postfile'):
410 value = getattr(self.configuration, param)
411 if value:
412 setattr(self.configuration, "%s_server" % param, value)
413
414 self.cooker = bb.cooker.BBCooker(self.configuration, self.featureset, self.readypipein) 408 self.cooker = bb.cooker.BBCooker(self.configuration, self.featureset, self.readypipein)
415 server.cooker = self.cooker 409 server.cooker = self.cooker
416 server.server_timeout = self.configuration.server_timeout 410 server.server_timeout = self.configuration.server_timeout