From 9cda2ab8d52a8ea9131c81f0ea48c9596d4c72af Mon Sep 17 00:00:00 2001 From: Dave Lerner Date: Fri, 4 Mar 2016 16:41:27 +0000 Subject: 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 Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'bitbake/lib/toaster/toastergui/views.py') 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: name=dep.depends_on.name) recipe.includes_set.add(cust_package) + try: + # when adding the pre-requisite package make sure it's not in the + # excluded list from a prior removal. + recipe.excludes_set.remove(cust_package) + except Package.DoesNotExist: + # Don't care if the package had never been excluded + pass except: logger.warning("Could not add package's suggested" "dependencies to the list") -- cgit v1.2.3-54-g00ecf