[PATCH 0/1] Fix for YOCTO #3233

[PATCH 0/1] Fix for YOCTO #3233

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This fixes a problem seen on one of the QA systems running 'create bsp'
functionality in ADT.  We haven't been able to reproduce the problem
elsewhere, but it fixes it there.

The following changes since commit fadb4079014514beb7d2d3e6c66f63397d4ebce2:

  PACKAGES_DYNAMIC: use += instead of = in most cases (2012-10-19 18:02:26 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/3233-fix
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/3233-fix

Tom Zanussi (1):
  yocto-bsp: set branches_base for list_property_values()

 scripts/lib/bsp/engine.py | 4 ++++
 1 file changed, 4 insertions(+)

-- 
1.7.11.4

[PATCH 1/1] yocto-bsp: set branches_base for list_property_values()

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

yocto_bsp_list_property_values() is missing the context it needs to
properly filter choicelists, so add it to the context object.

Fixes [YOCTO #3233]

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 scripts/lib/bsp/engine.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index ac5058c..8d47bbf 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1445,6 +1445,10 @@ def yocto_bsp_list_property_values(arch, property, scripts_path, properties_file
             gen_fn = input_line.props["gen"]
             if nested_properties:
                 context["filename"] = nested_properties[0]
+                try:
+                    context["branches_base"] = input_line.props["branches_base"]
+                except KeyError:
+                    context["branches_base"] = None
             values_list = input_line.gen_choices_list(context, False)
         except KeyError:
             for choice in input_line.choices:
-- 
1.7.11.4

Re: [PATCH 1/1] yocto-bsp: set branches_base for list_property_values()

[Saul Wold]

On 10/19/2012 10:22 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
>
> yocto_bsp_list_property_values() is missing the context it needs to
> properly filter choicelists, so add it to the context object.
>
> Fixes [YOCTO #3233]
>
> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> ---
>   scripts/lib/bsp/engine.py | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
> index ac5058c..8d47bbf 100644
> --- a/scripts/lib/bsp/engine.py
> +++ b/scripts/lib/bsp/engine.py
> @@ -1445,6 +1445,10 @@ def yocto_bsp_list_property_values(arch, property, scripts_path, properties_file
>               gen_fn = input_line.props["gen"]
>               if nested_properties:
>                   context["filename"] = nested_properties[0]
> +                try:
> +                    context["branches_base"] = input_line.props["branches_base"]
> +                except KeyError:
> +                    context["branches_base"] = None
>               values_list = input_line.gen_choices_list(context, False)
>           except KeyError:
>               for choice in input_line.choices:
>
Merged into Poky Master

Thanks
	Sau!