summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-13 20:07:05 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-14 12:25:07 +0000
commite271d7dc606185130e0e47327205bd423490b7c2 (patch)
treee3bb6e62d6d55cab6a5d12b7a69092f77a940ab2
parentd325d94f3f8b6a475aebe3ae7d8a140ac6fec779 (diff)
downloadpoky-e271d7dc606185130e0e47327205bd423490b7c2.tar.gz
bitbake: command: provide a means to shut down from the client in memres mode
In memory resident mode we don't really want to actually shut down since it's only the client going away. (Bitbake rev: 74db369c46043116359101cab70486afd82372c0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/command.py8
-rw-r--r--bitbake/lib/bb/cooker.py7
-rw-r--r--bitbake/lib/bb/cookerdata.py1
3 files changed, 16 insertions, 0 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index caa3e4d457..012b35faf6 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -472,3 +472,11 @@ class CommandsAsync:
472 command.finishAsyncCommand() 472 command.finishAsyncCommand()
473 resetCooker.needcache = False 473 resetCooker.needcache = False
474 474
475 def clientComplete(self, command, params):
476 """
477 Do the right thing when the controlling client exits
478 """
479 command.cooker.clientComplete()
480 command.finishAsyncCommand()
481 clientComplete.needcache = False
482
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 5e5708ee2b..2614c4485a 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1725,6 +1725,13 @@ class BBCooker:
1725 def reset(self): 1725 def reset(self):
1726 self.initConfigurationData() 1726 self.initConfigurationData()
1727 1727
1728 def clientComplete(self):
1729 """Called when the client is done using the server"""
1730 if self.configuration.server_only:
1731 self.finishcommand()
1732 else:
1733 self.shutdown(True)
1734
1728 def lockBitbake(self): 1735 def lockBitbake(self):
1729 if not hasattr(self, 'lock'): 1736 if not hasattr(self, 'lock'):
1730 self.lock = None 1737 self.lock = None
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 320bb5906c..c6e958b43c 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -146,6 +146,7 @@ class CookerConfiguration(object):
146 self.tracking = False 146 self.tracking = False
147 self.interface = [] 147 self.interface = []
148 self.writeeventlog = False 148 self.writeeventlog = False
149 self.server_only = False
149 150
150 self.env = {} 151 self.env = {}
151 152