diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-09 11:52:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-11 10:30:57 +0100 |
commit | 38a9622ba35f674f66bc9e74512805f4834b606d (patch) | |
tree | 1f28ec109f11b51863e3f551b470addaf896212c /meta/classes/buildhistory.bbclass | |
parent | 3ae4dd140a76acb64d776be925f5e56ac67746e0 (diff) | |
download | poky-38a9622ba35f674f66bc9e74512805f4834b606d.tar.gz |
base/buildhistory/image-buildinfo: Use common buildcfg function
Reduce code duplication to a common function in oe.buildcfg.
(From OE-Core rev: 0b191a1df4c3722defb09dde0c16b1d9e7fe7ef6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 6fffd47189..4ba9ec8f25 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -742,13 +742,9 @@ def buildhistory_get_build_id(d): | |||
742 | return('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines))) | 742 | return('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines))) |
743 | 743 | ||
744 | def buildhistory_get_metadata_revs(d): | 744 | def buildhistory_get_metadata_revs(d): |
745 | # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want | 745 | # We want an easily machine-readable format here |
746 | layers = (d.getVar("BBLAYERS") or "").split() | 746 | revisions = oe.buildcfg.get_layer_revisions(d) |
747 | medadata_revs = ["%-17s = %s:%s%s" % (os.path.basename(i), \ | 747 | medadata_revs = ["%-17s = %s:%s%s" % (r[1], r[2], r[3], r[4]) for r in revisions] |
748 | oe.buildcfg.get_metadata_git_branch(i, None).strip(), \ | ||
749 | oe.buildcfg.get_metadata_git_revision(i, None), \ | ||
750 | oe.buildcfg.is_layer_modified(i)) \ | ||
751 | for i in layers] | ||
752 | return '\n'.join(medadata_revs) | 748 | return '\n'.join(medadata_revs) |
753 | 749 | ||
754 | def outputvars(vars, listvars, d): | 750 | def outputvars(vars, listvars, d): |