sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Humberto Ibarra 2015-12-09 12:04:56 -06:00 committed by Richard Purdie
parent 220ef3269f
commit 0f3ad7c77a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/yocto-layer
View File

@ -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)