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

scripts/combo-layer: specify branch when getting current revision 

Handle the case during update where the configured branch is not
currently checked out in the component repository by just specifying
it in the places where it was not previously.

(From OE-Core rev: a3ddf39af7e7cd47156677d8ae753964ee582745)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2012-08-21 14:17:10 +01:00 committed by Richard Purdie
parent 528d5e1478
commit eab2efc596
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/combo-layer
View File

@ -191,7 +191,7 @@ def action_init(conf, args):
branch = repo.get('branch', "master")
file_filter = repo.get('file_filter', "")
runcmd("git archive %s | tar -x -C %s %s" % (branch, extract_dir, file_filter), ldir)
lastrev = runcmd("git rev-parse HEAD", ldir).strip()
lastrev = runcmd("git rev-parse %s" % branch, ldir).strip()
conf.update(name, "last_revision", lastrev, initmode=True)
runcmd("git add .")
if conf.localconffile:
@ -475,7 +475,8 @@ def apply_patchlist(conf, repos):
else:
logger.info("No patches to apply from %s" % name)
ldir = conf.repos[name]['local_repo_dir']
lastrev = runcmd("git rev-parse HEAD", ldir).strip()
branch = conf.repos[name].get('branch', "master")
lastrev = runcmd("git rev-parse %s" % branch, ldir).strip()
if lastrev != repo['last_revision']:
conf.update(name, "last_revision", lastrev)