summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-03-23 08:28:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 17:53:55 +0000
commit3df6551d8c7963324a0bcd904ca89232d2569ab1 (patch)
tree327ea7834660579511a37ec66d3e664f02fca30d /bitbake/lib
parent2f2f784727a1617c2b9ce0bb86730ba301238e06 (diff)
downloadpoky-3df6551d8c7963324a0bcd904ca89232d2569ab1.tar.gz
bitbake: 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. (Bitbake rev: 502148fe498fe0a41ae89c9f649d3cb1253b0487) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index efd82c325b..38e97a2e27 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -217,9 +217,9 @@ class LocalhostBEController(BuildEnvironmentController):
217 raise BuildSetupException("BE is not consistent: bblayers.conf file missing at %s" % bblayerconf) 217 raise BuildSetupException("BE is not consistent: bblayers.conf file missing at %s" % bblayerconf)
218 218
219 # 5. create custom layer and add custom recipes to it 219 # 5. create custom layer and add custom recipes to it
220 layerpath = os.path.join(self.be.sourcedir, "_meta-toaster-custom") 220 layerpath = os.path.join(self.be.sourcedir,
221 if os.path.isdir(layerpath): 221 "_meta-toaster-custom_",
222 shutil.rmtree(layerpath) # remove leftovers from previous builds 222 bitbake.req.project.name)
223 for target in targets: 223 for target in targets:
224 try: 224 try:
225 customrecipe = CustomImageRecipe.objects.get(name=target.target, 225 customrecipe = CustomImageRecipe.objects.get(name=target.target,