mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
metadata_scm.bbclass: Use immediate expansion for the METADATA_* variables
Define METADATA_BRANCH and METADATA_REVISION using immediate expansion. This avoids running `git rev-parse HEAD` multiple times during recipe parsing. (From OE-Core rev: f76fc325520386c0d25c6d6b422c85e9fb87e663) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 34e1841ec14c545c73fbe03a9f946d43d65ab326) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
39ba556a2e
commit
076d50da2e
@@ -1,8 +1,3 @@
|
|||||||
METADATA_BRANCH ?= "${@base_detect_branch(d)}"
|
|
||||||
METADATA_BRANCH[vardepvalue] = "${METADATA_BRANCH}"
|
|
||||||
METADATA_REVISION ?= "${@base_detect_revision(d)}"
|
|
||||||
METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}"
|
|
||||||
|
|
||||||
def base_detect_revision(d):
|
def base_detect_revision(d):
|
||||||
path = base_get_scmbasepath(d)
|
path = base_get_scmbasepath(d)
|
||||||
return base_get_metadata_git_revision(path, d)
|
return base_get_metadata_git_revision(path, d)
|
||||||
@@ -42,3 +37,8 @@ def base_get_metadata_git_revision(path, d):
|
|||||||
except bb.process.ExecutionError:
|
except bb.process.ExecutionError:
|
||||||
rev = '<unknown>'
|
rev = '<unknown>'
|
||||||
return rev.strip()
|
return rev.strip()
|
||||||
|
|
||||||
|
METADATA_BRANCH := "${@base_detect_branch(d)}"
|
||||||
|
METADATA_BRANCH[vardepvalue] = "${METADATA_BRANCH}"
|
||||||
|
METADATA_REVISION := "${@base_detect_revision(d)}"
|
||||||
|
METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}"
|
||||||
|
|||||||
Reference in New Issue
Block a user