Skip to contentSkip to conversation

Fix for YOCTO #3233

PATCH Applied [email protected] 2 participants 3 messages Oct 19, 2012 – Oct 23, 2012

lore
Share & tools
lore
#0 lore raw

cover Fix for YOCTO #3233

From: Tom Zanussi <[email protected]>

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(+)
Signature · 1 line
1.7.11.4
#1 lore raw

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

From: Tom Zanussi <[email protected]>

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]

---
 scripts/lib/bsp/engine.py | 4 ++++
 1 file changed, 4 insertions(+)
scripts/lib/bsp/engine.py +4 -0
index ac5058c..8d47bbf 100644
@@ -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:
Signature · 1 line
1.7.11.4
Applied
#2 lore raw

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

Quoted 18 lines · On 10/19/2012 10:22 AM, [email protected] wrote:

From: Tom Zanussi <[email protected]>

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]

---
  scripts/lib/bsp/engine.py | 4 ++++
  1 file changed, 4 insertions(+)
scripts/lib/bsp/engine.py +0 -0
index ac5058c..8d47bbf 100644

scripts/lib/bsp/engine.py def yocto_bsp_list_property_values(arch, property, scripts_path, properties_file · line 1454

Quoted 10 lines
scripts/lib/bsp/engine.py +4 -0
@@ -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!