bitbake: toaster: xhr_customrecipe_id change to use CustomImagePackage

Instead of doing a shallow copy of the package into the
CustomImageRecipe when we add packages we can now use the
CustomImagePackage as a M2M field on the Package to CustomImageRecipe.
Also switch to using Target_Installed_Package as the method to retrieve
the package list from the build.

(Bitbake rev: 4ebc81823b3aec6ecf38835acad5263a81eb41c5)

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 16:25:49 +00:00 committed by Richard Purdie
parent 439314c1b2
commit a9668eeb74
1 changed files with 23 additions and 19 deletions

View File

@ -30,7 +30,7 @@ from django.db import IntegrityError, Error
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from orm.models import Build, Target, Task, Layer, Layer_Version, Recipe, LogMessage, Variable from orm.models import Build, Target, Task, Layer, Layer_Version, Recipe, LogMessage, Variable
from orm.models import Task_Dependency, Recipe_Dependency, Package, Package_File, Package_Dependency from orm.models import Task_Dependency, Recipe_Dependency, Package, Package_File, Package_Dependency
from orm.models import Target_Installed_Package, Target_File, Target_Image_File, BuildArtifact from orm.models import Target_Installed_Package, Target_File, Target_Image_File, BuildArtifact, CustomImagePackage
from orm.models import BitbakeVersion, CustomImageRecipe from orm.models import BitbakeVersion, CustomImageRecipe
from bldcontrol import bbcontroller from bldcontrol import bbcontroller
from django.views.decorators.cache import cache_control from django.views.decorators.cache import cache_control
@ -2411,32 +2411,36 @@ if True:
return {"error": "Can't create custom recipe: %s" % err} return {"error": "Can't create custom recipe: %s" % err}
# Find the package list from the last build of this recipe/target # Find the package list from the last build of this recipe/target
build = Build.objects.filter(target__target=params['base'].name, target = Target.objects.filter(Q(build__outcome=Build.SUCCEEDED) &
project=params['project']).last() Q(build__project=params['project']) &
(Q(target=params['base'].name) |
if build: Q(target=recipe.name))).last()
if target:
# Copy in every package # Copy in every package
# We don't want these packages to be linked to anything because # We don't want these packages to be linked to anything because
# that underlying data may change e.g. delete a build # that underlying data may change e.g. delete a build
for package in build.package_set.all(): for tpackage in target.target_installed_package_set.all():
_copy_packge_to_recipe(recipe, package) try:
else: built_package = tpackage.package
logger.debug("No packages found for this base recipe") # The package had no recipe information so is a ghost
# package skip it
if built_package.recipe == None:
continue;
config_package = CustomImagePackage.objects.get(
name=built_package.name)
recipe.includes_set.add(config_package)
except Exception as e:
logger.warning("Error adding package %s %s" %
(tpackage.package.name, e))
pass
return {"error": "ok", return {"error": "ok",
"packages" : recipe.get_all_packages().count(),
"url": reverse('customrecipe', args=(params['project'].pk, "url": reverse('customrecipe', args=(params['project'].pk,
recipe.id))} recipe.id))}
def _copy_packge_to_recipe(recipe, package):
""" copy a package from another recipe """
package.pk = None
package.save()
# Disassociate the package from the build
package.build = None
package.recipe = recipe
package.save()
return package
@xhr_response @xhr_response
def xhr_customrecipe_id(request, recipe_id): def xhr_customrecipe_id(request, recipe_id):
""" """