diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/bbcontroller.py | 9 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 32 |
2 files changed, 0 insertions, 41 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index f40103cb45..535a3986ad 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py | |||
@@ -127,14 +127,6 @@ class BuildEnvironmentController(object): | |||
127 | bblayerconffile.write("# line added by toaster build control\nBBLAYERS = \"" + " ".join(layerlist) + "\"") | 127 | bblayerconffile.write("# line added by toaster build control\nBBLAYERS = \"" + " ".join(layerlist) + "\"") |
128 | bblayerconffile.close() | 128 | bblayerconffile.close() |
129 | 129 | ||
130 | def startBBServer(self): | ||
131 | """ Starts a BB server with Toaster toasterui set up to record the builds, an no controlling UI. | ||
132 | After this method executes, self.be bbaddress/bbport MUST point to a running and free server, | ||
133 | and the bbstate MUST be updated to "started". | ||
134 | """ | ||
135 | raise NotImplementedError("FIXME: Must override in order to actually start the BB server") | ||
136 | |||
137 | |||
138 | def setLayers(self, bitbake, ls): | 130 | def setLayers(self, bitbake, ls): |
139 | """ Checks-out bitbake executor and layers from git repositories. | 131 | """ Checks-out bitbake executor and layers from git repositories. |
140 | Sets the layer variables in the config file, after validating local layer paths. | 132 | Sets the layer variables in the config file, after validating local layer paths. |
@@ -151,7 +143,6 @@ class BuildEnvironmentController(object): | |||
151 | starts if needed; or reconnects to the server if we can | 143 | starts if needed; or reconnects to the server if we can |
152 | """ | 144 | """ |
153 | if not self.connection: | 145 | if not self.connection: |
154 | self.startBBServer() | ||
155 | self.be.lock = BuildEnvironment.LOCK_RUNNING | 146 | self.be.lock = BuildEnvironment.LOCK_RUNNING |
156 | self.be.save() | 147 | self.be.save() |
157 | 148 | ||
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": |