From 738f77bd06a5d5c12b751796c934f6c84e0ecb37 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 7 Aug 2012 16:11:14 -0500 Subject: yocto-bsp: generate default properties even if json specified Users seem to want to specify incomplete property sets when using json input. Allow this by generating default properties before the user-specified properties are applied; the user will then get the defaults for any unspecified values, and avoid cryptic backtraces. (From meta-yocto rev: 3f0361f77cf64844da93ba4a76c42cd5befff5ad) Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/lib/bsp/engine.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py index 7a98f447c3..eb3efbf5c7 100644 --- a/scripts/lib/bsp/engine.py +++ b/scripts/lib/bsp/engine.py @@ -1235,10 +1235,10 @@ def yocto_bsp_create(machine, arch, scripts_path, bsp_output_dir, codedump, prop gen_program_header_lines(program_lines) + gen_initial_property_vals(input_lines, program_lines) + if properties: gen_supplied_property_vals(properties, program_lines) - else: - gen_initial_property_vals(input_lines, program_lines) gen_program_machine_lines(machine, program_lines) -- cgit v1.2.3-54-g00ecf