From 37d295c81692a8145cb7a235ebf9556e9b902df5 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 18 Jan 2013 12:27:13 -0600 Subject: scripts/lib/bsp/engine.py: add handling for JSON strings Normally pre-canned properties are supplied as JSON from a file, which the user can specify using e.g. the -i option. We can reuse that basic functionality for dedicated command-line parameters by sythesizing a JSON string containing those param values on the fly and passing that in instead. This adds the ability for the common creation code to accept JSON strings as well as JSON files. (From meta-yocto rev: 5a2e840b24822e018de94ec4f554363b59c4e8bd) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/bsp/engine.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py index 7431860547..aa26280796 100644 --- a/scripts/lib/bsp/engine.py +++ b/scripts/lib/bsp/engine.py @@ -1387,6 +1387,9 @@ def yocto_common_create(machine, target, scripts_path, layer_output_dir, codedum properties = json.load(infile) + if properties_str and not properties: + properties = json.loads(properties_str) + os.mkdir(layer_output_dir) context = create_context(machine, target, scripts_path) @@ -1413,7 +1416,7 @@ def yocto_common_create(machine, target, scripts_path, layer_output_dir, codedum run_program_lines(program_lines, codedump) -def yocto_layer_create(layer_name, scripts_path, layer_output_dir, codedump, properties_file): +def yocto_layer_create(layer_name, scripts_path, layer_output_dir, codedump, properties_file, properties=""): """ Create yocto layer @@ -1424,13 +1427,13 @@ def yocto_layer_create(layer_name, scripts_path, layer_output_dir, codedump, pro properties_file - use values from this file if nonempty i.e no prompting properties - use values from this string if nonempty i.e no prompting """ - yocto_common_create(layer_name, "layer", scripts_path, layer_output_dir, codedump, properties_file, False) + yocto_common_create(layer_name, "layer", scripts_path, layer_output_dir, codedump, properties_file, properties, False) print "\nNew layer created in %s.\n" % (layer_output_dir) print "Don't forget to add it to your BBLAYERS (for details see %s\README)." % (layer_output_dir) -def yocto_bsp_create(machine, arch, scripts_path, bsp_output_dir, codedump, properties_file): +def yocto_bsp_create(machine, arch, scripts_path, bsp_output_dir, codedump, properties_file, properties=None): """ Create bsp @@ -1443,7 +1446,7 @@ def yocto_bsp_create(machine, arch, scripts_path, bsp_output_dir, codedump, prop properties_file - use values from this file if nonempty i.e no prompting properties - use values from this string if nonempty i.e no prompting """ - yocto_common_create(machine, arch, scripts_path, bsp_output_dir, codedump, properties_file) + yocto_common_create(machine, arch, scripts_path, bsp_output_dir, codedump, properties_file, properties) print "\nNew %s BSP created in %s" % (arch, bsp_output_dir) -- cgit v1.2.3-54-g00ecf