summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-02-05 11:13:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 13:29:21 +0000
commita8ab1c6b25aac12215f44da9934cffcba62a34f2 (patch)
treefeb2c9ce2d309607926a45bc9388776121b1e369
parent0fee829932fe0263bdc0b61cd3546743e726a2d7 (diff)
downloadpoky-a8ab1c6b25aac12215f44da9934cffcba62a34f2.tar.gz
bitbake: toaster: buildinfohelper CustomImagePackage update dependency info
Instead of keeping the original dependency information for the pool of CustomImagePackage reset it with each new build. (Bitbake rev: a0b97ffc7a468bad081ce3276c74728bf6830250) 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>
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py19
1 files changed, 4 insertions, 15 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 74e3588982..c049b4a150 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -558,6 +558,10 @@ class ORMWrapper(object):
558 else: 558 else:
559 packagedict[p]['object'], created = \ 559 packagedict[p]['object'], created = \
560 CustomImagePackage.objects.get_or_create(name=searchname) 560 CustomImagePackage.objects.get_or_create(name=searchname)
561 # Clear the Package_Dependency objects as we're going to update
562 # the CustomImagePackage with the latest dependency information
563 packagedict[p]['object'].package_dependencies_target.all().delete()
564 packagedict[p]['object'].package_dependencies_source.all().delete()
561 try: 565 try:
562 recipe = self._cached_get(Recipe, 566 recipe = self._cached_get(Recipe,
563 name=built_recipe.name, 567 name=built_recipe.name,
@@ -611,21 +615,6 @@ class ORMWrapper(object):
611 tdeptype = Package_Dependency.TYPE_TRECOMMENDS 615 tdeptype = Package_Dependency.TYPE_TRECOMMENDS
612 616
613 try: 617 try:
614 # If this is a built package we are always going to have
615 # new package objects as it's part of the build history
616 # which also means new package dependency for each object.
617 # However if they are project packages we don't want to
618 # duplicate these so check if they exist or not first
619 if built_package == False:
620 try:
621 Package_Dependency.objects.get(
622 package=packagedict[p]['object'],
623 depends_on=packagedict[px]['object'],
624 dep_type=tdeptype)
625 continue
626 except Package_Dependency.DoesNotExist:
627 pass
628
629 packagedeps_objs.append(Package_Dependency( 618 packagedeps_objs.append(Package_Dependency(
630 package = packagedict[p]['object'], 619 package = packagedict[p]['object'],
631 depends_on = packagedict[px]['object'], 620 depends_on = packagedict[px]['object'],