diff options
author | Trevor Woerner <twoerner@gmail.com> | 2016-03-12 21:35:29 -0500 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-05-30 11:25:16 +0000 |
commit | ffc3a4c070aad0612a6a00edc6ff8da10e39ab71 (patch) | |
tree | df3543b7e15aaf9b9819c10144e169d6a73cdd63 | |
parent | 161aacecbd510ceaca23b8208a407cf85a4b014f (diff) | |
download | openembedded-core-contrib-ffc3a4c070aad0612a6a00edc6ff8da10e39ab71.tar.gz |
metadata-revs: provide more information
Provide many more details concerning the repositories that are used in a
particular build: the remote information, the layer, the local branch, the
remote branch the local branch tracks (if any), and the HEAD commit.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta/classes/buildhistory.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/metadata_scm.bbclass | 18 |
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 0d16adb701..53a7476a6f 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -610,9 +610,13 @@ def buildhistory_get_build_id(d): def buildhistory_get_metadata_revs(d): # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want + import subprocess layers = (d.getVar("BBLAYERS", True) or "").split() - medadata_revs = ["%-17s = %s:%s" % (os.path.relpath(i, d.getVar('BBLAYERS_FETCH_DIR', True)), \ + medadata_revs = ["%s\tlayer: %s\n\tbranch: %s\n\tremote: %s\n\tHEAD: %s\n" % ( \ + base_get_metadata_git_remote(i, None), \ + os.path.relpath(i, d.getVar('BBLAYERS_FETCH_DIR', True)), \ base_get_metadata_git_branch(i, None).strip(), \ + base_get_metadata_git_remote_branch(i, None).strip(), \ base_get_metadata_git_revision(i, None)) \ for i in layers] return '\n'.join(medadata_revs) diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index 2e6fac209a..1e3aa51dc3 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass @@ -72,6 +72,15 @@ def base_get_metadata_git_branch(path, d): rev = '<unknown>' return rev.strip() +def base_get_metadata_git_remote_branch(path, d): + import bb.process + + try: + rev, _ = bb.process.run('git rev-parse --abbrev-ref --symbolic-full-name @{u}', cwd=path) + except bb.process.ExecutionError: + rev = '(HEAD does not point to a remote branch)' + return rev.strip() + def base_get_metadata_git_revision(path, d): import bb.process @@ -80,3 +89,12 @@ def base_get_metadata_git_revision(path, d): except bb.process.ExecutionError: rev = '<unknown>' return rev.strip() + +def base_get_metadata_git_remote(path, d): + import bb.process + + try: + lines, _ = bb.process.run('git remote -v', cwd=path) + except bb.process.ExecutionError: + return '<unknown>' + return lines |