From 302509214255f7a2b7226e5a6b8a2e361b826168 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Wed, 23 Mar 2016 08:28:37 +0000 Subject: [PATCH] bitbake: toaster: orm Add a constant for the CustomImageRecipe's layer name Use a constant to define the name for the toaster custom images layer; this constant is then used to identify this layer in various places. (Bitbake rev: 2540969ec71612af7f9041cadcc401513e9b357b) Signed-off-by: Michael Wood Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/buildinfohelper.py | 4 ++-- bitbake/lib/toaster/orm/models.py | 4 ++++ bitbake/lib/toaster/toastergui/views.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 7fedb76911..bddce4f4b7 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 from orm.models import Package, Package_File, Target_Installed_Package, Target_File from orm.models import Task_Dependency, Package_Dependency from orm.models import Recipe_Dependency, Provides -from orm.models import Project, CustomImagePackage +from orm.models import Project, CustomImagePackage, CustomImageRecipe from bldcontrol.models import BuildEnvironment, BuildRequest @@ -347,7 +347,7 @@ class ORMWrapper(object): # Special case the toaster-custom-images layer which is created # on the fly so don't update the values which may cause the layer # to be duplicated on a future get_or_create - if layer_obj.layer.name == "toaster-custom-images": + if layer_obj.layer.name == CustomImageRecipe.LAYER_NAME: return layer_obj # We already found our layer version for this build so just # update it with the new build information diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index add2adea06..0aad788c2a 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -1449,6 +1449,10 @@ class ProjectLayer(models.Model): unique_together = (("project", "layercommit"),) class CustomImageRecipe(Recipe): + + # CustomImageRecipe's belong to layers called: + LAYER_NAME = "toaster-custom-images" + search_allowed_fields = ['name'] base_recipe = models.ForeignKey(Recipe, related_name='based_on_recipe') project = models.ForeignKey(Project) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 85ca9be716..15760b36de 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2407,7 +2407,7 @@ if True: # create layer 'Custom layer' and verion if needed layer = Layer.objects.get_or_create( - name="toaster-custom-images", + name=CustomImageRecipe.LAYER_NAME, summary="Layer for custom recipes", vcs_url="file:///toaster_created_layer")[0]