summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumberto Ibarra <humberto.ibarra.lopez@intel.com>2015-12-09 12:04:56 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:52:21 +0000
commit0f3ad7c77aa0f8bb7641af1886e1420cdfa8419f (patch)
treed0d0fc8c164d17978f2c18cbd662563e7e294d55
parent220ef3269f4413ace3d5833813a1f4798b1202f4 (diff)
downloadpoky-0f3ad7c77aa0f8bb7641af1886e1420cdfa8419f.tar.gz
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 <humberto.ibarra.lopez@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/yocto-layer6
1 files changed, 5 insertions, 1 deletions
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):
75 if options.outdir: 75 if options.outdir:
76 layer_output_dir = options.outdir 76 layer_output_dir = options.outdir
77 else: 77 else:
78 layer_output_dir = "meta-" + layer_name 78 prefix="meta-"
79 if not layer_name.startswith(prefix):
80 layer_output_dir="%s%s"%(prefix,layer_name)
81 else:
82 layer_output_dir=layer_name
79 83
80 yocto_layer_create(layer_name, scripts_path, layer_output_dir, options.codedump, options.properties_file, properties) 84 yocto_layer_create(layer_name, scripts_path, layer_output_dir, options.codedump, options.properties_file, properties)
81 85