From 0f3ad7c77aa0f8bb7641af1886e1420cdfa8419f Mon Sep 17 00:00:00 2001 From: Humberto Ibarra Date: Wed, 9 Dec 2015 12:04:56 -0600 Subject: scripts/yocto-layer: Avoids duplication of "meta-" prefix The yocto-layer script puts and extra "meta-" prefix on the given layer name even when the prefix is already there. This fix avoids duplicating the prefix in these situations. The change was done inside the create subcommand since this is a parsing specific to the layer creation. Parsing this in the main method of yocto-layer was not the right way to go. Before the change: $ yocto-layer create meta-layer [...] New layer created in meta-meta-layer. After the change: $ yocto-layer create meta-layer [...] New layer created in meta-layer. [YOCTO #8050] (From meta-yocto rev: e21c79eb830ed1593e81f2d58815664109a10933) Signed-off-by: Humberto Ibarra Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/yocto-layer | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts/yocto-layer') diff --git a/scripts/yocto-layer b/scripts/yocto-layer index 53d2aabd3f..313d464b6e 100755 --- a/scripts/yocto-layer +++ b/scripts/yocto-layer @@ -75,7 +75,11 @@ def yocto_layer_create_subcommand(args, usage_str): if options.outdir: layer_output_dir = options.outdir else: - layer_output_dir = "meta-" + layer_name + prefix="meta-" + if not layer_name.startswith(prefix): + layer_output_dir="%s%s"%(prefix,layer_name) + else: + layer_output_dir=layer_name yocto_layer_create(layer_name, scripts_path, layer_output_dir, options.codedump, options.properties_file, properties) -- cgit v1.2.3-54-g00ecf