summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 854a6bbfe2..15c0ff9e82 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -70,17 +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 _setupBE(self):
74 assert self.pokydirname and os.path.exists(self.pokydirname)
75 path = self.be.builddir
76 if not path:
77 raise Exception("Invalid path creation specified.")
78 if not os.path.exists(path):
79 os.makedirs(path, 0755)
80 self._shellcmd("bash -c \"source %s/oe-init-build-env %s\"" % (self.pokydirname, path))
81 # delete the templateconf.cfg; it may come from an unsupported layer configuration
82 os.remove(os.path.join(path, "conf/templateconf.cfg"))
83
84 73
85 def writeConfFile(self, file_name, variable_list = None, raw = None): 74 def writeConfFile(self, file_name, variable_list = None, raw = None):
86 filepath = os.path.join(self.be.builddir, file_name) 75 filepath = os.path.join(self.be.builddir, file_name)
@@ -297,16 +286,12 @@ class LocalhostBEController(BuildEnvironmentController):
297 286
298 logger.debug("localhostbecontroller: current layer list %s " % pformat(layerlist)) 287 logger.debug("localhostbecontroller: current layer list %s " % pformat(layerlist))
299 288
300 # 4. configure the build environment, so we have a conf/bblayers.conf 289 # 4. update the bblayers.conf
301 assert self.pokydirname is not None
302 self._setupBE()
303
304 # 5. update the bblayers.conf
305 bblayerconf = os.path.join(self.be.builddir, "conf/bblayers.conf") 290 bblayerconf = os.path.join(self.be.builddir, "conf/bblayers.conf")
306 if not os.path.exists(bblayerconf): 291 if not os.path.exists(bblayerconf):
307 raise BuildSetupException("BE is not consistent: bblayers.conf file missing at %s" % bblayerconf) 292 raise BuildSetupException("BE is not consistent: bblayers.conf file missing at %s" % bblayerconf)
308 293
309 # 6. create custom layer and add custom recipes to it 294 # 5. create custom layer and add custom recipes to it
310 layerpath = os.path.join(self.be.sourcedir, "_meta-toaster-custom") 295 layerpath = os.path.join(self.be.sourcedir, "_meta-toaster-custom")
311 if os.path.isdir(layerpath): 296 if os.path.isdir(layerpath):
312 shutil.rmtree(layerpath) # remove leftovers from previous builds 297 shutil.rmtree(layerpath) # remove leftovers from previous builds