]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: toaster: set default pokydirname if no external layers
authorOlaf Mandel <o.mandel@menlosystems.com>
Sun, 3 Sep 2017 05:24:07 +0000 (22:24 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 5 Sep 2017 14:00:49 +0000 (15:00 +0100)
If no external layers are defined, pokydirname is not set. Rectify
this by taking the 'be.sourcedir' as the pokydirname.

[YOCTO #12015]

(Bitbake rev: 3b0f04c7b00aaf44ba146c432fcb5d6fd7dafcea)

Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/toaster/bldcontrol/localhostbecontroller.py

index a93cf40bd6e673390fecb6e6e382b9f137bb5749..a2ca95bf42f731d59bd78a93feb9330e1f048c4b 100644 (file)
@@ -213,6 +213,10 @@ class LocalhostBEController(BuildEnvironmentController):
         self.setCloneStatus(bitbake,'complete',clone_total,clone_count)
         logger.debug("localhostbecontroller: current layer list %s " % pformat(layerlist))
 
+        if self.pokydirname is None and os.path.exists(os.path.join(self.be.sourcedir, "oe-init-build-env")):
+            logger.debug("localhostbecontroller: selected poky dir name %s" % self.be.sourcedir)
+            self.pokydirname = self.be.sourcedir
+
         # 5. create custom layer and add custom recipes to it
         for target in targets:
             try: