From: Tom Zanussi Date: Tue, 7 Aug 2012 21:11:14 +0000 (-0500) Subject: yocto-bsp: generate default properties even if json specified X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f0361f77cf64844da93ba4a76c42cd5befff5ad;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold --- diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py index 7a98f447c37..eb3efbf5c7e 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)