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

devtool: update-recipe: do rev parsing in a separate function 

Split out the logic of determining "initial rev" and "update rev" into a
separate function.

(From OE-Core rev: 17206934822aab31d93318bffea8099bf9965112)

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Lehtonen 2015-05-21 15:46:14 +03:00 committed by Richard Purdie
parent f0ab93f177
commit 5d7437ea86
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
scripts/lib/devtool/standard.py
View File

@ -514,6 +514,36 @@ def modify(args, config, basepath, workspace):
return 0
def _get_patchset_revs(args, srctree, recipe_path):
"""Get initial and update rev of a recipe. These are the start point of the
whole patchset and start point for the patches to be re-generated/updated.
"""
import bb
if args.initial_rev:
return args.initial_rev, args.initial_rev
# Parse initial rev from recipe
commits = []
initial_rev = None
with open(recipe_path, 'r') as f:
for line in f:
if line.startswith('# initial_rev:'):
initial_rev = line.split(':')[-1].strip()
elif line.startswith('# commit:'):
commits.append(line.split(':')[-1].strip())
update_rev = initial_rev
if initial_rev:
# Find first actually changed revision
stdout, _ = bb.process.run('git rev-list --reverse %s..HEAD' %
initial_rev, cwd=srctree)
newcommits = stdout.split()
for i in xrange(min(len(commits), len(newcommits))):
if newcommits[i] == commits[i]:
update_rev = commits[i]
return initial_rev, update_rev
def update_recipe(args, config, basepath, workspace):
"""Entry point for the devtool 'update-recipe' subcommand"""
@ -618,34 +648,11 @@ def update_recipe(args, config, basepath, workspace):
logger.info('You will need to update SRC_URI within the recipe to point to a git repository where you have pushed your changes')
elif mode == 'patch':
commits = []
update_rev = None
if args.initial_rev:
initial_rev = args.initial_rev
else:
initial_rev = None
with open(append, 'r') as f:
for line in f:
if line.startswith('# initial_rev:'):
initial_rev = line.split(':')[-1].strip()
elif line.startswith('# commit:'):
commits.append(line.split(':')[-1].strip())
if initial_rev:
# Find first actually changed revision
(stdout, _) = bb.process.run('git rev-list --reverse %s..HEAD' % initial_rev, cwd=srctree)
newcommits = stdout.split()
for i in xrange(min(len(commits), len(newcommits))):
if newcommits[i] == commits[i]:
update_rev = commits[i]
initial_rev, update_rev = _get_patchset_revs(args, srctree, append)
if not initial_rev:
logger.error('Unable to find initial revision - please specify it with --initial-rev')
return -1
if not update_rev:
update_rev = initial_rev
# Find list of existing patches in recipe file
existing_patches = oe.recipeutils.get_recipe_patches(rd)