[PATCH 0/1][danny] fix for bug 3233

[PATCH 0/1][danny] fix for bug 3233

[tom.zanussi]

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

This bug cropped up just before the danny release and was pulled into
denzil and master, and also needs to go into danny.

Please pull into poky/danny.

The following changes since commit a7ce81df2f6e513a7e364c443759733c778b5c1f:

  yocto-bsp: qualify user files with machine name (2013-02-05 21:37:35 +0000)

are available in the git repository at:

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

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][danny] 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]

(From meta-yocto rev: 064b15f76c5b52899f4c3fdef06412c3063062a5)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 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