From: Juan M Cruz Alcaraz <juan.m.cruz.alca...@linux.intel.com>
A recipe added with "devtool add" requires to be able to take precedence on
recipes
previously defined with PREFERRED_PROVIDER.
By adding the parameter "--provides" to "devtool add" it is possible to specify
an element to be provided by the recipe. A devtool recipe can override a
previous
PREFERRED_PROVIDER using the layer configuration file in the workspace.
E.g.
devtool add my-libgl git@git://my-libgl-repository --provides virtual/libgl
[YOCTO #10415]
Signed-off-by: Juan M Cruz Alcaraz <juan.m.cruz.alca...@linux.intel.com>
---
scripts/lib/devtool/standard.py | 20 ++++++++++++++++++++
scripts/lib/recipetool/create.py | 3 +++
2 files changed, 23 insertions(+)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index ec192238ed..b3d857bbd9 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -151,6 +151,8 @@ def add(args, config, basepath, workspace):
extracmdopts += ' --fetch-dev'
if args.mirrors:
extracmdopts += ' --mirrors'
+ if args.provides:
+ extracmdopts += ' --provides %s' % args.provides
tempdir = tempfile.mkdtemp(prefix='devtool')
try:
@@ -266,6 +268,23 @@ def add(args, config, basepath, workspace):
f.write(' done\n')
f.write('}\n')
+ # Check if the new layer provides recipes whose priorities have been
+ # overriden by PREFERRED_PROVIDER.
+ recipe_name = rd.getVar('PN')
+ provides = rd.getVar('PROVIDES')
+ # Search every item defined in PROVIDES
+ for recipe_provided in provides.split():
+ preferred_provider = 'PREFERRED_PROVIDER_' + recipe_provided
+ if rd.getVar(preferred_provider):
+ if args.fixed_setup:
+ #if we are inside the eSDK add the new PREFERRED_PROVIDER
in the workspace layer.conf
+ layerconf_file = os.path.join(config.workspace_path,
"conf", "layer.conf")
+ with open(layerconf_file, 'a') as f:
+ f.write('%s="%s"\n' % (preferred_provider,
recipe_name))
+ else:
+ logger.warn('Set \'%s\' in order to use the recipe' %
preferred_provider)
+ break
+
_add_md5(config, recipename, appendfile)
logger.info('Recipe %s has been automatically created; further editing
may be required to make it fully functional' % recipefile)
@@ -1810,6 +1829,7 @@ def register_commands(subparsers, context):
parser_add.add_argument('--also-native', help='Also add native variant
(i.e. support building recipe for the build host as well as the target
machine)', action='store_true')
parser_add.add_argument('--src-subdir', help='Specify subdirectory within
source tree to use', metavar='SUBDIR')
parser_add.add_argument('--mirrors', help='Enable PREMIRRORS and MIRRORS
for source tree fetching (disable by default).', action="store_true")
+ parser_add.add_argument('--provides', '-p', help='Specify an alias for the
item provided by the recipe. E.g. virtual/libgl')
parser_add.set_defaults(func=add, fixed_setup=context.fixed_setup)
parser_modify = subparsers.add_parser('modify', help='Modify the source
for an existing recipe',
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index e21e2bf298..83c8e4f7b7 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -607,6 +607,8 @@ def create_recipe(args):
(stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree)
srcrev = stdout.rstrip()
lines_before.append('SRCREV = "%s"' % srcrev)
+ if args.provides:
+ lines_before.append('PROVIDES = "%s"' % args.provides)
lines_before.append('')
if srcsubdir and not args.binary:
@@ -1158,6 +1160,7 @@ def register_commands(subparsers):
description='Creates a new recipe
from a source tree')
parser_create.add_argument('source', help='Path or URL to source')
parser_create.add_argument('-o', '--outfile', help='Specify filename for
recipe to create')
+ parser_create.add_argument('-p', '--provides', help='Specify an alias for
the item provided by the recipe')
parser_create.add_argument('-m', '--machine', help='Make recipe
machine-specific as opposed to architecture-specific', action='store_true')
parser_create.add_argument('-x', '--extract-to', metavar='EXTRACTPATH',
help='Assuming source is a URL, fetch it and extract it to the directory
specified as %(metavar)s')
parser_create.add_argument('-N', '--name', help='Name to use within recipe
(PN)')
--
2.12.3
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
