summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-21 14:17:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-23 11:15:50 +0100
commita3ddf39af7e7cd47156677d8ae753964ee582745 (patch)
tree3ebdf03399dfc4a81a1f69fcfee0404164e1ce03 /scripts
parentb53b4c4d6dad745b2eb0ab804f7975146a81aedf (diff)
downloadopenembedded-core-a3ddf39af7e7cd47156677d8ae753964ee582745.tar.gz
openembedded-core-a3ddf39af7e7cd47156677d8ae753964ee582745.tar.bz2
openembedded-core-a3ddf39af7e7cd47156677d8ae753964ee582745.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/combo-layer5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 448fe71cd9..330faca389 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -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)