diff options
author | Daniel McGregor <daniel.mcgregor@vecima.com> | 2020-01-23 15:44:43 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-04 15:56:29 +0000 |
commit | 0a99a2e2da76bff9edec3193af11f35506b2a88c (patch) | |
tree | 1e25f52aa66df9e33f0d0e7684a30ca8c6858f3c | |
parent | a26efa2875e99ae9abf68dffe7bd988c3fd8598a (diff) | |
download | poky-0a99a2e2da76bff9edec3193af11f35506b2a88c.tar.gz |
buildhistory: Allow customising buildhistory tags
Allow setting custom buildhistory tag prefixes. This allows multiple
build directories to share one buildhistory git repository with multiple
worktrees.
(From OE-Core rev: 1bb2aa53a74e36dc3ba901b9d8ce780e7880cef8)
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/buildhistory.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index affdf272d7..eb7295570d 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -40,6 +40,7 @@ BUILDHISTORY_SDK_FILES ?= "conf/local.conf conf/bblayers.conf conf/auto.conf con | |||
40 | BUILDHISTORY_COMMIT ?= "1" | 40 | BUILDHISTORY_COMMIT ?= "1" |
41 | BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory <buildhistory@${DISTRO}>" | 41 | BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory <buildhistory@${DISTRO}>" |
42 | BUILDHISTORY_PUSH_REPO ?= "" | 42 | BUILDHISTORY_PUSH_REPO ?= "" |
43 | BUILDHISTORY_TAG ?= "build" | ||
43 | 44 | ||
44 | SSTATEPOSTINSTFUNCS_append = " buildhistory_emit_pkghistory" | 45 | SSTATEPOSTINSTFUNCS_append = " buildhistory_emit_pkghistory" |
45 | # We want to avoid influencing the signatures of sstate tasks - first the function itself: | 46 | # We want to avoid influencing the signatures of sstate tasks - first the function itself: |
@@ -824,9 +825,9 @@ END | |||
824 | if [ ! -e .git ] ; then | 825 | if [ ! -e .git ] ; then |
825 | git init -q | 826 | git init -q |
826 | else | 827 | else |
827 | git tag -f build-minus-3 build-minus-2 > /dev/null 2>&1 || true | 828 | git tag -f ${BUILDHISTORY_TAG}-minus-3 ${BUILDHISTORY_TAG}-minus-2 > /dev/null 2>&1 || true |
828 | git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true | 829 | git tag -f ${BUILDHISTORY_TAG}-minus-2 ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true |
829 | git tag -f build-minus-1 > /dev/null 2>&1 || true | 830 | git tag -f ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true |
830 | fi | 831 | fi |
831 | 832 | ||
832 | check_git_config | 833 | check_git_config |