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 <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood 2016-03-23 08:28:37 +00:00 committed by Richard Purdie
parent 3df6551d8c
commit 3025092142
3 changed files with 7 additions and 3 deletions

View File

@ -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

View File

@ -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)

View File

@ -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]