summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-11-24 11:20:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:10 +0000
commit30a9f65dcc043c1f51fd3128653ea5ecef8e25a0 (patch)
treedcf3d5ef0a4d62469d234954ea3edaeb9bd1ccf5 /bitbake/lib/bb/ui
parentfa5ea98d3b4610e94a9bf8eae7801e52984defb6 (diff)
downloadpoky-30a9f65dcc043c1f51fd3128653ea5ecef8e25a0.tar.gz
bitbake: toaster: buildinfohelper toaster-custom-images layer
This fixes the unidentified layers issue by making the toaster-custom-images layer a local layer. By doing this we also fix the git assumptions made for the local layers which stop recipes and other meta data being associated with them. This also removed some of the special casing previously needed when we didn't have the concept of a local (non git) layer. Also rename created flag var to a have a different var for each returned value so that the same value isn't used multiple times. [YOCTO #10220] (Bitbake rev: ba5332d4960d7f4f79aef63136796e2fa67284e3) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 3ddcb2ac6d..e96e93440e 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -42,7 +42,7 @@ from orm.models import Variable, VariableHistory
42from orm.models import Package, Package_File, Target_Installed_Package, Target_File 42from orm.models import Package, Package_File, Target_Installed_Package, Target_File
43from orm.models import Task_Dependency, Package_Dependency 43from orm.models import Task_Dependency, Package_Dependency
44from orm.models import Recipe_Dependency, Provides 44from orm.models import Recipe_Dependency, Provides
45from orm.models import Project, CustomImagePackage, CustomImageRecipe 45from orm.models import Project, CustomImagePackage
46from orm.models import signal_runbuilds 46from orm.models import signal_runbuilds
47 47
48from bldcontrol.models import BuildEnvironment, BuildRequest 48from bldcontrol.models import BuildEnvironment, BuildRequest
@@ -361,11 +361,6 @@ class ORMWrapper(object):
361 361
362 def get_update_layer_version_object(self, build_obj, layer_obj, layer_version_information): 362 def get_update_layer_version_object(self, build_obj, layer_obj, layer_version_information):
363 if isinstance(layer_obj, Layer_Version): 363 if isinstance(layer_obj, Layer_Version):
364 # Special case the toaster-custom-images layer which is created
365 # on the fly so don't update the values which may cause the layer
366 # to be duplicated on a future get_or_create
367 if layer_obj.layer.name == CustomImageRecipe.LAYER_NAME:
368 return layer_obj
369 # We already found our layer version for this build so just 364 # We already found our layer version for this build so just
370 # update it with the new build information 365 # update it with the new build information
371 logger.debug("We found our layer from toaster") 366 logger.debug("We found our layer from toaster")