openembedded-core.git/scripts/lib/devtool/upgrade.py, branch uninative-1.3

devtool: upgrade: record original recipe files

2016-07-20T09:24:53+00:00

This provides us with the information we need to remove the original
version recipe and associated files when running "devtool finish" after
"devtool upgrade".

Signed-off-by: Paul Eggleton 
Signed-off-by: Ross Burton

scripts: Fix deprecated dict methods for python3

2016-06-02T07:10:03+00:00

Replaced iteritems -> items, itervalues -> values,
iterkeys -> keys or 'in'

Signed-off-by: Ed Bartosh

devtool: upgrade: clarify help text for --srcrev option

2016-05-25T06:49:53+00:00

The -S / --srcrev option must be specified if fetching from a git
repository, so spell that out in the help text.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

devtool: upgrade: tweak conflict handling

2016-05-25T06:49:53+00:00

Make a couple of changes to the rebase operation:

1) Only wrap the actual rebase command in try...except since a failure
   in any of the other commands should be an error, not a warning
2) If it's a conflict (which unfortunately we can only tell by checking
   for the keyword "conflict" since git doesn't return error codes based
   on the type of error) then print a message clarifying that the user
   needs to resolve the issue themselves to finish the upgrade.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

devtool: upgrade: handle upgrading recipes with a versioned inc file

2016-05-25T06:49:52+00:00

The gdb recipe in OE-Core has an inc file with the version in it;
since the inc file is pulled in with a "require ${PV}.inc", when
upgrading the recipe we need to also rename the inc file it will fail to
parse and the upgrade itself will fail.

Fixes [YOCTO #9574].

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

devtool: upgrade: handle recipes where source is not first entry in SRC_URI

2016-04-15T05:57:47+00:00

It is unusual but not impossible to find recipes whose first entry is
not the main source URL but instead some patch or other local file, for
example python-cryptography in meta-python (which sets SRC_URI before
inheriting pypi). There's nothing inherently wrong with this, and we
shouldn't assume that the first entry is the main source URL, so just
take the first non-local entry instead.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

devtool: upgrade: print new recipe name

2016-02-28T11:32:36+00:00

Make this consistent with "devtool add" so that the user knows where to
find the new recipe.

Signed-off-by: Paul Eggleton 
Signed-off-by: Ross Burton

devtool: upgrade: drop PR on upgrade

2016-02-28T11:32:36+00:00

The PR value should be reset to the default when upgrading, so we need
to drop it from the newly created file.

Signed-off-by: Paul Eggleton 
Signed-off-by: Ross Burton

devtool: upgrade: eliminate unnecessary datastore copy

2016-02-28T11:32:36+00:00

We aren't modifying the datastore copy here, so we don't need a copy at
all.

Signed-off-by: Paul Eggleton 
Signed-off-by: Ross Burton

devtool: upgrade: fix several issues with extraction of new source

2016-02-28T11:32:36+00:00

Fix several issues when extracting the new version source over the top
of the old one (when the recipe is not fetching from a git repo):

* Delete the old source first so we ensure files deleted in the new
  version are deleted. This also has the side-effect of fixing any
  issues where files aren't marked writeable in the old source and thus
  overwriting them failed (harfbuzz 1.1.3 contains such files).
* Fix incorrect variable name in abspath statement that made it a no-op

Signed-off-by: Paul Eggleton 
Signed-off-by: Ross Burton