summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorDave Lerner <dave.lerner@windriver.com>2016-03-04 16:41:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 17:23:03 +0000
commit9cda2ab8d52a8ea9131c81f0ea48c9596d4c72af (patch)
treed44807ae052712d47c11a8b3d72a7a94157e94c9 /bitbake
parenta54cebe92952953f7ae213101e72cbda4e263b39 (diff)
downloadpoky-9cda2ab8d52a8ea9131c81f0ea48c9596d4c72af.tar.gz
bitbake: toaster: fixup dependency excludes for customimage
[YOCTO #9156] For a customized image when adding a dependent package X that depends on dependency package Y, in addition to adding X to appends_set and Y to includes_set, make sure that Y is no longer in the excludes_set. Y may have been added to the excludes_set by a prior package removal. (Bitbake rev: 6b29d3297de2ae48a3ac5529ba0d22f895276b56) Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 28b03d30b2..f3b8d3cd59 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2653,6 +2653,13 @@ if True:
2653 name=dep.depends_on.name) 2653 name=dep.depends_on.name)
2654 2654
2655 recipe.includes_set.add(cust_package) 2655 recipe.includes_set.add(cust_package)
2656 try:
2657 # when adding the pre-requisite package make sure it's not in the
2658 # excluded list from a prior removal.
2659 recipe.excludes_set.remove(cust_package)
2660 except Package.DoesNotExist:
2661 # Don't care if the package had never been excluded
2662 pass
2656 except: 2663 except:
2657 logger.warning("Could not add package's suggested" 2664 logger.warning("Could not add package's suggested"
2658 "dependencies to the list") 2665 "dependencies to the list")