summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2013-02-06 15:34:21 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-07 23:59:48 (GMT)
commit4724491653d22b8b25f08c109a47c0782717b0b2 (patch)
treee23ef37a7093a73d8e1d47af106a4cd0f130104f
parent05c18a1dcf648848ef5853b32421cf292d2eb724 (diff)
downloadpoky-4724491653d22b8b25f08c109a47c0782717b0b2.tar.gz
yocto-bsp: set branches_base for list_property_values()
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) (From meta-yocto rev: d381095eed24a426ea655c04279e23b13b1af34a) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/bsp/engine.py4
1 files changed, 4 insertions, 0 deletions
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
1445 gen_fn = input_line.props["gen"] 1445 gen_fn = input_line.props["gen"]
1446 if nested_properties: 1446 if nested_properties:
1447 context["filename"] = nested_properties[0] 1447 context["filename"] = nested_properties[0]
1448 try:
1449 context["branches_base"] = input_line.props["branches_base"]
1450 except KeyError:
1451 context["branches_base"] = None
1448 values_list = input_line.gen_choices_list(context, False) 1452 values_list = input_line.gen_choices_list(context, False)
1449 except KeyError: 1453 except KeyError:
1450 for choice in input_line.choices: 1454 for choice in input_line.choices: