From e21c79eb830ed1593e81f2d58815664109a10933 Mon Sep 17 00:00:00 2001 From: Humberto Ibarra Date: Wed, 9 Dec 2015 12:04:56 -0600 Subject: [PATCH] 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] 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(-) diff --git a/scripts/yocto-layer b/scripts/yocto-layer index 53d2aabd3fe..313d464b6e9 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) -- 2.47.3