sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Dave Lerner 2016-03-04 16:41:27 +00:00 committed by Richard Purdie
parent a54cebe929
commit 9cda2ab8d5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bitbake/lib/toaster/toastergui/views.py
View File

@ -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")