[oe-commits] [bitbake] 04/08: toaster: localhostbecontroller put generated layer in the builddir

git at git.openembedded.org git at git.openembedded.org
Wed Mar 23 17:56:56 UTC 2016


rpurdie pushed a commit to branch master
in repository bitbake.

commit 77f3728ee6ea379bffcf73f33c26e982cb0795f4
Author: Michael Wood <michael.g.wood at intel.com>
AuthorDate: Wed Mar 23 08:28:39 2016 +0000

    toaster: localhostbecontroller put generated layer in the builddir
    
    Move the generated layer for custom recipes into the build directory.
    The build directory makes more sense as this layer/recipe is generated
    for a particular build/project.
    
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Elliot Smith <elliot.smith at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/toaster/bldcontrol/localhostbecontroller.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index 9deb572..08419f2 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -218,9 +218,8 @@ class LocalhostBEController(BuildEnvironmentController):
             raise BuildSetupException("BE is not consistent: bblayers.conf file missing at %s" % bblayerconf)
 
         # 5. create custom layer and add custom recipes to it
-        layerpath = os.path.join(self.be.sourcedir,
-                                 "_meta-toaster-custom_",
-                                 bitbake.req.project.name)
+        layerpath = os.path.join(self.be.builddir,
+                                 CustomImageRecipe.LAYER_NAME)
         for target in targets:
             try:
                 customrecipe = CustomImageRecipe.objects.get(name=target.target,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list