[oe-commits] [bitbake] 01/08: toaster: localhostbecontroller Don't clear out toaster custom layer dir

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


rpurdie pushed a commit to branch master
in repository bitbake.

commit 502148fe498fe0a41ae89c9f649d3cb1253b0487
Author: Michael Wood <michael.g.wood at intel.com>
AuthorDate: Wed Mar 23 08:28:36 2016 +0000

    toaster: localhostbecontroller Don't clear out toaster custom layer dir
    
    We may have a recipe which is based on a custom image recipe that has
    already been built so keep the recipe file around so that it can be read
    by the generate recipe function.
    
    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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index efd82c3..38e97a2 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -217,9 +217,9 @@ 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")
-        if os.path.isdir(layerpath):
-            shutil.rmtree(layerpath) # remove leftovers from previous builds
+        layerpath = os.path.join(self.be.sourcedir,
+                                 "_meta-toaster-custom_",
+                                 bitbake.req.project.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