diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-04-06 17:46:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-06 23:10:27 +0100 |
commit | 7068e8a056d7b7d091294343f034dee4662403c0 (patch) | |
tree | 3c6d1eeafbd613bc46141901334507c5883daa1d /bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |
parent | 9d4c62d33ee59644591596c082cdb9240eb9aa44 (diff) | |
download | poky-7068e8a056d7b7d091294343f034dee4662403c0.tar.gz |
bitbake: toaster: remove startBBServer API
We still will have to run bitbake server, but it will be done
different way and the code will be in triggerBuild function.
Removed startBBServer API from BuildEnvironmentController and
LocalhostBEController classes.
(Bitbake rev: a8f986d73a84f28fa8b116b91fb30c5d2cd4edbe)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 08419f2ded..7d6abe69e2 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -70,38 +70,6 @@ class LocalhostBEController(BuildEnvironmentController): | |||
70 | logger.debug("localhostbecontroller: shellcmd success") | 70 | logger.debug("localhostbecontroller: shellcmd success") |
71 | return out | 71 | return out |
72 | 72 | ||
73 | def startBBServer(self): | ||
74 | assert self.pokydirname and os.path.exists(self.pokydirname) | ||
75 | assert self.islayerset | ||
76 | |||
77 | # find our own toasterui listener/bitbake | ||
78 | from toaster.bldcontrol.management.commands.loadconf import _reduce_canon_path | ||
79 | |||
80 | toaster = _reduce_canon_path(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../../bin/toaster")) | ||
81 | assert os.path.exists(toaster) and os.path.isfile(toaster) | ||
82 | |||
83 | # restart bitbake server and toastergui observer | ||
84 | self._shellcmd("bash -c 'source %s restart-bitbake'" % toaster, self.be.builddir) | ||
85 | logger.debug("localhostbecontroller: restarted bitbake server") | ||
86 | |||
87 | # read port number from bitbake.lock | ||
88 | self.be.bbport = "" | ||
89 | bblock = os.path.join(self.be.builddir, 'bitbake.lock') | ||
90 | if os.path.exists(bblock): | ||
91 | with open(bblock) as fplock: | ||
92 | for line in fplock: | ||
93 | if ":" in line: | ||
94 | self.be.bbport = line.split(":")[-1].strip() | ||
95 | logger.debug("localhostbecontroller: bitbake port %s", self.be.bbport) | ||
96 | break | ||
97 | |||
98 | if not self.be.bbport: | ||
99 | raise BuildSetupException("localhostbecontroller: can't read bitbake port from %s" % bblock) | ||
100 | |||
101 | self.be.bbaddress = "localhost" | ||
102 | self.be.bbstate = BuildEnvironment.SERVER_STARTED | ||
103 | self.be.save() | ||
104 | |||
105 | def getGitCloneDirectory(self, url, branch): | 73 | def getGitCloneDirectory(self, url, branch): |
106 | """Construct unique clone directory name out of url and branch.""" | 74 | """Construct unique clone directory name out of url and branch.""" |
107 | if branch != "HEAD": | 75 | if branch != "HEAD": |