aboutsummaryrefslogtreecommitdiffstats
path: root/lib/toaster/bldcontrol/localhostbecontroller.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-12-02 10:02:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-07 17:22:59 +0000
commit27a59b4373a449f17e46ab93e0eba15cf75967ae (patch)
treeeabda41703b316e1adec57ef429dc292097c76cf /lib/toaster/bldcontrol/localhostbecontroller.py
parent24cd26b39014419d883b7cf45e4943c301d585cc (diff)
downloadbitbake-contrib-27a59b4373a449f17e46ab93e0eba15cf75967ae.tar.gz
toaster: remove _setupBE function
This function is not needed as build environment is always created because of the new way to run Toaster. It can be only sourced after oe-init-build-env is sourced. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster/bldcontrol/localhostbecontroller.py')
-rw-r--r--lib/toaster/bldcontrol/localhostbecontroller.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index 854a6bbfe..15c0ff9e8 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -70,17 +70,6 @@ class LocalhostBEController(BuildEnvironmentController):
logger.debug("localhostbecontroller: shellcmd success")
return out
- def _setupBE(self):
- assert self.pokydirname and os.path.exists(self.pokydirname)
- path = self.be.builddir
- if not path:
- raise Exception("Invalid path creation specified.")
- if not os.path.exists(path):
- os.makedirs(path, 0755)
- self._shellcmd("bash -c \"source %s/oe-init-build-env %s\"" % (self.pokydirname, path))
- # delete the templateconf.cfg; it may come from an unsupported layer configuration
- os.remove(os.path.join(path, "conf/templateconf.cfg"))
-
def writeConfFile(self, file_name, variable_list = None, raw = None):
filepath = os.path.join(self.be.builddir, file_name)
@@ -297,16 +286,12 @@ class LocalhostBEController(BuildEnvironmentController):
logger.debug("localhostbecontroller: current layer list %s " % pformat(layerlist))
- # 4. configure the build environment, so we have a conf/bblayers.conf
- assert self.pokydirname is not None
- self._setupBE()
-
- # 5. update the bblayers.conf
+ # 4. update the bblayers.conf
bblayerconf = os.path.join(self.be.builddir, "conf/bblayers.conf")
if not os.path.exists(bblayerconf):
raise BuildSetupException("BE is not consistent: bblayers.conf file missing at %s" % bblayerconf)
- # 6. create custom layer and add custom recipes to it
+ # 5. create custom layer and add custom recipes to it
layerpath = os.path.join(self.be.sourcedir, "_meta-toaster-custom")
if os.path.isdir(layerpath):
shutil.rmtree(layerpath) # remove leftovers from previous builds