diff options
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 16c7c80441..f960a389c4 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -217,9 +217,21 @@ class LocalhostBEController(BuildEnvironmentController): | |||
217 | self.setCloneStatus(bitbake,'complete',clone_total,clone_count) | 217 | self.setCloneStatus(bitbake,'complete',clone_total,clone_count) |
218 | logger.debug("localhostbecontroller: current layer list %s " % pformat(layerlist)) | 218 | logger.debug("localhostbecontroller: current layer list %s " % pformat(layerlist)) |
219 | 219 | ||
220 | if self.pokydirname is None and os.path.exists(os.path.join(self.be.sourcedir, "oe-init-build-env")): | 220 | # Resolve self.pokydirname if not resolved yet, consider the scenario |
221 | logger.debug("localhostbecontroller: selected poky dir name %s" % self.be.sourcedir) | 221 | # where all layers are local, that's the else clause |
222 | self.pokydirname = self.be.sourcedir | 222 | if self.pokydirname is None: |
223 | if os.path.exists(os.path.join(self.be.sourcedir, "oe-init-build-env")): | ||
224 | logger.debug("localhostbecontroller: selected poky dir name %s" % self.be.sourcedir) | ||
225 | self.pokydirname = self.be.sourcedir | ||
226 | else: | ||
227 | # Alternatively, scan local layers for relative "oe-init-build-env" location | ||
228 | for layer in layers: | ||
229 | if os.path.exists(os.path.join(layer.layer_version.layer.local_source_dir,"..","oe-init-build-env")): | ||
230 | logger.debug("localhostbecontroller, setting pokydirname to %s" % (layer.layer_version.layer.local_source_dir)) | ||
231 | self.pokydirname = os.path.join(layer.layer_version.layer.local_source_dir,"..") | ||
232 | break | ||
233 | else: | ||
234 | logger.error("pokydirname is not set, you will run into trouble!") | ||
223 | 235 | ||
224 | # 5. create custom layer and add custom recipes to it | 236 | # 5. create custom layer and add custom recipes to it |
225 | for target in targets: | 237 | for target in targets: |