diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-10-14 19:19:23 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-21 22:49:12 +0100 |
| commit | 1f7752282ffb47d2621030ddb2fa42a5e491d6d2 (patch) | |
| tree | c7f0e799c12f51a00779d7afe94a1b90bb13d43e /scripts/lib/devtool/upgrade.py | |
| parent | 80e2dfbfef2d40c3ab074142deac73317f89e3a2 (diff) | |
| download | openembedded-core-1f7752282ffb47d2621030ddb2fa42a5e491d6d2.tar.gz openembedded-core-1f7752282ffb47d2621030ddb2fa42a5e491d6d2.tar.bz2 openembedded-core-1f7752282ffb47d2621030ddb2fa42a5e491d6d2.zip | |
devtool: handle virtual providers
For modify / extract / upgrade, if the specified "recipe" is not
actually a recipe but a virtual target such as virtual/kernel, map it
correctly to the actual recipe and make sure we use that name within the
workspace. Thanks to Chris Larson for reminding me this was still broken
and for a hint on how to fix it.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib/devtool/upgrade.py')
| -rw-r--r-- | scripts/lib/devtool/upgrade.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 4f850cf0e4..d38762373e 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -300,7 +300,13 @@ def upgrade(args, config, basepath, workspace): if not rd: return 1 - standard._check_compatible_recipe(args.recipename, rd) + pn = rd.getVar('PN', True) + if pn != args.recipename: + logger.info('Mapping %s to %s' % (args.recipename, pn)) + if pn in workspace: + raise DevtoolError("recipe %s is already in your workspace" % pn) + + standard._check_compatible_recipe(pn, rd) if rd.getVar('PV', True) == args.version and rd.getVar('SRCREV', True) == args.srcrev: raise DevtoolError("Current and upgrade versions are the same version" % version) @@ -315,11 +321,11 @@ def upgrade(args, config, basepath, workspace): _upgrade_error(e, rf, args.srctree) except DevtoolError as e: _upgrade_error(e, rf, args.srctree) - standard._add_md5(config, args.recipename, os.path.dirname(rf)) + standard._add_md5(config, pn, os.path.dirname(rf)) af = _write_append(rf, args.srctree, args.same_dir, args.no_same_dir, rev2, config.workspace_path, rd) - standard._add_md5(config, args.recipename, af) + standard._add_md5(config, pn, af) logger.info('Upgraded source extracted to %s' % args.srctree) return 0 |