yocto-layer: add optional layer priority param

If the user specifies a layer priority following the layer name, layer
creation will proceed without further queries using the specified
layer priority and the remaining values defaulted.

(From meta-yocto rev: 84a0bd8940f82fb938972d7b026367d40c9472e7)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi 2013-01-18 12:27:12 -06:00 committed by Richard Purdie
parent 7b0026ea12
commit 1ca4b36445
2 changed files with 19 additions and 4 deletions

View File

@ -622,7 +622,8 @@ yocto_layer_create_usage = """
Create a new generic Yocto layer
usage: yocto-layer create <layer-name> [-o <DIRNAME> | --outdir <DIRNAME>]
usage: yocto-layer create <layer-name> [layer_priority]
[-o <DIRNAME> | --outdir <DIRNAME>]
[-i <JSON PROPERTY FILE> | --infile <JSON PROPERTY_FILE>]
This command creates a generic Yocto layer based on the specified
@ -631,6 +632,10 @@ yocto_layer_create_usage = """
'meta-layer-name'. The -o option can be used to place the layer in a
directory with a different name and location.
If layer_priority is specified, a simple layer will be created using
the given layer priority, and the user will not be prompted for
further input.
NOTE: Once created, you should add your new layer to your
bblayers.conf file in order for it to be subsequently seen and
modified by the yocto-kernel tool. Instructions for doing this can
@ -646,7 +651,8 @@ NAME
yocto-layer create - Create a new generic Yocto layer
SYNOPSIS
yocto-layer create <layer-name> [-o <DIRNAME> | --outdir <DIRNAME>]
yocto-layer create <layer-name> [layer_priority]
[-o <DIRNAME> | --outdir <DIRNAME>]
[-i <JSON PROPERTY FILE> | --infile <JSON PROPERTY_FILE>]
DESCRIPTION
@ -656,6 +662,10 @@ DESCRIPTION
'meta-layer-name'. The -o option can be used to place the layer
in a directory with a different name and location.
If layer_priority is specified, a simple layer will be created
using the given layer priority, and the user will not be prompted
for further input.
The layer-specific properties that define the values that will be
used to generate the layer can be specified on the command-line
using the -i option and supplying a JSON object consisting of the

View File

@ -60,19 +60,24 @@ def yocto_layer_create_subcommand(args, usage_str):
default = False, help = "dump the generated code to layergen.out")
(options, args) = parser.parse_args(args)
if len(args) != 1:
if len(args) < 1 or len(args) > 2:
logging.error("Wrong number of arguments, exiting\n")
parser.print_help()
sys.exit(1)
layer_name = args[0]
properties = ""
if len(args) == 2:
layer_priority = args[1]
properties = '{"layer_priority":"' + layer_priority + '"}'
if options.outdir:
layer_output_dir = options.outdir
else:
layer_output_dir = "meta-" + layer_name
yocto_layer_create(layer_name, scripts_path, layer_output_dir, options.codedump, options.properties_file)
yocto_layer_create(layer_name, scripts_path, layer_output_dir, options.codedump, options.properties_file, properties)
def yocto_layer_list_subcommand(args, usage_str):