summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-12-28 13:44:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-03 12:37:08 +0000
commitf3db1cd8fff4200a4aa37c810bb7594e3c057b57 (patch)
treeab88fcf095a10ddb4db008f40fc776168171f1cc
parentb0689417df6f16d43dbd579d281371e351ac3e26 (diff)
downloadpoky-f3db1cd8fff4200a4aa37c810bb7594e3c057b57.tar.gz
poky-f3db1cd8fff4200a4aa37c810bb7594e3c057b57.tar.bz2
poky-f3db1cd8fff4200a4aa37c810bb7594e3c057b57.zip
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: 601b6227908f3dd7972ad62c53d1041f4429aeb2) 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 9d16b19336..4ddb74499a 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: