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>
This commit is contained in:
Michael Wood
Richard Purdie
parent
fa5ea98d3b
commit
30a9f65dcc
|
|
@ -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, CustomImageRecipe
|
||||
from orm.models import Project, CustomImagePackage
|
||||
from orm.models import signal_runbuilds
|
||||
|
||||
from bldcontrol.models import BuildEnvironment, BuildRequest
|
||||
|
|
@ -361,11 +361,6 @@ class ORMWrapper(object):
|
|||
|
||||
def get_update_layer_version_object(self, build_obj, layer_obj, layer_version_information):
|
||||
if isinstance(layer_obj, Layer_Version):
|
||||
# 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 == CustomImageRecipe.LAYER_NAME:
|
||||
return layer_obj
|
||||
# We already found our layer version for this build so just
|
||||
# update it with the new build information
|
||||
logger.debug("We found our layer from toaster")
|
||||
|
|
|
|||
|
|
@ -228,13 +228,22 @@ class LocalhostBEController(BuildEnvironmentController):
|
|||
br_layer_base_recipe = layers.get(
|
||||
layer_version=customrecipe.base_recipe.layer_version)
|
||||
|
||||
br_layer_base_dirpath = \
|
||||
os.path.join(self.be.sourcedir,
|
||||
self.getGitCloneDirectory(
|
||||
br_layer_base_recipe.giturl,
|
||||
br_layer_base_recipe.commit),
|
||||
customrecipe.base_recipe.layer_version.dirpath
|
||||
)
|
||||
# If the layer is one that we've cloned we know where it lives
|
||||
if br_layer_base_recipe.giturl and br_layer_base_recipe.commit:
|
||||
layer_path = self.getGitCloneDirectory(
|
||||
br_layer_base_recipe.giturl,
|
||||
br_layer_base_recipe.commit)
|
||||
# Otherwise it's a local layer
|
||||
elif br_layer_base_recipe.local_source_dir:
|
||||
layer_path = br_layer_base_recipe.local_source_dir
|
||||
else:
|
||||
logger.error("Unable to workout the dir path for the custom"
|
||||
" image recipe")
|
||||
|
||||
br_layer_base_dirpath = os.path.join(
|
||||
self.be.sourcedir,
|
||||
layer_path,
|
||||
customrecipe.base_recipe.layer_version.dirpath)
|
||||
|
||||
customrecipe.base_recipe.layer_version.dirpath = \
|
||||
br_layer_base_dirpath
|
||||
|
|
@ -249,6 +258,8 @@ class LocalhostBEController(BuildEnvironmentController):
|
|||
|
||||
# Update the layer and recipe objects
|
||||
customrecipe.layer_version.dirpath = layerpath
|
||||
customrecipe.layer_version.layer.local_source_dir = layerpath
|
||||
customrecipe.layer_version.layer.save()
|
||||
customrecipe.layer_version.save()
|
||||
|
||||
customrecipe.file_path = recipe_path
|
||||
|
|
|
|||
|
|
@ -1636,7 +1636,8 @@ class CustomImageRecipe(Recipe):
|
|||
if base_recipe_path:
|
||||
base_recipe = open(base_recipe_path, 'r').read()
|
||||
else:
|
||||
raise IOError("Based on recipe file not found")
|
||||
raise IOError("Based on recipe file not found: %s" %
|
||||
base_recipe_path)
|
||||
|
||||
# Add a special case for when the recipe we have based a custom image
|
||||
# recipe on requires another recipe.
|
||||
|
|
|
|||
|
|
@ -291,10 +291,13 @@ class XhrCustomRecipe(View):
|
|||
return error_response("recipe-already-exists")
|
||||
|
||||
# create layer 'Custom layer' and verion if needed
|
||||
layer = Layer.objects.get_or_create(
|
||||
layer, l_created = Layer.objects.get_or_create(
|
||||
name=CustomImageRecipe.LAYER_NAME,
|
||||
summary="Layer for custom recipes",
|
||||
vcs_url="file:///toaster_created_layer")[0]
|
||||
summary="Layer for custom recipes")
|
||||
|
||||
if l_created:
|
||||
layer.local_source_dir = "toaster_created_layer"
|
||||
layer.save()
|
||||
|
||||
# Check if we have a layer version already
|
||||
# We don't use get_or_create here because the dirpath will change
|
||||
|
|
@ -303,9 +306,10 @@ class XhrCustomRecipe(View):
|
|||
Q(layer=layer) &
|
||||
Q(build=None)).last()
|
||||
if lver is None:
|
||||
lver, created = Layer_Version.objects.get_or_create(
|
||||
lver, lv_created = Layer_Version.objects.get_or_create(
|
||||
project=params['project'],
|
||||
layer=layer,
|
||||
layer_source=LayerSource.TYPE_LOCAL,
|
||||
dirpath="toaster_created_layer")
|
||||
|
||||
# Add a dependency on our layer to the base recipe's layer
|
||||
|
|
@ -319,7 +323,7 @@ class XhrCustomRecipe(View):
|
|||
optional=False)
|
||||
|
||||
# Create the actual recipe
|
||||
recipe, created = CustomImageRecipe.objects.get_or_create(
|
||||
recipe, r_created = CustomImageRecipe.objects.get_or_create(
|
||||
name=request.POST["name"],
|
||||
base_recipe=params["base"],
|
||||
project=params["project"],
|
||||
|
|
@ -329,7 +333,7 @@ class XhrCustomRecipe(View):
|
|||
# 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:
|
||||
if r_created:
|
||||
recipe.file_path = request.POST["name"]
|
||||
recipe.license = "MIT"
|
||||
recipe.version = "0.1"
|
||||
|
|
|
|||
Loading…
Reference in New Issue