sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: API allow CustomImageRecipe to be updated after creation 

When we create a CustomImageRecipe we create a Layer_Version and
Recipe for that Recipe to be in, we only need one Layer_Version for our
Recipes so if that Layer_Version is updated by building it we need
a slightly more custom version of get_or_create to take into account the
fields which we expect can change but still mean that the object we want is
valid and doesn't need to be created.

In the Recipe case this is when we're updating an existing
CustomImageRecipe as we allow people to create a recipe even when the
based on recipe hasn't been built so we need to update it once a build
has happened.

(Bitbake rev: 0fe2c72ab82c6de2825a390fbb460b892a7a9cfc)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood 2015-12-08 11:36:17 +00:00 committed by Richard Purdie
parent 9ea4de6d80
commit 439314c1b2
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
bitbake/lib/toaster/toastergui/views.py
View File

@ -2363,20 +2363,27 @@ if True:
# create custom recipe
try:
# create layer 'Custom layer' and verion if needed
layer = Layer.objects.get_or_create(name="toaster-custom-images",
summary="Layer for custom recipes",
vcs_url="file:///toaster_created_layer"
)[0]
layer = Layer.objects.get_or_create(
name="toaster-custom-images",
summary="Layer for custom recipes",
vcs_url="file:///toaster_created_layer")[0]
lver = Layer_Version.objects.get_or_create(
project=params['project'],
layer=layer,
dirpath='toaster_created_layer',
build=None)[0]
# Check if we have a layer version already
# We don't use get_or_create here because the dirpath will change
# and is a required field
lver = Layer_Version.objects.filter(Q(project=params['project']) &
Q(layer=layer) &
Q(build=None)).last()
if lver == None:
lver, created = Layer_Version.objects.get_or_create(
project=params['project'],
layer=layer,
dirpath="toaster_created_layer")
# Add a dependency on our layer to the base recipe's layer
LayerVersionDependency.objects.get_or_create(layer_version=lver,
depends_on=params["base"].layer_version)
LayerVersionDependency.objects.get_or_create(
layer_version=lver,
depends_on=params["base"].layer_version)
# Add it to our current project if needed
ProjectLayer.objects.get_or_create(project=params['project'],
@ -2384,14 +2391,21 @@ if True:
optional=False)
# Create the actual recipe
recipe = CustomImageRecipe.objects.create(
name=request.POST["name"],
base_recipe=params["base"],
project=params["project"],
file_path=request.POST["name"],
license="MIT",
version="0.1",
layer_version=lver)
recipe, created = CustomImageRecipe.objects.get_or_create(
name=request.POST["name"],
base_recipe=params["base"],
project=params["project"],
layer_version=lver,
is_image=True)
# If we created the object then setup these fields. They may get
# overwritten later on and cause the get_or_create to create a
# duplicate if they've changed.
if created:
recipe.file_path = request.POST["name"]
recipe.license = "MIT"
recipe.version = "0.1"
recipe.save()
except Error as err:
return {"error": "Can't create custom recipe: %s" % err}
@ -2445,7 +2459,7 @@ if True:
{"error": <error message>}
"""
try:
custom_recipe = CustomImageRecipe.objects.get(id=recipe_id)
custom_recipe = CustomImageRecipe.objects.get(id=recipe_id)
except CustomImageRecipe.DoesNotExist:
return {"error": "Custom recipe with id=%s "
"not found" % recipe_id}