[PATCH 1/1 v2] toaster: fixup dependency excludes for customimage

[PATCH 1/1 v2] toaster: fixup dependency excludes for customimage

[Dave Lerner]

[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.

Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
---
 bitbake/lib/toaster/toastergui/views.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 28b03d3..f3b8d3c 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")
-- 
1.9.1

Re: [PATCH 1/1 v2] toaster: fixup dependency excludes for customimage

[Michael Wood]

Thanks Dave

Sent to bitbake-devel and committed to toaster-next

Michael

On 03/03/16 21:43, Dave Lerner wrote:
> [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.
>
> Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
> ---
>   bitbake/lib/toaster/toastergui/views.py | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
> index 28b03d3..f3b8d3c 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")

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.